diff --git a/Makefile b/Makefile index 56e9821..d0fe9ce 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,23 @@ -DEFAULT_BACKGROUND=desktop-background +DEFAULT_BACKGROUND=bluedeb-1024x768.jpg INSTALL=install -m 0644 -BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg) -EMBLEMS=$(wildcard emblems/*png emblems/*icon) +BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg) SPLASH=$(wildcard splash/*.png) PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) -all: +all: install: + # needed if gnome-session is not installed + mkdir -p $(DESTDIR)/usr/share/pixmaps/splash + + # the package itself 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/ - mkdir -p $(DESTDIR)/usr/share/desktop-base $(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/ - mkdir -p $(DESTDIR)/usr/share/pixmaps $(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/ - diff --git a/debian/changelog b/debian/changelog index 03dcc82..f21e59a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,54 +1,3 @@ -desktop-base (0.3.17) UNRELEASED; urgency=low - - * Debian Desktop sid artwork added (including originals in .xcf): - - wallpapers/gnome-debian-sid-wp.png - - splash/gnome-debian-sid-splash.png - * debian/README.Debian: added, containing notes about Debian - Desktop artwork layout and more. - * debian/copyright: updated, including the new images copyright notes - - -- Gustavo Franco Sat, 3 Jun 2006 21:26:48 -0300 - -desktop-base (0.3.16) unstable; urgency=low - - * GNOME Team Upload - * backgrounds/debian-background.svg, debian/copyright, - debian/{postinst,prerm}, Makefile: - - added background provided by Josselin Mouette - to fit good with GNOME2.12's splash and theme look - (Closes: #332873) - * debian/prerm: - - fixed bashism -o -> ] || [ - * debian/control.in: - - added, updated Standards-Version to 3.6.2 with no changes - - added gnome-pkg-tools to Build-Deps, updated debhelper's - version requirement - - added xfce4 to the Suggests after kde, before wmaker - - added the Uploaders field - * debian/rules: - - include the pkg-gnome makefile include to generate the Uploaders - field correctly - - -- Gustavo Noronha Silva Sun, 9 Oct 2005 16:14:10 -0300 - -desktop-base (0.3.15) unstable; urgency=low - - * postinst, prerm: - - use alternatives to provide the default background and splash - * backgrounds/debblue-1600x1200.png: - - added debblue's largest background - * debian/copyright: - - updated to mention the debblue copyright/license - * emblems/emblem-debian.{png,icon}: - - added emblem for hicolor theme contributed by - Dan Korostelev (Closes: #257923) - * Makefile: - - install emblem in /usr/share/icons/hicolor/48x48/emblems/ - - install debblue background, and splash and make them - the default - - -- Gustavo Noronha Silva Sat, 23 Oct 2004 23:34:52 -0300 - desktop-base (0.3.14) unstable; urgency=low * pixmaps/debian-official-logo-small.png: diff --git a/debian/control b/debian/control index 17ec1db..685b169 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,13 @@ Source: desktop-base Section: x11 Priority: optional Maintainer: Gustavo Noronha Silva -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons , Takuo KITAME -Build-Depends-Indep: cdbs, debhelper (>> 4.1.0), gnome-pkg-tools -Standards-Version: 3.6.2 +Build-Depends-Indep: cdbs, debhelper (>> 4.0.0) +Standards-Version: 3.6.1 Package: desktop-base Architecture: all Recommends: epiphany-browser | konqueror | www-browser -Suggests: gnome | kde | xfce4 | wmaker +Suggests: gnome | kde | wmaker Description: common files for the Debian Desktop This package contains various miscellaneous files which are used by Debian Desktop installations. Currently, it provides some diff --git a/debian/copyright b/debian/copyright index 6d826eb..b9652ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,12 +5,6 @@ This package is comprised of bits and pieces from various sources. Copyright: -The debblue "kit" (composed of the background and the splash) was -created by Jaap Haitsma (jaap at haitsma dot org) and is licensed -under the GNU General Public License (see below). They can be -downloaded from the http://debblue.debian.net/downloads.php web page -in various formats. - The Debian swirl background images included in this package were created by gfburke@earthlink.net (Gary Burke), and were derived from copyright-free stock artwork. It can be downloaded from @@ -20,21 +14,6 @@ The Debian "bluedeb" background was created by Roger So , and is under the terms of the BSD license. See ../backgrounds/bluedeb.COPYING for more information. -The debian-background.svg file has been provided by Josselin Mouette -, and is a derivative work of the open use Debian -logo, which has the following copyright notice: - - - Copyright (c) 1999 Software in the Public Interest - - This logo or a modified version may be used by anyone to refer to - the Debian project, but does not indicate endorsement by the - project. - - Note: we would appreciate that you make the image a link to - http://www.debian.org/ if you use it on a web page. - - The Debian splash screen was created by Mirko Hufnagel , and is placed into the public domain. @@ -56,10 +35,5 @@ reformatting of the Debian Official Use Logo. The .desktop files included in this package were compiled by Colin Walters . -The gnome-debian-sid "kit" including splash/gnome-debian-sid-splash.xcf.gz, -splash/gnome-debian-sid-splash.png, wallpapers/gnome-debian-sid-wp.xcf.gz -and wallpapers/gnome-debian-sid-wp.png were made by Josselin Mouette - and Gustavo Franco . - The GPL license can be found in plain text format, on Debian systems, at /usr/share/common-licenses/GPL. diff --git a/debian/postinst b/debian/postinst index 6bf4ec9..da18335 100644 --- a/debian/postinst +++ b/debian/postinst @@ -9,43 +9,3 @@ 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/debian-background.svg 30 - - 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/rules b/debian/rules index f34e12c..efdf14e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,5 @@ include /usr/share/cdbs/1/rules/buildcore.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/desktop-base/ \ No newline at end of file