* Cosmetic cleanups.

* Register it with priority 15 (higher than standard Debian packages
- install debblue background, and splash and make them
This commit is contained in:
Loïc Minier
2007-11-23 10:41:28 +00:00
parent 411e0e3e5d
commit 881a9638aa
6 changed files with 71 additions and 67 deletions
+13 -13
View File
@@ -6,7 +6,7 @@ README for desktop-base
1.2. Pixmaps
1.3. Splash and Wallpapers
1.3.1. Deprecated Splash and Wallpapers
1.4. GDM Theme
1.4. GDM Theme
2. Desktop files
3. Changing desktop-base images
4. Window Managers
@@ -22,10 +22,10 @@ README for desktop-base
1.3. Splash and Wallpapers
We have just two splash and two wallpapers for each window manager (not
We have just two splash and two wallpapers for each window manager (not
considering the originals in .xcf).
One pair (splash / wallpaper) will be used during development
cycle (testing/sid) and other to release.
One pair (splash / wallpaper) will be used during development
cycle (testing/sid) and other to release.
/usr/share/images/desktop-base/gnome-default-splash.png (symlink)
/usr/share/images/desktop-base/gnome-default-wallpaper.png (symlink)
@@ -33,14 +33,14 @@ cycle (testing/sid) and other to release.
/usr/share/images/desktop-base/splash/gnome-debian-sid-splash.png
/usr/share/images/desktop-base/wallpapers/gnome-debian-sid-wp.png
Before Etch we will add the images below and the symlinks above will
Before Etch we will add the images below and the symlinks above will
point to this pair:
/usr/share/images/desktop-base/splash/gnome-debian-etch-splash.png
/usr/share/images/desktop-base/wallpapers/gnome-debian-etch-wp.png
1.3.1. Deprecated Splash and Wallpapers
WARNING: The splash and wallpaper images above are deprecated and
WARNING: The splash and wallpaper images above are deprecated and
will be moved or removed before Etch.
/usr/share/images/desktop-base/debblue-1600x1200.png
@@ -62,15 +62,15 @@ desktop-base GDM theme will be built as soon as possible.
3. Changing desktop-base images
We need professional looking Debian artwork in the
We need professional looking Debian artwork in the
Desktop. If you want to help changing some desktop-base
images, that would be good consider the following notes:
- The swirl Debian logo is red;
- The Debian font is Poppl Laudation Condensed (unfortunately,
- The Debian font is Poppl Laudation Condensed (unfortunately,
commercial font)
- Blue (#5F92C9 and some others) fits with GNOME default
clearlooks theme that we use in your default desktop
- Blue (#5F92C9 and some others) fits with GNOME default
clearlooks theme that we use in your default desktop
environment and looks good in KDE too;
- Black and White are welcome colors too.
@@ -80,11 +80,11 @@ Bug Tracking System (http://bugs.debian.org/). Please attach the
'xcf' and don't violate copyright.
4. Window Managers
desktop-base is being used by GNOME/metacity only, but it's
desktop-base is being used by GNOME/metacity only, but it's
ready to be the default artwork package for Debian.
If you're responsible for a WM in Debian and wants to use
desktop-base artwork or add your own image (wallpaper, splash,
If you're responsible for a WM in Debian and wants to use
desktop-base artwork or add your own image (wallpaper, splash,
whatever) use the layout described above and send your patch
through the Bug Tracking System to us.
+4 -3
View File
@@ -8,8 +8,9 @@ desktop-base (4.0.4) unstable; urgency=low
[ Loic Minier ]
* Set DM-Upload-Allowed: yes; rock on Fathi!
* Wrap build-deps and uploaders.
* Cosmetic cleanups.
-- Loic Minier <lool@dooz.org> Fri, 23 Nov 2007 11:38:38 +0100
-- Loic Minier <lool@dooz.org> Fri, 23 Nov 2007 11:40:38 +0100
desktop-base (4.0.3) unstable; urgency=low
@@ -122,7 +123,7 @@ desktop-base (0.3.18) unstable; urgency=low
* Add a gconf-defaults file.
+ Set the default background, overriding the one in libgnome.
+ Set the default splash, overriding the one in gnome-session.
* Register it with priority 15 (higher than standard Debian packages
* Register it with priority 15 (higher than standard Debian packages
but lower than CDDs).
* Build-depend on debhelper 5.0.13.
@@ -180,7 +181,7 @@ desktop-base (0.3.15) unstable; urgency=low
Dan Korostelev <dan@ats.energo.ru> (Closes: #257923)
* Makefile:
- install emblem in /usr/share/icons/hicolor/48x48/emblems/
- install debblue background, and splash and make them
- install debblue background, and splash and make them
the default
-- Gustavo Noronha Silva <kov@debian.org> Sat, 23 Oct 2004 23:34:52 -0300
+31 -31
View File
@@ -4,58 +4,58 @@
if [ "${1}" = "configure" ] && [ "$2" != "" ] ; then
if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then
if test -x /var/lib/dpkg/info/libgnome2-common.postinst; then
/var/lib/dpkg/info/libgnome2-common.postinst configure
fi
if test -x /var/lib/dpkg/info/libgnome2-common.postinst; then
/var/lib/dpkg/info/libgnome2-common.postinst configure
fi
fi
fi
if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
# Alternatives for the background
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debian-blueish-wallpaper.svg 40
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debian-blueish-wallpaper.svg 40
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debblue-1600x1200.png 30
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debblue-1600x1200.png 30
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debian-background.svg 20
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/debian-background.svg 20
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/bluedeb-1024x768.jpg 10
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/bluedeb-1024x768.jpg 10
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/Debian.jpg 10
/usr/share/images/desktop-base/desktop-background \
desktop-background \
/usr/share/images/desktop-base/Debian.jpg 10
# Alternatives for the splash
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/gnome-splash-curves.png 40
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/gnome-splash-curves.png 40
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-debblue.png 30
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-debblue.png 30
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-Debian.png 10
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-Debian.png 10
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-Debian_red.png 10
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
/usr/share/images/desktop-base/Splash-Debian_red.png 10
fi
+11 -10
View File
@@ -4,15 +4,16 @@
if [ "${1}" = "upgrade" ]; then
if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-Debian.png
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-EvolvingTux.png
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-Debian_red.png
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-Debian.png
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-EvolvingTux.png
update-alternatives --remove gnome-splash \
/usr/share/images/desktop-base/Splash-Debian_red.png
dpkg-divert --package desktop-base --rename \
--divert /usr/share/pixmaps/splash/gnome-splash.png.orig \
--remove /usr/share/pixmaps/splash/gnome-splash.png
dpkg-divert --package desktop-base --rename \
--divert /usr/share/pixmaps/splash/gnome-splash.png.orig \
--remove /usr/share/pixmaps/splash/gnome-splash.png
fi
fi
fi
+10 -9
View File
@@ -5,30 +5,31 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
# remove background alternatives
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/debian-blueish-wallpaper.svg
/usr/share/images/desktop-base/debian-blueish-wallpaper.svg
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/debblue-1600x1200.png
/usr/share/images/desktop-base/debblue-1600x1200.png
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/debian-background.svg
/usr/share/images/desktop-base/debian-background.svg
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/bluedeb-1024x768.jpg
/usr/share/images/desktop-base/bluedeb-1024x768.jpg
update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/Debian.jpg
/usr/share/images/desktop-base/Debian.jpg
# remove splash alternatives
update-alternatives --remove desktop-splash \
/usr/share/images/desktop-base/gnome-splash-curves.png
/usr/share/images/desktop-base/gnome-splash-curves.png
update-alternatives --remove desktop-splash \
/usr/share/images/desktop-base/Splash-debblue.png
/usr/share/images/desktop-base/Splash-debblue.png
update-alternatives --remove desktop-splash \
/usr/share/images/desktop-base/Splash-Debian.png
/usr/share/images/desktop-base/Splash-Debian.png
update-alternatives --remove desktop-splash \
/usr/share/images/desktop-base/Splash-Debian_red.png
/usr/share/images/desktop-base/Splash-Debian_red.png
fi
+2 -1
View File
@@ -4,7 +4,8 @@ include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/desktop-base/
DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/desktop-base/
binary-fixup/desktop-base::
dh_gconf --priority=15