summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/defaultsettings/desktop-base/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-01 02:04:45 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-01 02:04:45 -0500
commit6f8b29e1fa4d7c4f8676dbded0b9fde3e9acd207 (patch)
tree4613d1f6dd2471c02d32d72193426a4659432d0c /ubuntu/maverick/defaultsettings/desktop-base/debian
parenta6d46f81f053a75f8584f8e0b04e48f93dfc1532 (diff)
downloadtde-packaging-6f8b29e1fa4d7c4f8676dbded0b9fde3e9acd207.tar.gz
tde-packaging-6f8b29e1fa4d7c4f8676dbded0b9fde3e9acd207.zip
Add initial copy of the old Debian desktop-base package to the Debian and Ubuntu packaging files
Diffstat (limited to 'ubuntu/maverick/defaultsettings/desktop-base/debian')
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian85
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/changelog447
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/compat1
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/control34
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/copyright72
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults3
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/postinst101
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/postrm10
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/preinst71
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/prerm51
-rwxr-xr-xubuntu/maverick/defaultsettings/desktop-base/debian/rules14
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides2
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst30
-rw-r--r--ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm23
14 files changed, 944 insertions, 0 deletions
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian b/ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian
new file mode 100644
index 000000000..260c6fb02
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian
@@ -0,0 +1,85 @@
+README for desktop-base
+=======================
+
+1. Images
+ 1.1. Emblems
+ 1.2. Pixmaps
+ 1.3. Splash and Wallpapers
+ 1.4. Boot splash
+2. Desktop files
+3. Changing desktop-base images
+4. Window Managers
+
+1. Images
+
+1.1. Emblems
+/usr/share/icons/hicolor/48x48/emblems/emblem-debian.png
+/usr/share/icons/hicolor/48x48/emblems/emblem-debian.icon
+
+1.2. Pixmaps
+/usr/share/pixmaps/debian-security.png
+
+1.3. Splash and Wallpapers
+
+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.
+
+/usr/share/images/desktop-base/gnome-default-splash.png (symlink)
+/usr/share/images/desktop-base/gnome-default-wallpaper.png (symlink)
+
+/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
+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.4. Boot splash
+
+desktop-base provides a theme for splashy, in
+/usr/share/splashy/themes/moreblue-orbit. Previously the theme was in
+/etc/splashy but since splashy people move the themes to /usr/share and
+replaced the folder by a symlink, we had to follow. If you modified the
+theme before, you should be able to find it in /etc/splashy.dpkg-old.
+
+If you installed splashy before desktop-base, the MoreBlue-Orbit theme will
+be automatically configured. But if you install splashy after desktop-base,
+you'll need to run the following command to enable it:
+
+# dpkg-reconfigure desktop-base
+
+2. Desktop files
+/usr/share/desktop-base/debian-homepage.desktop
+/usr/share/desktop-base/debian-reference.desktop
+/usr/share/desktop-base/debian-security.desktop
+
+3. Changing desktop-base images
+
+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,
+ commercial font)
+- 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.
+
+If you've suggestions for a better artwork, create or edit
+the images and open a 'wishlist' bug against desktop-base in our
+Bug Tracking System (http://bugs.debian.org/). Please attach the
+'svg' or 'xcf' and don't violate copyright.
+
+4. Window Managers
+desktop-base is used by GNOME/KDE/XFCE.
+
+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.
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/changelog b/ubuntu/maverick/defaultsettings/desktop-base/debian/changelog
new file mode 100644
index 000000000..c09beb592
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/changelog
@@ -0,0 +1,447 @@
+desktop-base-trinity (5.0.3-8) squeeze; urgency=low
+
+ * Fix gnome conflicts
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 18 Jan 2012 11:08:00 -0600
+
+desktop-base-trinity (5.0.3-6) squeeze; urgency=low
+
+ * Trinity build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 05 Jul 2010 13:55:00 -0600
+
+desktop-base (5.0.2) unstable; urgency=low
+
+ * moreblue-orbit-wallpaper-widescreen.svg updated, fix a “transparent”
+ * horizontal line on top.
+ * debian/rules:
+ - install splashy themes in /usr/share instead of /etc. closes: #501315
+ * debian/postinst, debian/prerm
+ - move properly /etc/splashy/ conffiles to /usr/share/splashy.
+
+ -- Yves-Alexis Perez <corsac@debian.org> Fri, 24 Oct 2008 00:23:57 +0200
+
+desktop-base (5.0.1) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * Update my email address in Uploaders:
+ * Relabel background as “Lenny” in GNOME properties. (Closes: #495613)
+ * Add MoreBlue Orbit widescreen as svg and add it to alternatives.
+
+ [ Fathi Boudra ]
+ * Merge wallpapers and backgrounds directories.
+ * Remove deprecated splash and wallpapers:
+ - debblue-1600x1200.png
+ - bluedeb-1024x768.jpg
+ - Debian.jpg
+ - debian-background.svg
+ - Splash-debblue.png
+ - Splash-Debian.png
+ - Splash-Debian_red.png
+ * Add MoreBlue Orbit grub and splash sources.
+ * Add MoreBlue Orbit widescreen.
+ * Add Nightly sources.
+ * Add MoreBlue Orbit Splashy theme. (Closes: #495618)
+ * Add Nightly GNOME and KDM splash. Thanks to Robert Jahene.
+
+ -- Fathi Boudra <fabo@debian.org> Fri, 26 Sep 2008 00:49:22 +0200
+
+desktop-base (5.0.0) unstable; urgency=low
+
+ * Bump Standards-Version to 3.8.0 (no changes needed).
+ * Add Lenny artwork: MoreBlue Orbit.
+ Thanks to Andre L. R. Ferreira and Valessio S. Brito.
+ * Add Nightly artwork. Thanks to Robert Jahene.
+ * Use alternative to provide desktop-grub.
+
+ -- Fathi Boudra <fabo@debian.org> Thu, 14 Aug 2008 09:41:06 +0200
+
+desktop-base (4.0.7) unstable; urgency=low
+
+ * Replace 640x480 TGA version of debian-blueish-wallpaper.svg by a PNG for
+ GRUB 2. (Closes: #465087)
+
+ -- Fathi Boudra <fabo@debian.org> Mon, 11 Feb 2008 14:06:52 +0100
+
+desktop-base (4.0.6) unstable; urgency=low
+
+ * Move update-grub2 hook to postrm instead of prerm.
+ * Bump compat/debhelper to 6.
+ * Add Vcs-Browser and Vcs-Svn fields.
+
+ -- Fathi Boudra <fabo@debian.org> Mon, 14 Jan 2008 14:44:26 +0100
+
+desktop-base (4.0.5) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Bump Standards-Version to 3.7.3.
+ * Add Homepage field.
+ * Remove DM-Upload-Allowed: yes; All Uploaders are DD.
+ * Update kdm theme for KDE 4.
+ * Use zoom option instead of scaled option in gnome background.
+ (Closes: #439838)
+ * Update Makefile to fix wrong permissions on
+ /usr/share/gnome-background-properties. (Closes: #452425)
+ * Provide 640x480 TGA version of debian-blueish-wallpaper.svg for GRUB 2.
+ Thanks to Robert Millan (Closes: #459352)
+
+ [ Loic Minier ]
+ * Also use zoom (instead of stretched) for the default wallpaper.
+
+ -- Fathi Boudra <fabo@debian.org> Wed, 09 Jan 2008 11:08:23 +0100
+
+desktop-base (4.0.4) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Make a copy of GdmGreeterTheme.desktop to KdmGreeterTheme.desktop:
+ * KDE3 search for GdmGreeterTheme.desktop
+ * KDE4 search for KdmGreeterTheme.desktop
+
+ [ 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:40:38 +0100
+
+desktop-base (4.0.3) unstable; urgency=low
+
+ * Fix kde default wallpaper appearance between kdm to ksplash switch.
+
+ -- Fathi Boudra <fboudra@free.fr> Thu, 24 May 2007 01:22:06 +0200
+
+desktop-base (4.0.2) unstable; urgency=low
+
+ * Fix dir_config path in kdeglobals and kdesktoprc doesn't support symlink.
+ (Closes: #422043)
+
+ -- Fathi Boudra <fboudra@free.fr> Wed, 16 May 2007 14:59:27 +0200
+
+desktop-base (4.0.1) unstable; urgency=high
+
+ [ Fathi Boudra ]
+ * Re-enable kdm override; this issue will be fixed on KDM init script.
+
+ [ Loic Minier ]
+ * Merge 4.0.0.1 and upload to unstable.
+
+ -- Loic Minier <lool@dooz.org> Thu, 22 Feb 2007 20:03:44 +0100
+
+desktop-base (4.0.0.1) experimental; urgency=high
+
+ [ Fathi Boudra ]
+ * Fix KSplash theme moodin engine installation.
+ * Fix MoreBlue KDM theme. Thanks to Modestas Vainius.
+ (Closes: #408513, #408947)
+ * KDM override is disabled by default. (Closes: #407799)
+ * Fixed default SVG wallpaper reverting to previous image.
+ (Closes: #407930)
+
+ [ Loic Minier ]
+ * Depend on librsvg2-common for SVG support.
+
+ -- Gustavo Franco <stratus@debian.org> Tue, 30 Jan 2007 17:08:41 -0200
+
+desktop-base (4.0.0) unstable; urgency=low
+
+ [ Fathi Boudra ]
+ * Add icon-session and icon-reboot to MoreBlue KDM Theme like GDM Theme.
+
+ [ Loic Minier ]
+ * Bump up version to 4.0; etch.
+
+ -- Loic Minier <lool@dooz.org> Mon, 11 Dec 2006 20:59:38 +0100
+
+desktop-base (0.3.22) unstable; urgency=low
+
+ * New GNOME wallpaper description; only holds the default GNOME wallpaper
+ for now; thanks Martin-Éric Racine; closes: #333457.
+
+ -- Loic Minier <lool@dooz.org> Mon, 11 Dec 2006 18:02:02 +0100
+
+desktop-base (0.3.21) unstable; urgency=high
+
+ [ Gustavo Franco ]
+ * debian/control:
+ - Set Maintainer field to me.
+ - Set Uploaders to current debian-desktop members.
+ * debian/control.in: removed
+
+ [ Loic Minier ]
+ * Drop uploaders rule and gnome-pkg-tools build-dep.
+
+ [ Fathi Boudra ]
+ * Fix debian-background.svg and debian-blueish-wallpaper.svg for KDE.
+ * Rename kde directory to kde-profile. More consistent with KIOSK Framework.
+ * Add kdeglobals support.
+ * Add Debian MoreBlue KDM Theme.
+ * Add Debian MoreBlue KSplash Theme (Default and Moodin engine).
+
+ [ Loic Minier ]
+ * Urgency high for etch's KDE artwork.
+
+ -- Loic Minier <lool@dooz.org> Mon, 11 Dec 2006 16:43:23 +0100
+
+desktop-base (0.3.20) unstable; urgency=high
+
+ [ Yves-Alexis Perez ]
+ * Correct xfce4-session.rc file to add failsafe session so xfce4-session
+ doesn't crash.
+
+ [ Loic Minier ]
+ * Upload; high urgency because the above changes are blocking another
+ upload, even if the affected files are not useful yet.
+
+ -- Loic Minier <lool@dooz.org> Mon, 27 Nov 2006 12:16:05 +0100
+
+desktop-base (0.3.19) unstable; urgency=low
+
+ * Install configuration dirs for KDE and Xfce settings which will provide
+ default values for the wallpaper, and splash screen; thanks Bart "cobaco"
+ Cornelis; closes: #348702.
+
+ -- Loic Minier <lool@dooz.org> Fri, 17 Nov 2006 20:23:08 +0100
+
+desktop-base (0.3.18) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Add artworks by André Luiz Rodrigues Ferreira.
+ - SVG background, backgrounds/debian-blueish-wallpaper.svg.
+ - PNG splash, splash/gnome-splash-curves.png; closes: #288393.
+ * Register these artworks as alternatives with the highest priority (40),
+ and lower the other priorities.
+
+ [ Josselin Mouette ]
+ * 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
+ but lower than CDDs).
+ * Build-depend on debhelper 5.0.13.
+
+ -- Josselin Mouette <joss@debian.org> Tue, 10 Oct 2006 16:36:36 +0200
+
+desktop-base (0.3.17) unstable; urgency=low
+
+ [ Gustavo Franco ]
+ * 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
+
+ [ Loic Minier ]
+ * Rename Build-Depends-Indep to Build-Depends.
+ * Bump up Standards-Version to 3.7.2.
+ * Bump up Debhelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org> Thu, 15 Jun 2006 21:35:25 +0200
+
+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 <joss@debian.org>
+ 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 <kov@debian.org> 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 <dan@ats.energo.ru> (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 <kov@debian.org> Sat, 23 Oct 2004 23:34:52 -0300
+
+desktop-base (0.3.14) unstable; urgency=low
+
+ * pixmaps/debian-official-logo-small.png:
+ - remove official logo as it is not DFSG-free (Closes: #246784)
+ * debian/control:
+ - Recommends: epiphany-browser | konqueror | www-browser
+
+ -- Gustavo Noronha Silva <kov@debian.org> Tue, 11 May 2004 17:25:09 -0300
+
+desktop-base (0.3.13) unstable; urgency=low
+
+ * debian/postinst:
+ - modified the check for $2 being empty
+ (Closes: #242059)
+
+ -- Gustavo Noronha Silva <kov@debian.org> Sun, 4 Apr 2004 16:43:11 -0300
+
+desktop-base (0.3.12) unstable; urgency=medium
+
+ * debian/preinst:
+ - remove the alternative stuff first to make it possible
+ to remove the diversion
+ (Closes: #241439, #241402, #241339, #241463)
+ * splash/Splash-EvolvingTux.png:
+ - remove while I try to sort out the legal issues
+ try to get this into sarge soon (urgency=medium)
+ (Closes: #241246)
+ * debian/postinst:
+ - regenerate the gconf default file by running libgnome2-common's
+ postinst when upgrading from an older version (Closes: #241403)
+
+ -- Gustavo Noronha Silva <kov@debian.org> Thu, 1 Apr 2004 16:44:26 -0300
+
+desktop-base (0.3.11) unstable; urgency=low
+
+ * debian/prerm, debian/postinst, debian/postrm:
+ - remove them all
+ * debian/preinst:
+ - stop providing the diversion and the gnome-splash
+ alternative if upgrading from diversion-including
+ versions
+ * Makefile, gconf/:
+ - stop providing a default configuration for the
+ background
+ * debian/control:
+ - updated Standards-Version to 3.6.1
+ * debian/copyright:
+ - included GPL location in common-licenses
+
+ -- Gustavo Noronha Silva <kov@debian.org> Tue, 30 Mar 2004 16:35:49 -0300
+
+desktop-base (0.3.10) unstable; urgency=low
+
+ * debian/postrm:
+ - remove the unnecessary rm, sorry for the delay (Closes: #223925)
+
+ -- Gustavo Noronha Silva <kov@debian.org> Sun, 18 Jan 2004 01:12:39 -0200
+
+desktop-base (0.3.9) unstable; urgency=low
+
+ * debian/preinst:
+ - really fix the problem with local diversion, by removing it and
+ readding it (Closes: #218091)
+
+ -- Gustavo Noronha Silva <kov@debian.org> Wed, 12 Nov 2003 12:54:37 -0200
+
+desktop-base (0.3.8) unstable; urgency=low
+
+ * debian/postinst:
+ - change priorities to make Debian_red the default
+ * gconf/.../%gconf.xml:
+ - set the default background file to /usr/share/images/desktop-base/default
+ * Makefile:
+ - install the gconf file
+
+ -- Gustavo Noronha Silva <kov@debian.org> Tue, 11 Nov 2003 13:17:22 -0200
+
+desktop-base (0.3.7) unstable; urgency=low
+
+ * debian/preinst:
+ - remove the problematic local diversion, added the right thing
+ (Closes: #218091).
+ * splash/Debian-Splash.{xcf,png}:
+ - edited to remove the white border and enlarge the image a bit
+ (Closes: #218896)
+
+ -- Gustavo Noronha Silva <kov@debian.org> Tue, 11 Nov 2003 00:27:50 -0200
+
+desktop-base (0.3.6) unstable; urgency=low
+
+ * New Maintainer
+ * debia/rules:
+ - use cdbs package
+ * debian/control:
+ - Depends on cdbs
+ * debian/{postinst,preinst,postrm,prerm}:
+ - set up a diversion and the alternatives system for the
+ /usr/share/pixmaps/splash/gnome-splash.png file, making
+ Splash-Debian the default.
+ * splash/{Splash-Debian_red.png,Splash-EvolvingTux.png}:
+ - added new splashs (Closes: #200007, #205258)
+ * Makefile:
+ - create /usr/share/pixmaps/splash
+
+ -- Gustavo Noronha Silva <kov@debian.org> Tue, 21 Oct 2003 15:22:12 -0200
+
+desktop-base (0.3.5) unstable; urgency=low
+
+ * debian-reference.desktop:
+ - Change URL to the actual reference guide, and fix typo "manaul" =>
+ "manual" (Closes: #172737).
+
+ -- Colin Walters <walters@debian.org> Fri, 3 Jan 2003 14:57:55 -0500
+
+desktop-base (0.3.4) unstable; urgency=low
+
+ * Make a symlink /usr/share/images/desktop-base/default pointing to the
+ default background we want.
+ * debian/rules:
+ - Use the latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org> Thu, 19 Dec 2002 19:19:14 -0500
+
+desktop-base (0.3.3) unstable; urgency=low
+
+ * debian/rules:
+ - Use the latest version of Colin's Build System.
+
+ -- Colin Walters <walters@debian.org> Thu, 21 Nov 2002 00:47:57 -0500
+
+desktop-base (0.3.2) unstable; urgency=low
+
+ * debian/backgrounds/bluedeb-1024x768.jpg:
+ - New background from Roger So.
+
+ -- Colin Walters <walters@debian.org> Wed, 20 Nov 2002 23:49:14 -0500
+
+desktop-base (0.3.1) unstable; urgency=low
+
+ * Update splash/Debian-Splash.xcf, splash/Debian-Splash.png.
+ * debian/rules:
+ - Use Colin's Build System.
+ * debian/desktop-base.install:
+ - New.
+
+ -- Colin Walters <walters@debian.org> Wed, 06 Nov 2002 14:26:22 -0500
+
+desktop-base (0.3) unstable; urgency=low
+
+ * Remove debian-wallpaper1280x1024.png; it was big and useless.
+ * Add splash/Debian-Splash.xcf, splash/Debian-Splash.png.
+
+ -- Colin Walters <walters@debian.org> Thu, 31 Oct 2002 15:01:53 -0500
+
+desktop-base (0.2-1) unstable; urgency=low
+
+ * Actually link to the installed images (Closes: #166245).
+ Oops.
+
+ -- Colin Walters <walters@debian.org> Fri, 25 Oct 2002 00:55:19 -0400
+
+desktop-base (0.1-1) unstable; urgency=low
+
+ * Initial Version (Closes: #165928).
+
+ -- Colin Walters <walters@debian.org> Tue, 22 Oct 2002 15:05:34 -0400
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/compat b/ubuntu/maverick/defaultsettings/desktop-base/debian/compat
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/control b/ubuntu/maverick/defaultsettings/desktop-base/debian/control
new file mode 100644
index 000000000..820e9e21e
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/control
@@ -0,0 +1,34 @@
+Source: desktop-base-trinity
+Section: x11
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Uploaders: Loïc Minier <lool@dooz.org>,
+ Fathi Boudra <fabo@debian.org>,
+ Yves-Alexis Perez <corsac@debian.org>
+Build-Depends: cdbs, debhelper (>= 6)
+# libusplash-dev, imagemagick, librsvg2-bin
+Standards-Version: 3.8.3
+
+Package: desktop-base-trinity
+Architecture: all
+Depends: librsvg2-common
+Suggests: tde-trinity
+Conflicts: desktop-base
+Provides: desktop-base
+Description: common files for the Debian Desktop [Trinity]
+ This package contains various miscellaneous files which are used by
+ Debian Desktop installations. Currently, it provides some
+ Debian-related artwork and themes, .desktop files containing links to
+ Debian related material (suitable for placement on a user's desktop),
+ and other common files between the available desktop environments
+ such as GNOME and TDE.
+
+#Package: usplash-theme-debian-desktop-trinity
+#Section: misc
+#Architecture: amd64 i386 powerpc sparc
+#Depends: ${shlibs:Depends}, usplash
+#Provides: usplash-theme
+#Description: Debian Desktop usplash theme [Trinity]
+# This package contains an usplash theme based on Debian Desktop project.
+# .
+# See http://wiki.debian.org/DebianDesktopArtwork for more details.
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/copyright b/ubuntu/maverick/defaultsettings/desktop-base/debian/copyright
new file mode 100644
index 000000000..990146cb7
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/copyright
@@ -0,0 +1,72 @@
+This package was debianized by Colin Walters <walters@debian.org> on
+Tue, 22 Oct 2002 15:05:34 -0400.
+
+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
+http://wm.themes.org, as "Debian.tar.gz".
+
+The Debian "bluedeb" background was created by Roger So
+<rogerso@debian.org>, 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
+<joss@debian.org>, and is a derivative work of the open use Debian
+logo, which has the following copyright notice:
+
+<debian-background.svg>
+ 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.
+</debian-background.svg>
+
+The Debian splash screen was created by Mirko Hufnagel
+<mirko@abitur97.de>, and is placed into the public domain.
+
+The Debian_red splash screen imagem was created by
+<webanetwork@libero.it> and is copyright-free. It can be downloaded
+from http://art.gnome.org/themes/splash_screens/488.php.
+
+The EvolvingTux splash screen was modified by Filip Van Raemdonck
+<mechanix@debian.org> based on a GPL work found at
+http://www.kde-look.org.
+
+The debian-security.xcf file (and the resulting .png file) were
+created by Colin Walters <walters@debian.org> from the Debian Open Use
+Logo and a GNOME icon; both are free software.
+
+The debian-official-logo-small.png image is more or less a simple
+reformatting of the Debian Official Use Logo.
+
+The .desktop files included in this package were compiled by Colin
+Walters <walters@debian.org>.
+
+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
+<joss@debian.org> and Gustavo Franco <stratus@debian.org>.
+
+The following files are Copyright 2006 André Luiz Rodrigues Ferreira and
+licensed under the GPL.
+ - SVG background, backgrounds/debian-blueish-wallpaper.svg.
+ - PNG splash, splash/gnome-splash-curves.png.
+
+The GPL license can be found in plain text format, on Debian systems,
+at /usr/share/common-licenses/GPL.
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults b/ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults
new file mode 100644
index 000000000..10e4b8297
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults
@@ -0,0 +1,3 @@
+/apps/gnome-session/options/splash_image /usr/share/images/desktop-base/desktop-splash
+/desktop/gnome/background/picture_filename /usr/share/images/desktop-base/desktop-background
+/desktop/gnome/background/picture_options zoom
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/postinst b/ubuntu/maverick/defaultsettings/desktop-base/debian/postinst
new file mode 100644
index 000000000..94a22d5b4
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/postinst
@@ -0,0 +1,101 @@
+#!/bin/bash -e
+
+#DEBHELPER#
+
+
+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
+ 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/moreblue-orbit-wallpaper.svg 60
+
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background \
+ /usr/share/images/desktop-base/moreblue-orbit-wallpaper-widescreen.svg 55
+
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background \
+ /usr/share/images/desktop-base/nightly-wallpaper.png 50
+
+ update-alternatives --install \
+ /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
+
+# update-alternatives --install \
+# /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
+
+# update-alternatives --install \
+# /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/moreblue-orbit-splash.png 50
+
+ update-alternatives --install \
+ /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
+
+# update-alternatives --install \
+# /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
+
+ # Alternatives for grub
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub \
+ desktop-grub \
+ /usr/share/images/desktop-base/moreblue-orbit-grub.png 10
+
+ # GRUB background
+ if which update-grub2 > /dev/null ; then
+ update-grub2
+ fi
+
+ if [ -x /sbin/splashy_config ] && [ -w /etc/splashy/config.xml ]; then
+ splashy_config --set-theme moreblue-orbit
+ fi
+
+ if [ -x /usr/sbin/update-initramfs ]; then
+ update-initramfs -u
+ fi
+fi
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/postrm b/ubuntu/maverick/defaultsettings/desktop-base/debian/postrm
new file mode 100644
index 000000000..864bf9e6a
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/postrm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+ if which update-grub2 > /dev/null ; then
+ update-grub2
+ fi
+fi
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/preinst b/ubuntu/maverick/defaultsettings/desktop-base/debian/preinst
new file mode 100644
index 000000000..d46d14701
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/preinst
@@ -0,0 +1,71 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+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
+
+ 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
+
+same_conffile() {
+ CONFFILE="$1"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' desktop-base | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+ [ "$md5sum" = "$old_md5sum" ]
+ return
+ fi
+ return 1
+}
+
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" lt "5.0.2"; then
+ # if the folder is a symlink (installed by splashy), modified files
+ # need to be copied (from /usr/share/splashy/themes) before beeing
+ # replaced. If it's not, they need to be moved (from
+ # /etc/splashy/themes)
+ # not modified files need to be removed if no symlink, and not
+ # touched in case of a symlink
+ THEME_FOLDER="/etc/splashy/themes/moreblue-orbit"
+ THEME_FOLDER_BAK="/etc/splashy.dpkg-old/themes/moreblue-orbit"
+ FILES="background-bw.png background-color.png VeraSans.ttf theme.xml"
+
+ if [ -h /etc/splashy/themes ]; then
+ # symlink
+ for FILE in ${FILES}; do
+ [ -f ${THEME_FOLDER}/${FILE} ] || break
+ if ! same_conffile "${THEME_FOLDER}/${FILE}"; then
+ # symlink and changed file, copy it in a safe place
+ [ -d $THEME_FOLDER_BAK ] || mkdir -p $THEME_FOLDER_BAK
+ cp ${THEME_FOLDER}/${FILE} ${THEME_FOLDER_BAK}/
+ fi
+ done
+ else
+ # real folder
+ for FILE in ${FILES}; do
+ [ -f ${THEME_FOLDER}/${FILE} ] || break
+ if ! same_conffile "${THEME_FOLDER}/${FILE}"; then
+ # real folder and changed file, move it in a safe place
+ [ -d $THEME_FOLDER_BAK ] || mkdir -p $THEME_FOLDER_BAK
+ mv ${THEME_FOLDER}/${FILE} ${THEME_FOLDER_BAK}/
+ else
+ # real folder but unchanged file, just remove it
+ rm ${THEME_FOLDER}/${FILE}
+ fi
+ done
+ fi
+ fi
+ ;;
+esac
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/prerm b/ubuntu/maverick/defaultsettings/desktop-base/debian/prerm
new file mode 100644
index 000000000..bf67f87d8
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/prerm
@@ -0,0 +1,51 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+ # remove background alternatives
+ update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg
+
+ update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/moreblue-orbit-wallpaper-widescreen.svg
+
+ update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/nightly-wallpaper.png
+
+ update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/debian-blueish-wallpaper.svg
+
+ 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
+
+ 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/moreblue-orbit-splash.png
+
+ update-alternatives --remove desktop-splash \
+ /usr/share/images/desktop-base/gnome-splash-curves.png
+
+ 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
+
+ # remove grub alternatives
+ update-alternatives --remove desktop-grub \
+ /usr/share/images/desktop-base/moreblue-orbit-grub.png
+fi
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/rules b/ubuntu/maverick/defaultsettings/desktop-base/debian/rules
new file mode 100755
index 000000000..cb03b05ad
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+# needed for usplash
+CFLAGS += -fPIC
+
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/desktop-base-trinity/
+
+binary-fixup/desktop-base::
+ dh_gconf --priority=15
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides b/ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides
new file mode 100644
index 000000000..cebc8b1f3
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# we ignore ${Misc:Depends} because it would bring gconf
+desktop-base source: debhelper-but-no-misc-depends desktop-base
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst b/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
new file mode 100644
index 000000000..8b26fd83c
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ # Alternatives for usplash
+ update-alternatives --install \
+ /usr/lib/usplash/usplash-artwork.so \
+ usplash-artwork.so \
+ /usr/lib/usplash/moreblue-orbit-theme.so 60
+
+ if [ -x /usr/sbin/update-initramfs ]; then
+ update-initramfs -u
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm b/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
new file mode 100644
index 000000000..079dfdd2b
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ # remove usplash alternatives
+ update-alternatives --remove usplash-artwork.so \
+ /usr/lib/usplash/moreblue-orbit-theme.so
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0