diff --git a/Makefile b/Makefile index 55bc703..c5318e9 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,9 @@ -DEFAULT_BACKGROUND=debblue-1600x1200.png -DEFAULT_SPLASH=debblue.png -DEFAULT_GRUB_SPLASH=debblue.xpm.gz +DEFAULT_BACKGROUND=desktop-background INSTALL=install -m 0644 BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg) EMBLEMS=$(wildcard emblems/*png emblems/*icon) SPLASH=$(wildcard splash/*.png) -GRUB_SPLASH=$(wildcard grub/*gz) PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) GDMTHEMES=$(wildcard gdm/*) @@ -14,22 +11,14 @@ GDMTHEMES=$(wildcard gdm/*) all: install: - mkdir -p $(DESTDIR)/usr/share/pixmaps/splash mkdir -p $(DESTDIR)/usr/share/images/desktop-base - $(INSTALL) $(BACKGROUNDS) $(DESTDIR)/usr/share/images/desktop-base cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_BACKGROUND) default + $(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base mkdir -p $(DESTDIR)/usr/share/icons/hicolor/48x48/emblems $(INSTALL) $(EMBLEMS) $(DESTDIR)/usr/share/icons/hicolor/48x48/emblems/ - $(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base - cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_SPLASH) default_splash - - mkdir -p $(DESTDIR)/boot/grub/themes - $(INSTALL) $(GRUB_SPLASH) $(DESTDIR)/boot/grub/themes - cd $(DESTDIR)/boot/grub/themes && ln -s $(DEFAULT_GRUB_SPLASH) default - mkdir -p $(DESTDIR)/usr/share/desktop-base $(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/ diff --git a/debian/changelog b/debian/changelog index d826045..bec381c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -desktop-base (0.3.15) UNRELEASED; urgency=low +desktop-base (0.3.15) unstable; urgency=low + * postinst, prerm: + - use alternatives to provide the default background and splash * gdm/debblue{,-list}: - adding debblue gdm theme and its 'user list' counterpart * backgrounds/debblue-1600x1200.png: - added debblue's largest background - * grub/debblue.xpm.gz: - - added debblue's grub splash * debian/copyright: - updated to mention the debblue copyright/license * emblems/emblem-debian.{png,icon}: @@ -14,7 +14,7 @@ desktop-base (0.3.15) UNRELEASED; urgency=low * Makefile: - install emblem in /usr/share/icons/hicolor/48x48/emblems/ - install gdm themes in /usr/share/gdm/themes - - install debblue background, grub theme and splash and make them + - install debblue background, and splash and make them the default -- Gustavo Noronha Silva Sat, 23 Oct 2004 23:34:52 -0300 diff --git a/debian/postinst b/debian/postinst index da18335..282b67e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -9,3 +9,38 @@ if [ "${1}" = "configure" ] && [ "$2" != "" ] ; then 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/debblue-1600x1200.png 40 + + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/images/desktop-base/bluedeb-1024x768.jpg 20 + + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/images/desktop-base/Debian.jpg 20 + + # Alternatives for the splash + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-splash \ + desktop-splash \ + /usr/share/images/desktop-base/Splash-debblue.png 40 + + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-splash \ + desktop-splash \ + /usr/share/images/desktop-base/Splash-Debian.png 20 + + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-splash \ + desktop-splash \ + /usr/share/images/desktop-base/Splash-Debian_red.png 20 + +fi \ No newline at end of file diff --git a/debian/prerm b/debian/prerm index 8df3541..908c6fe 100644 --- a/debian/prerm +++ b/debian/prerm @@ -2,14 +2,11 @@ #DEBHELPER# -if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then +if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then # remove background alternatives update-alternatives --remove desktop-background \ /usr/share/images/desktop-base/debblue-1600x1200.png - update-alternatives --remove desktop-background \ - /usr/share/images/desktop-base/debian-background.svg - update-alternatives --remove desktop-background \ /usr/share/images/desktop-base/bluedeb-1024x768.jpg diff --git a/grub/debblue.xpm.gz b/grub/debblue.xpm.gz deleted file mode 100644 index cc2648e..0000000 Binary files a/grub/debblue.xpm.gz and /dev/null differ diff --git a/splash/debblue.png b/splash/debblue.png deleted file mode 100644 index 1999cee..0000000 Binary files a/splash/debblue.png and /dev/null differ