From f262f479bf7375be9857257d24ee1de215a1b584 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Sun, 24 Oct 2004 15:37:47 +0000 Subject: [PATCH] changing name of the debblue splash to conform to the "standard" naming convention I adopted * postinst, prerm: - use alternatives to provide the default background and splash no longer create a splash_default link in Makefile, no longer provide grub stuff --- Makefile | 15 ++------- debian/changelog | 8 ++--- debian/postinst | 35 +++++++++++++++++++++ debian/prerm | 25 +++++++++++++++ grub/debblue.xpm.gz | Bin 10358 -> 0 bytes splash/{debblue.png => Splash-debblue.png} | Bin 6 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 debian/prerm delete mode 100644 grub/debblue.xpm.gz rename splash/{debblue.png => Splash-debblue.png} (100%) 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 new file mode 100644 index 0000000..908c6fe --- /dev/null +++ b/debian/prerm @@ -0,0 +1,25 @@ +#!/bin/sh -e + +#DEBHELPER# + +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/bluedeb-1024x768.jpg + + update-alternatives --remove desktop-background \ + /usr/share/images/desktop-base/Debian.jpg + + # remove splash alternatives + update-alternatives --remove desktop-splash \ + /usr/share/images/desktop-base/Splash-debblue.png + + update-alternatives --remove desktop-splash \ + /usr/share/images/desktop-base/Splash-Debian.png + + update-alternatives --remove desktop-splash \ + /usr/share/images/desktop-base/Splash-Debian_red.png +fi \ No newline at end of file diff --git a/grub/debblue.xpm.gz b/grub/debblue.xpm.gz deleted file mode 100644 index cc2648ec274988c55784b9729ae0d629400e19b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10358 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 diff --git a/splash/debblue.png b/splash/Splash-debblue.png similarity index 100% rename from splash/debblue.png rename to splash/Splash-debblue.png