diff --git a/ubuntu/maverick/defaultsettings/desktop-base/Makefile b/ubuntu/maverick/defaultsettings/desktop-base/Makefile
new file mode 100644
index 000000000..f0e466b3f
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/Makefile
@@ -0,0 +1,74 @@
+DEFAULT_BACKGROUND=desktop-background
+
+INSTALL=install -m 0644
+BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga)
+EMBLEMS=$(wildcard emblems/*png emblems/*icon)
+SPLASH=$(wildcard splash/*.png)
+PIXMAPS=$(wildcard pixmaps/*.png)
+DESKTOPFILES=$(wildcard *.desktop)
+
+all:
+# make -C usplash/moreblue-orbit
+
+clean:
+# make -C usplash/moreblue-orbit clean
+
+install:
+ # splashy theme
+ mkdir -p $(DESTDIR)/usr/share/splashy/themes/moreblue-orbit
+ $(INSTALL) $(wildcard splashy/moreblue-orbit/*) $(DESTDIR)/usr/share/splashy/themes/moreblue-orbit
+ # usplash theme
+# make -C usplash/moreblue-orbit install DESTDIR=$(CURDIR)/debian/usplash-theme-debian-desktop/usr/lib/usplash
+ # background files
+ 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
+ # splash files
+ $(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base
+ # emblems
+ mkdir -p $(DESTDIR)/usr/share/icons/hicolor/48x48/emblems
+ $(INSTALL) $(EMBLEMS) $(DESTDIR)/usr/share/icons/hicolor/48x48/emblems/
+ # desktop files
+ mkdir -p $(DESTDIR)/usr/share/desktop-base
+ $(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/
+ # pixmaps files
+ mkdir -p $(DESTDIR)/usr/share/pixmaps
+ $(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
+ # TDM theme
+ mkdir -p $(DESTDIR)/etc/default/tdm.d
+ $(INSTALL) tdm-theme/tdm.d/10_desktop-base $(DESTDIR)/etc/default/tdm.d
+ mkdir -p $(DESTDIR)/usr/share/apps/tdm/themes/debian-moreblue
+ $(INSTALL) $(wildcard tdm-theme/debian-moreblue/*) $(DESTDIR)/usr/share/apps/tdm/themes/debian-moreblue
+ mkdir -p $(DESTDIR)/usr/share/apps/tdm/themes/moreblue-orbit
+ $(INSTALL) $(wildcard tdm-theme/moreblue-orbit/*) $(DESTDIR)/usr/share/apps/tdm/themes/moreblue-orbit
+ mkdir -p $(DESTDIR)/usr/share/apps/tdm/themes/nightly
+ $(INSTALL) $(wildcard tdm-theme/nightly/*) $(DESTDIR)/usr/share/apps/tdm/themes/nightly
+ # KSPLASH theme
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
+ $(INSTALL) $(wildcard ksplash-theme/debian-moreblue-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-moodin
+ $(INSTALL) $(wildcard ksplash-theme/debian-moreblue-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-moodin
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-default
+ $(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-default
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
+ $(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-default
+ $(INSTALL) $(wildcard ksplash-theme/nightly-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-default
+ mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
+ $(INSTALL) $(wildcard ksplash-theme/nightly-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
+ # TDE setup
+ mkdir -p $(DESTDIR)/etc/trinity
+ $(INSTALL) profiles/tde-profile/tdeglobals $(DESTDIR)/etc/trinity
+ mkdir -p $(DESTDIR)/etc/trinity/tdm
+ $(INSTALL) profiles/tde-profile/tdm/backgroundrc $(DESTDIR)/etc/trinity/tdm
+ mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/tde-profile/share/config
+ $(INSTALL) $(wildcard profiles/tde-profile/share/config/*) $(DESTDIR)/usr/share/desktop-base/profiles/tde-profile/share/config
+ # XFCE setup; uses the more general XDG
+ mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
+ $(INSTALL) $(wildcard profiles/xdg-config/xfce4/mcs_settings/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
+ mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
+ $(INSTALL) $(wildcard profiles/xdg-config/xfce4-session/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
+ # GNOME background descriptor
+ mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
+ $(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
new file mode 100644
index 000000000..b545a70b5
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
new file mode 100644
index 000000000..342510f15
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
@@ -0,0 +1,3053 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
new file mode 100644
index 000000000..668819dff
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
@@ -0,0 +1,3045 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
new file mode 100644
index 000000000..f87aa89e6
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
new file mode 100644
index 000000000..ce1826b7f
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
new file mode 100644
index 000000000..f1cc99099
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
new file mode 100644
index 000000000..574c298c2
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
new file mode 100644
index 000000000..d79d09dba
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
new file mode 100644
index 000000000..71d1fe759
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
@@ -0,0 +1,7014 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
new file mode 100644
index 000000000..8908e000c
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
new file mode 100644
index 000000000..622087d7f
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
@@ -0,0 +1,7006 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
new file mode 100644
index 000000000..9ce61a7e8
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
new file mode 100644
index 000000000..2222bac6b
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-desktop-logo.png b/ubuntu/maverick/defaultsettings/desktop-base/debian-desktop-logo.png
new file mode 100644
index 000000000..b1e768aef
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/debian-desktop-logo.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-homepage.desktop b/ubuntu/maverick/defaultsettings/desktop-base/debian-homepage.desktop
new file mode 100644
index 000000000..384bd14fe
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian-homepage.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Home Page
+Comment=The offical web site of the Debian Project
+Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Type=Link
+URL=http://www.debian.org
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-reference.desktop b/ubuntu/maverick/defaultsettings/desktop-base/debian-reference.desktop
new file mode 100644
index 000000000..36a7992e4
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian-reference.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Reference Manual
+Comment=An introduction and reference manual for Debian
+Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Type=Link
+URL=http://www.debian.org/doc/manuals/reference/
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-security.desktop b/ubuntu/maverick/defaultsettings/desktop-base/debian-security.desktop
new file mode 100644
index 000000000..43d6a1e42
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian-security.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Security Updates
+Comment=Learn about new fixed packages
+Icon=/usr/share/pixmaps/debian-security.png
+Type=Link
+URL=http://security.debian.org/
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 Wed, 18 Jan 2012 11:08:00 -0600
+
+desktop-base-trinity (5.0.3-6) squeeze; urgency=low
+
+ * Trinity build
+
+ -- Timothy Pearson 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
+ 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:
+ - remove official logo as it is not DFSG-free (Closes: #246784)
+ * debian/control:
+ - Recommends: epiphany-browser | konqueror | www-browser
+
+ -- Gustavo Noronha Silva 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 25 Oct 2002 00:55:19 -0400
+
+desktop-base (0.1-1) unstable; urgency=low
+
+ * Initial Version (Closes: #165928).
+
+ -- Colin Walters 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
+Uploaders: Loïc Minier ,
+ Fathi Boudra ,
+ Yves-Alexis Perez
+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 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
+, 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.
+
+The Debian_red splash screen imagem was created by
+ 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
+ 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 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 .
+
+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 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
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.icon b/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.icon
new file mode 100644
index 000000000..2fbbb0a5b
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+DisplayName=Debian
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.png b/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.png
new file mode 100644
index 000000000..4927922cc
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/gnome-backgrounds.xml b/ubuntu/maverick/defaultsettings/desktop-base/gnome-backgrounds.xml
new file mode 100644
index 000000000..9391aa82e
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/gnome-backgrounds.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Debian
+ /usr/share/images/desktop-base/desktop-background
+ zoom
+ horizontal-gradient
+ #0099cc
+ #006699
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
new file mode 100644
index 000000000..e582ab8c0
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
new file mode 100644
index 000000000..bc20c1153
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
@@ -0,0 +1,11 @@
+[KSplash Theme: debian-moreblue-default]
+Name = Debian MoreBlue (Default)
+Description = Debian MoreBlue KSplash Theme using Default engine, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Version = 1.0
+Author = Fathi Boudra, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Homepage = http://www.debian.org
+Engine = Default
+
+Icons Flashing = true
+Always Show Progress = false
+Label Foreground = #ffffff
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
new file mode 100644
index 000000000..0572ce2eb
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
new file mode 100644
index 000000000..954cbae6f
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
new file mode 100644
index 000000000..fe09df872
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
new file mode 100644
index 000000000..cc3e4ae43
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
new file mode 100644
index 000000000..d518fd78b
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
new file mode 100644
index 000000000..7b3cba641
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
new file mode 100644
index 000000000..9017a337b
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
new file mode 100644
index 000000000..86ed5f470
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
@@ -0,0 +1,39 @@
+[KSplash Theme: debian-moreblue-moodin]
+Name = Debian MoreBlue (Moodin)
+Description = Debian MoreBlue KSplash Theme using Moodin engine, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Version = 1.0
+Author = Fathi Boudra, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Homepage = http://www.debian.org
+Engine = Moodin
+
+BeginOpacity = 0.1
+Translate = true
+Background = Background.png
+ShowStatusText = true
+UseIconSet = true
+IconSetSize = 32
+LineUpImages = false
+BaseResolution = 1280x1024
+AppendX = true
+ImageSpacer = -1
+Labels = 2
+LabelShadow = false
+
+Image1 = kcmmemory
+Image2 = kcmsystem
+Image3 = printer1
+Image7 = kmenuedit
+Image8 = kmenu
+
+ImageCoords1 = 474,511
+ImageCoords2 = 524,511
+ImageCoords3 = 574,511
+ImageCoords4 = 624,511
+ImageCoords5 = 674,511
+ImageCoords6 = 724,511
+ImageCoords7 = 774,511
+ImageCoords8 = 624,651
+
+StatusFont = DejaVu Sans Condensed,9,-1,5,50,0
+StatusCoords = -1,480
+StatusColor = #222222
\ No newline at end of file
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
new file mode 100644
index 000000000..fadcb633f
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
new file mode 100644
index 000000000..bd9d372d2
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
@@ -0,0 +1,11 @@
+[KSplash Theme: moreblue-orbit-default]
+Name = MoreBlue Orbit (Default)
+Description = MoreBlue Orbit KSplash Theme using Default engine, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Version = 1.0
+Author = Fathi Boudra, based on MoreBlue artwork by Andre L. R. Ferreira and Valessio S. Brito
+Homepage = http://www.debian.org
+Engine = Default
+
+Icons Flashing = true
+Always Show Progress = false
+Label Foreground = #ffffff
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
new file mode 100644
index 000000000..430cf5263
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
new file mode 100644
index 000000000..c62f5372b
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
new file mode 100644
index 000000000..aef8079f3
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
new file mode 100644
index 000000000..8680cc018
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
new file mode 100644
index 000000000..ac8dd37d3
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
new file mode 100644
index 000000000..51d1fca48
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
new file mode 100644
index 000000000..90e503689
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
@@ -0,0 +1,39 @@
+[KSplash Theme: moreblue-orbit-moodin]
+Name = MoreBlue Orbit (Moodin)
+Description = MoreBlue Orbit KSplash Theme using Moodin engine, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Version = 1.0
+Author = Fathi Boudra, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Homepage = http://www.debian.org
+Engine = Moodin
+
+BeginOpacity = 0.1
+Translate = true
+Background = Background.png
+ShowStatusText = true
+UseIconSet = true
+IconSetSize = 32
+LineUpImages = false
+BaseResolution = 1280x1024
+AppendX = true
+ImageSpacer = -1
+Labels = 2
+LabelShadow = false
+
+Image1 = kcmmemory
+Image2 = kcmsystem
+Image3 = printer1
+Image7 = kmenuedit
+Image8 = kmenu
+
+ImageCoords1 = 474,511
+ImageCoords2 = 524,511
+ImageCoords3 = 574,511
+ImageCoords4 = 624,511
+ImageCoords5 = 674,511
+ImageCoords6 = 724,511
+ImageCoords7 = 774,511
+ImageCoords8 = 624,651
+
+StatusFont = DejaVu Sans Condensed,9,-1,5,50,0
+StatusCoords = -1,480
+StatusColor = #222222
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
new file mode 100644
index 000000000..8183df8e3
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
new file mode 100644
index 000000000..2a947a8f5
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
@@ -0,0 +1,8 @@
+[KSplash Theme: nightly-default]
+Name = Nightly (Default)
+Description = Nightly KSplash Theme using Default engine
+Version = 1.0
+Author = Robert Jaehne
+Engine = Default
+
+Icons Flashing = true
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
new file mode 100644
index 000000000..4c842babd
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
new file mode 100644
index 000000000..d12e12ad8
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
new file mode 100644
index 000000000..d2fe82b23
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
new file mode 100644
index 000000000..b4443a4d2
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
new file mode 100644
index 000000000..7fb403585
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
new file mode 100644
index 000000000..a2f883e59
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
new file mode 100644
index 000000000..4ce019d78
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
new file mode 100644
index 000000000..26811fce2
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
new file mode 100644
index 000000000..ed5b3438c
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
new file mode 100644
index 000000000..dd4220d28
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
new file mode 100644
index 000000000..40f348c81
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
new file mode 100644
index 000000000..f76c71bc4
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
new file mode 100644
index 000000000..800e1d284
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
new file mode 100644
index 000000000..4b318ce83
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
new file mode 100644
index 000000000..377c9108e
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
@@ -0,0 +1,25 @@
+[KSplash Theme: nightly-moodin]
+Name = Nightly (Moodin)
+Description = Nightly KSplash Theme using Moodin engine, based on Nightly wallpaper and Vallerie theme, with icons from Nuvola iconset.
+Version = 1.0
+Author = Robert Jaehne
+Engine = Moodin
+
+BeginOpacity = 0.1
+Background = background.png
+BaseResolution = 1600,1200
+
+UseIconSet = false
+
+ShowStatusText = true
+StatusFont = Arial Black L,14,-1,5,50,1
+StatusCoords = -1,350
+
+ImageCoords1 = 50,450
+ImageCoords2 = 250,320
+ImageCoords3 = 450,200
+ImageCoords4 = 650,140
+ImageCoords5 = 850,140
+ImageCoords6 = 1050,200
+ImageCoords7 = 1250,320
+ImageCoords8 = 1450,450
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
new file mode 100644
index 000000000..9ce61a7e8
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
new file mode 100644
index 000000000..e633691ca
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.png b/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.png
new file mode 100644
index 000000000..672ceca49
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.xcf b/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.xcf
new file mode 100644
index 000000000..e806fcd2c
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.xcf differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
new file mode 100644
index 000000000..9aa289c7e
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
@@ -0,0 +1,18 @@
+[Desktop0]
+BackgroundMode=VerticalGradient
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=30,114,160
+Color2=192,192,192
+CurrentWallpaper=0
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=/usr/share/images/desktop-base/moreblue-orbit-wallpaper.png
+WallpaperList=
+WallpaperMode=Scaled
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
new file mode 100644
index 000000000..8bfbc19d1
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
@@ -0,0 +1,2 @@
+[KSplash]
+Theme=moreblue-orbit-default
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
new file mode 100644
index 000000000..507fde04d
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
@@ -0,0 +1,2 @@
+[Directories]
+dir_config=/usr/share/desktop-base/profiles/tde-profile/share/config/
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
new file mode 100644
index 000000000..2db7e8c45
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
@@ -0,0 +1,18 @@
+[Desktop0]
+BackgroundMode=Flat
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=0,0,0
+Color2=192,192,192
+CurrentWallpaperName=
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=/usr/share/images/desktop-base/moreblue-orbit-wallpaper.png
+WallpaperList=
+WallpaperMode=Scaled
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
new file mode 100644
index 000000000..9dcd0663c
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
@@ -0,0 +1,20 @@
+[Splash Screen]
+Engine=simple
+
+[General]
+SessionName=Default
+SaveOnExit=true
+
+# This the default session launched by xfce4-session if the
+# user hasn't saved any session yet or creates a new session.
+[Failsafe Session]
+Count=4
+Client0_Command=xfwm4
+Client0_PerScreen=False
+Client1_Command=xfce4-panel
+Client1_PerScreen=False
+Client2_Command=Thunar,--daemon
+Client2_PerScreen=False
+Client3_Command=xfdesktop
+Client3_PerScreen=False
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
new file mode 100644
index 000000000..fee4fd455
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
@@ -0,0 +1,5 @@
+[Engine: simple]
+Font=Sans Bold 10
+BgColor=#2073a0
+FgColor=#91bad0
+Image=/usr/share/images/desktop-base/desktop-splash
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
new file mode 100644
index 000000000..a1e4ea3ea
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
new file mode 100644
index 000000000..790b7ee75
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
new file mode 100644
index 000000000..e4e3157d4
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-splash-curves.png b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-splash-curves.png
new file mode 100644
index 000000000..98342bd13
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-splash-curves.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png b/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
new file mode 100644
index 000000000..54302fdb3
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
new file mode 100644
index 000000000..979bd5063
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.png b/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.png
new file mode 100644
index 000000000..f9dc212b5
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 b/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
new file mode 100644
index 000000000..bb8c73087
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
new file mode 100644
index 000000000..58cd6b5e6
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
new file mode 100644
index 000000000..233bcc116
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
new file mode 100644
index 000000000..e65a562ce
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
new file mode 100644
index 000000000..ece58c6df
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
@@ -0,0 +1,137 @@
+
+
+
+
+ moreblue-orbit
+ 1.0
+ MoreBlue Orbit theme
+ http://splashy.alioth.debian.org/themes
+ Fathi Boudra
+
+
+
+
+ 33
+ 90
+ 33
+ 1
+
+
+
+ 255
+ 255
+ 255
+ 255
+
+
+
+ no
+
+ 0
+ 0
+ 0
+ 255
+
+
+
+
+
+ 95
+ 146
+ 201
+ 255
+
+
+
+ forward
+ backward
+ forward
+ backward
+
+
+ yes
+ yes
+ yes
+ yes
+
+
+
+
+ background-color.png
+ background-color.png
+ background-bw.png
+ background-bw.png
+ background-bw.png
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+ no
+
+
+ 20
+ 50
+ 60
+ 40
+
+
+
+ 0
+ 0
+ 0
+ 127
+
+
+
+ yes
+
+ 0
+ 0
+ 0
+ 255
+
+
+
+
+
+ VeraSans.ttf
+ 10
+
+
+
+ 128
+ 128
+ 128
+ 255
+
+
+
+ no
+ no
+ no
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..b2a3511af
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=debian-moreblue.xml
+Name=Debian MoreBlue
+Description=Debian MoreBlue KDM Theme, based on Debian MoreBlue GDM Theme by Andre L. R. Ferreira
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira
+Copyright=(c) 2006 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..336b3d1ab
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=debian-moreblue.xml
+Name=Debian MoreBlue
+Description=Debian MoreBlue KDM Theme, based on Debian MoreBlue GDM Theme by Andre L. R. Ferreira
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira
+Copyright=(c) 2006 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
new file mode 100644
index 000000000..4bed799ac
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
@@ -0,0 +1,252 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
new file mode 100644
index 000000000..3ed8404dc
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
new file mode 100644
index 000000000..703e0d0f2
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+-
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ %c
+
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
new file mode 100644
index 000000000..6373e018d
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png
new file mode 100644
index 000000000..ac7843ced
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png
new file mode 100644
index 000000000..fc3e9982c
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
new file mode 100644
index 000000000..afdf212e3
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
@@ -0,0 +1,115 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..b4e9fb6d9
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=moreblue-orbit.xml
+Name=MoreBlue Orbit
+Description=MoreBlue Orbit KDM Theme, based on MoreBlue Orbit GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Copyright=(c) 2008 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..4b90c02ab
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=moreblue-orbit.xml
+Name=MoreBlue Orbit
+Description=MoreBlue Orbit KDM Theme, based on MoreBlue Orbit GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Copyright=(c) 2008 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png
new file mode 100644
index 000000000..69916901f
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
new file mode 100644
index 000000000..b72c3b2f4
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
@@ -0,0 +1,6908 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
new file mode 100644
index 000000000..a09afa171
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
new file mode 100644
index 000000000..6373e018d
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
new file mode 100644
index 000000000..ac7843ced
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
new file mode 100644
index 000000000..2d1234bcd
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+-
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ %c
+
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
new file mode 100644
index 000000000..d8a494dbf
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..7e64bfcc0
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..2eae79097
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne
+Screenshot=screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png
new file mode 100644
index 000000000..41aba5d88
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png
new file mode 100644
index 000000000..a1f0345ed
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System.png
new file mode 100644
index 000000000..240c2d9b5
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png
new file mode 100644
index 000000000..4bea4e785
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/background.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/background.png
new file mode 100644
index 000000000..e7a091ee7
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/background.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png
new file mode 100644
index 000000000..223b74725
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
new file mode 100644
index 000000000..22c6c1bd8
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
@@ -0,0 +1,139 @@
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
-
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+-
+
+
+
+
+-
+
+
+
+
-
+
+
+ %c
+
+
+
+ -
+
+
-
+
+
+
+
+ -
+
+
+
+
+ Sessions
+ Sessió
+ Sesión
+ Session
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+ -
+
+
+
+
+ System Menu
+ Menú
+ Menú
+ Menu
+
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png
new file mode 100644
index 000000000..cf5236829
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
new file mode 100644
index 000000000..eadf355ac
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
@@ -0,0 +1,3 @@
+USETHEME="true"
+THEME="/usr/share/apps/tdm/themes/moreblue-orbit"
+WALLPAPER="/usr/share/apps/tdm/themes/moreblue-orbit/background.png"
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
new file mode 100644
index 000000000..6f677f506
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
@@ -0,0 +1,120 @@
+# usplash-theme-debian - Makefile
+#
+# Copyright © 2006 - 2007 David Härdeman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# This is the list of sizes to build and include in the theme
+# By convention, the sizes should go from smaller to larger
+sizes = 640x480 800x600 1024x768 1280x1024
+
+# This creates a list with entries like background_800x600.png...
+backgrounds = $(addsuffix .png, $(addprefix background_, $(sizes)))
+background_objs = $(backgrounds:.png=.o)
+progressfgs = $(addsuffix .png, $(addprefix progressfg_, $(sizes)))
+progressfg_objs = $(progressfgs:.png=.o)
+progressbgs = $(addsuffix .png, $(addprefix progressbg_, $(sizes)))
+progressbg_objs = $(progressbgs:.png=.o)
+theme = moreblue-orbit-theme.so
+
+CC = gcc
+CFLAGS = -g -Wall -fPIC
+LDFLAGS =
+INCLUDES =
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS)
+
+INSTALL = install
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_PROG = $(INSTALL) -m 755
+
+DESTDIR = /usr/lib/usplash
+
+# Default = silent build
+V =
+ifeq ($(strip $(V)),)
+E = @echo
+Q = @
+else
+E = @\#
+Q =
+endif
+export E Q
+
+all: $(theme)
+.PHONY: all
+.DEFAULT: all
+
+$(theme): theme.o $(background_objs) $(progressfg_objs) $(progressbg_objs)
+ $(E) " LINK " $@
+ $(Q) $(COMPILE) -shared -o $@ $^
+
+theme.h: theme.in progress.png themesetup.sh $(backgrounds) $(progressfgs) $(progressbgs)
+ $(E) " THMPARM " $@
+ $(Q) ./themesetup.sh $(sizes) > $@
+
+theme.o: theme.c theme.h
+
+background_%.png: background.svg cmap.gif
+ $(E) " BG " $@
+ $(Q) rsvg-convert -w `echo $* | cut -dx -f1` -h `echo $* | cut -dx -f2` -f png $< > $@
+
+progressfg_%.png: background_%.png progress.png cmap.gif
+ $(E) " PROGFG " $@
+ $(Q) composite -compose dst_over -gravity center $< progress.png $@
+
+progressbg_%.png: background_%.png progress.png cmap.gif
+ $(E) " PROGBG " $@
+ $(Q) composite -gravity center -dissolve 25x100 progress.png $< png:- | \
+ composite -gravity center -compose src_over png:- progress.png $@
+
+%.o: %.c
+ $(E) " CC " $@
+ $(Q) $(COMPILE) -o $@ -c $<
+
+%.c: %.png cmap.gif
+ $(E) " PNGSRC " $@
+ $(Q) convert $< +dither -map cmap.gif gif:- | \
+ convert gif:- $<
+ $(Q) pngtousplash $< > $@
+
+#cmap.gif: background.svg progress.png
+# $(E) " CMAP " $@
+# $(Q) rsvg-convert -w 1024 -h 768 -f png background.svg | \
+# composite -compose src_over -gravity center progress.png png:- +dither cmap.gif
+
+install: $(theme)
+ $(E) " INSTALL " $<
+ $(Q) $(INSTALL_DATA) -D $< $(DESTDIR)/$(theme)
+.PHONY: install
+
+install-strip: $(theme)
+ $(MAKE) INSTALL='$(INSTALL) -s' install
+.PHONY: install-strip
+
+clean:
+ $(E) " CLEAN "
+ $(Q) - find . -type f -name '*.png.c' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.cfont' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.o' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.so' -print0 | xargs -0r rm -f
+# $(Q) - find . -type f -name 'cmap.*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'background_*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'progressfg_*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'progressbg_*' -print0 | xargs -0r rm -f
+ $(Q) - rm -f theme.h
+.PHONY: clean
+
+.PRECIOUS: %.c progressbg_%.png progressfg_%.png background_%.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
new file mode 100644
index 000000000..d60e2ed74
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
@@ -0,0 +1,6773 @@
+
+
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
new file mode 100644
index 000000000..ac8c4b80a
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
new file mode 100644
index 000000000..de57c529f
Binary files /dev/null and b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png differ
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
new file mode 100644
index 000000000..59632522e
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
@@ -0,0 +1,178 @@
+/* usplash
+ *
+ * theme.c - theme definition
+ *
+ * Copyright © 2006 David Härdeman
+ * based on example-theme from usplash which is
+ * Copyright © 2006 Dennis Kaarsemaker
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include
+#include
+
+void t_init(struct usplash_theme *theme);
+void t_draw_progressbar(struct usplash_theme *theme, int percentage);
+void t_clear_progressbar(struct usplash_theme *theme);
+void t_clear_text(struct usplash_theme *theme);
+void t_animate_step(struct usplash_theme* theme, int pulsating);
+
+/* Auto-generated theme definitions */
+#include "theme.h"
+
+static struct private_hack *phack = NULL;
+
+void
+t_init(struct usplash_theme *theme)
+{
+ int x, y;
+
+ /* START - HACKS R US */
+ phack = (struct private_hack *)theme->font;
+ theme->font = NULL;
+ /* FINISH - HACKS R US */
+ usplash_getdimensions(&x, &y);
+ theme->progressbar_x = (x - theme->pixmap->width)/2 + theme->progressbar_x;
+ theme->progressbar_y = (y - theme->pixmap->height)/2 + theme->progressbar_y;
+}
+
+void
+t_draw_progressbar(struct usplash_theme *theme, int percentage)
+{
+ int w = (phack->progress_bg->width * percentage / 100);
+ static int last_w = 0;
+
+ if (w != 0 && w == last_w)
+ return;
+
+ /* Check if we're changing mode between startup and shutdown */
+ if (last_w >= 0 && w < 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_fg);
+ last_w = 0;
+ } else if (last_w < 0 && w > 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_bg);
+ last_w = 0;
+ }
+
+ /* Draw only the part which has changed since last time */
+ if (percentage == 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_bg);
+ } else if (percentage < 0) {
+ usplash_put_part(theme->progressbar_x - last_w,
+ theme->progressbar_y,
+ -w + last_w,
+ phack->progress_bg->height,
+ phack->progress_bg,
+ -last_w, 0);
+ } else if (percentage > 0) {
+ usplash_put_part(theme->progressbar_x + last_w,
+ theme->progressbar_y,
+ w - last_w,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ last_w, 0);
+ }
+
+ last_w = w;
+}
+
+void
+t_clear_progressbar(struct usplash_theme *theme)
+{
+ t_draw_progressbar(theme, 0);
+}
+
+void
+t_clear_text(struct usplash_theme *theme)
+{
+ int x, y, x1, y1, x2, y2;
+ usplash_getdimensions(&x, &y);
+
+ /* Draw outer border */
+ x1 = (x - theme->pixmap->width)/2 + theme->text_x - TEXT_EXTRA_PX;
+ y1 = (y - theme->pixmap->height)/2 + theme->text_y - TEXT_EXTRA_PX;
+ x2 = x1 + theme->text_width + 2 * TEXT_EXTRA_PX;
+ y2 = y1 + theme->text_height + 2 * TEXT_EXTRA_PX;
+ usplash_clear(x1, y1, x2, y2, theme->text_foreground);
+
+ /* Draw main text area with TEXT_BORDER_PX pixels padding */
+ x1 += TEXT_BORDER_PX;
+ y1 += TEXT_BORDER_PX;
+ x2 -= TEXT_BORDER_PX;
+ y2 -= TEXT_BORDER_PX;
+ usplash_clear(x1, y1, x2, y2, theme->text_background);
+}
+
+void
+t_animate_step(struct usplash_theme* theme, int pulsating)
+{
+ static int pulsate_step = 0;
+ static int pulse_width = 70;
+ static int step_width = 1;
+ static int prev_step = 0;
+ static int reset = 1;
+ int num_steps = (phack->progress_fg->width - pulse_width)/step_width;
+ int x1;
+
+ if (!pulsating) {
+ reset = 1;
+ return;
+ }
+
+ if (reset) {
+ /* Reset pulse */
+ t_clear_progressbar(theme);
+ reset = 0;
+ pulsate_step = 0;
+ usplash_put_part(theme->progressbar_x,
+ theme->progressbar_y,
+ pulse_width,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ 0, 0);
+ } else {
+ /* Remove from left hand side of pulse */
+ x1 = step_width * prev_step;
+ usplash_put_part(theme->progressbar_x + x1,
+ theme->progressbar_y,
+ step_width,
+ phack->progress_bg->height,
+ phack->progress_bg,
+ x1, 0);
+ }
+
+ /* Add to right hand side of pulse */
+ x1 = step_width * pulsate_step + pulse_width;
+ usplash_put_part(theme->progressbar_x + x1,
+ theme->progressbar_y,
+ step_width,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ x1, 0);
+
+ /* Check for wraparound */
+ prev_step = pulsate_step;
+ pulsate_step++;
+ if (pulsate_step >= num_steps)
+ reset = 1;
+}
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
new file mode 100644
index 000000000..ae8c4dd26
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
@@ -0,0 +1,20 @@
+#define PALETTE_BG 0
+#define PALETTE_PROGRESS_FG 0
+#define PALETTE_PROGRESS_BG 0
+#define PALETTE_TEXT_BG 251
+#define PALETTE_TEXT_FG 0
+#define PALETTE_TEXT_SUCCESS 67
+#define PALETTE_TEXT_FAILURE 134
+
+#define TEXT_BORDER_PX 1
+#define TEXT_PADDING_PX 9
+#define TEXT_EXTRA_PX (TEXT_BORDER_PX + TEXT_PADDING_PX)
+#define TEXT_MARGIN 30
+
+/* Horrible hack */
+struct private_hack {
+ struct usplash_pixmap *pixmap; /* Background image */
+ struct usplash_pixmap *progress_fg; /* Progress bar foreground */
+ struct usplash_pixmap *progress_bg; /* Progress bar background */
+};
+
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
new file mode 100755
index 000000000..81f0bd882
--- /dev/null
+++ b/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+#
+# Sanity checks
+#
+if [ ! -e theme.in ]; then
+ exit 1
+fi
+
+if [ $# -lt 1 ]; then
+ exit 1
+fi
+
+#
+# Helper functions
+#
+struct_name() {
+ name=${1%.*}
+ echo "pixmap_$name"
+}
+
+#
+# Begin processing
+#
+
+echo "/*"
+echo " * Part 1 - Generic header part"
+echo " */"
+cat theme.in
+echo
+
+
+
+echo "/*"
+echo " * Part 2 - Forward theme struct declarations"
+echo " */"
+first=yes
+for size in $@; do
+ if [ $first = "yes" ]; then
+ THEMENAME="usplash_theme"
+ first=no
+ else
+ THEMENAME="usplash_theme_$size"
+ fi
+ echo "struct usplash_theme $THEMENAME;"
+done
+echo
+
+
+
+echo "/*"
+echo " * Step 3 - Actual theme struct defs"
+echo " */"
+first=yes
+while [ 1 ]; do
+ size="$1"
+ if [ -z "$size" ]; then
+ exit 0
+ fi
+
+ if [ $first = "yes" ]; then
+ THEMENAME="usplash_theme"
+ first=no
+ else
+ THEMENAME="usplash_theme_$size"
+ fi
+
+ if [ -z "$2" ]; then
+ THEMENEXT="NULL"
+ else
+ THEMENEXT="&usplash_theme_$2"
+ fi
+ shift
+
+ PGFG_PIX="progressfg_$size.png"
+ PGFG_STRUCT=$(struct_name "$PGFG_PIX")
+ PGBG_PIX="progressbg_$size.png"
+ PGBG_STRUCT=$(struct_name "$PGBG_PIX")
+ BG_PIX="background_$size.png"
+ BG_STRUCT=$(struct_name "$BG_PIX")
+
+ PROGRESS_WIDTH=$( identify "$PGFG_PIX" | cut -d' ' -f3 | cut -dx -f1)
+ PROGRESS_HEIGHT=$( identify "$PGFG_PIX" | cut -d' ' -f3 | cut -dx -f2)
+ WIDTH=${size%x*}
+ HEIGHT=${size#*x}
+
+ if [ $(( $WIDTH / 16 )) -eq $(( $HEIGHT / 9 )) ]; then
+ RATIO="USPLASH_16_9"
+ else
+ RATIO="USPLASH_4_3"
+ fi
+
+ cat <
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
new file mode 100644
index 000000000..668819dff
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
@@ -0,0 +1,3045 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
new file mode 100644
index 000000000..f87aa89e6
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
new file mode 100644
index 000000000..ce1826b7f
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
new file mode 100644
index 000000000..f1cc99099
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
new file mode 100644
index 000000000..574c298c2
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
new file mode 100644
index 000000000..d79d09dba
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
new file mode 100644
index 000000000..71d1fe759
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
@@ -0,0 +1,7014 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
new file mode 100644
index 000000000..8908e000c
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
new file mode 100644
index 000000000..622087d7f
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
@@ -0,0 +1,7006 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
new file mode 100644
index 000000000..9ce61a7e8
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
new file mode 100644
index 000000000..2222bac6b
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian-desktop-logo.png b/ubuntu/raring/defaultsettings/desktop-base/debian-desktop-logo.png
new file mode 100644
index 000000000..b1e768aef
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/debian-desktop-logo.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian-homepage.desktop b/ubuntu/raring/defaultsettings/desktop-base/debian-homepage.desktop
new file mode 100644
index 000000000..384bd14fe
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian-homepage.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Home Page
+Comment=The offical web site of the Debian Project
+Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Type=Link
+URL=http://www.debian.org
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian-reference.desktop b/ubuntu/raring/defaultsettings/desktop-base/debian-reference.desktop
new file mode 100644
index 000000000..36a7992e4
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian-reference.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Reference Manual
+Comment=An introduction and reference manual for Debian
+Icon=/usr/share/pixmaps/debian-official-logo-small.png
+Type=Link
+URL=http://www.debian.org/doc/manuals/reference/
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian-security.desktop b/ubuntu/raring/defaultsettings/desktop-base/debian-security.desktop
new file mode 100644
index 000000000..43d6a1e42
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian-security.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Debian Security Updates
+Comment=Learn about new fixed packages
+Icon=/usr/share/pixmaps/debian-security.png
+Type=Link
+URL=http://security.debian.org/
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian/README.Debian b/ubuntu/raring/defaultsettings/desktop-base/debian/README.Debian
new file mode 100644
index 000000000..260c6fb02
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/changelog b/ubuntu/raring/defaultsettings/desktop-base/debian/changelog
new file mode 100644
index 000000000..c09beb592
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian/changelog
@@ -0,0 +1,447 @@
+desktop-base-trinity (5.0.3-8) squeeze; urgency=low
+
+ * Fix gnome conflicts
+
+ -- Timothy Pearson Wed, 18 Jan 2012 11:08:00 -0600
+
+desktop-base-trinity (5.0.3-6) squeeze; urgency=low
+
+ * Trinity build
+
+ -- Timothy Pearson 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
+ 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:
+ - remove official logo as it is not DFSG-free (Closes: #246784)
+ * debian/control:
+ - Recommends: epiphany-browser | konqueror | www-browser
+
+ -- Gustavo Noronha Silva 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 25 Oct 2002 00:55:19 -0400
+
+desktop-base (0.1-1) unstable; urgency=low
+
+ * Initial Version (Closes: #165928).
+
+ -- Colin Walters Tue, 22 Oct 2002 15:05:34 -0400
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian/compat b/ubuntu/raring/defaultsettings/desktop-base/debian/compat
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian/control b/ubuntu/raring/defaultsettings/desktop-base/debian/control
new file mode 100644
index 000000000..820e9e21e
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian/control
@@ -0,0 +1,34 @@
+Source: desktop-base-trinity
+Section: x11
+Priority: optional
+Maintainer: Timothy Pearson
+Uploaders: Loïc Minier ,
+ Fathi Boudra ,
+ Yves-Alexis Perez
+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/raring/defaultsettings/desktop-base/debian/copyright b/ubuntu/raring/defaultsettings/desktop-base/debian/copyright
new file mode 100644
index 000000000..990146cb7
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian/copyright
@@ -0,0 +1,72 @@
+This package was debianized by Colin Walters 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
+, 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.
+
+The Debian_red splash screen imagem was created by
+ 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
+ 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 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 .
+
+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 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/raring/defaultsettings/desktop-base/debian/gconf-defaults b/ubuntu/raring/defaultsettings/desktop-base/debian/gconf-defaults
new file mode 100644
index 000000000..10e4b8297
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/postinst b/ubuntu/raring/defaultsettings/desktop-base/debian/postinst
new file mode 100644
index 000000000..94a22d5b4
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/postrm b/ubuntu/raring/defaultsettings/desktop-base/debian/postrm
new file mode 100644
index 000000000..864bf9e6a
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/preinst b/ubuntu/raring/defaultsettings/desktop-base/debian/preinst
new file mode 100644
index 000000000..d46d14701
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/prerm b/ubuntu/raring/defaultsettings/desktop-base/debian/prerm
new file mode 100644
index 000000000..bf67f87d8
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/rules b/ubuntu/raring/defaultsettings/desktop-base/debian/rules
new file mode 100755
index 000000000..cb03b05ad
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/source.lintian-overrides b/ubuntu/raring/defaultsettings/desktop-base/debian/source.lintian-overrides
new file mode 100644
index 000000000..cebc8b1f3
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst b/ubuntu/raring/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
new file mode 100644
index 000000000..8b26fd83c
--- /dev/null
+++ b/ubuntu/raring/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/raring/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm b/ubuntu/raring/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
new file mode 100644
index 000000000..079dfdd2b
--- /dev/null
+++ b/ubuntu/raring/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
diff --git a/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.icon b/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.icon
new file mode 100644
index 000000000..2fbbb0a5b
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.icon
@@ -0,0 +1,2 @@
+[Icon Data]
+DisplayName=Debian
diff --git a/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.png b/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.png
new file mode 100644
index 000000000..4927922cc
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/emblems/emblem-debian.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/gnome-backgrounds.xml b/ubuntu/raring/defaultsettings/desktop-base/gnome-backgrounds.xml
new file mode 100644
index 000000000..9391aa82e
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/gnome-backgrounds.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Debian
+ /usr/share/images/desktop-base/desktop-background
+ zoom
+ horizontal-gradient
+ #0099cc
+ #006699
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
new file mode 100644
index 000000000..e582ab8c0
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
new file mode 100644
index 000000000..bc20c1153
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
@@ -0,0 +1,11 @@
+[KSplash Theme: debian-moreblue-default]
+Name = Debian MoreBlue (Default)
+Description = Debian MoreBlue KSplash Theme using Default engine, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Version = 1.0
+Author = Fathi Boudra, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Homepage = http://www.debian.org
+Engine = Default
+
+Icons Flashing = true
+Always Show Progress = false
+Label Foreground = #ffffff
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
new file mode 100644
index 000000000..0572ce2eb
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
new file mode 100644
index 000000000..954cbae6f
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
new file mode 100644
index 000000000..fe09df872
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
new file mode 100644
index 000000000..cc3e4ae43
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
new file mode 100644
index 000000000..d518fd78b
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
new file mode 100644
index 000000000..7b3cba641
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
new file mode 100644
index 000000000..9017a337b
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
new file mode 100644
index 000000000..86ed5f470
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
@@ -0,0 +1,39 @@
+[KSplash Theme: debian-moreblue-moodin]
+Name = Debian MoreBlue (Moodin)
+Description = Debian MoreBlue KSplash Theme using Moodin engine, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Version = 1.0
+Author = Fathi Boudra, based on Debian MoreBlue artwork by Andre L. R. Ferreira
+Homepage = http://www.debian.org
+Engine = Moodin
+
+BeginOpacity = 0.1
+Translate = true
+Background = Background.png
+ShowStatusText = true
+UseIconSet = true
+IconSetSize = 32
+LineUpImages = false
+BaseResolution = 1280x1024
+AppendX = true
+ImageSpacer = -1
+Labels = 2
+LabelShadow = false
+
+Image1 = kcmmemory
+Image2 = kcmsystem
+Image3 = printer1
+Image7 = kmenuedit
+Image8 = kmenu
+
+ImageCoords1 = 474,511
+ImageCoords2 = 524,511
+ImageCoords3 = 574,511
+ImageCoords4 = 624,511
+ImageCoords5 = 674,511
+ImageCoords6 = 724,511
+ImageCoords7 = 774,511
+ImageCoords8 = 624,651
+
+StatusFont = DejaVu Sans Condensed,9,-1,5,50,0
+StatusCoords = -1,480
+StatusColor = #222222
\ No newline at end of file
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
new file mode 100644
index 000000000..fadcb633f
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
new file mode 100644
index 000000000..bd9d372d2
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
@@ -0,0 +1,11 @@
+[KSplash Theme: moreblue-orbit-default]
+Name = MoreBlue Orbit (Default)
+Description = MoreBlue Orbit KSplash Theme using Default engine, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Version = 1.0
+Author = Fathi Boudra, based on MoreBlue artwork by Andre L. R. Ferreira and Valessio S. Brito
+Homepage = http://www.debian.org
+Engine = Default
+
+Icons Flashing = true
+Always Show Progress = false
+Label Foreground = #ffffff
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
new file mode 100644
index 000000000..430cf5263
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
new file mode 100644
index 000000000..c62f5372b
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
new file mode 100644
index 000000000..aef8079f3
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
new file mode 100644
index 000000000..8680cc018
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
new file mode 100644
index 000000000..ac8dd37d3
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
new file mode 100644
index 000000000..51d1fca48
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
new file mode 100644
index 000000000..90e503689
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
@@ -0,0 +1,39 @@
+[KSplash Theme: moreblue-orbit-moodin]
+Name = MoreBlue Orbit (Moodin)
+Description = MoreBlue Orbit KSplash Theme using Moodin engine, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Version = 1.0
+Author = Fathi Boudra, based on MoreBlue Orbit artwork by Andre L. R. Ferreira and Valessio S. Brito
+Homepage = http://www.debian.org
+Engine = Moodin
+
+BeginOpacity = 0.1
+Translate = true
+Background = Background.png
+ShowStatusText = true
+UseIconSet = true
+IconSetSize = 32
+LineUpImages = false
+BaseResolution = 1280x1024
+AppendX = true
+ImageSpacer = -1
+Labels = 2
+LabelShadow = false
+
+Image1 = kcmmemory
+Image2 = kcmsystem
+Image3 = printer1
+Image7 = kmenuedit
+Image8 = kmenu
+
+ImageCoords1 = 474,511
+ImageCoords2 = 524,511
+ImageCoords3 = 574,511
+ImageCoords4 = 624,511
+ImageCoords5 = 674,511
+ImageCoords6 = 724,511
+ImageCoords7 = 774,511
+ImageCoords8 = 624,651
+
+StatusFont = DejaVu Sans Condensed,9,-1,5,50,0
+StatusCoords = -1,480
+StatusColor = #222222
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
new file mode 100644
index 000000000..8183df8e3
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
new file mode 100644
index 000000000..2a947a8f5
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
@@ -0,0 +1,8 @@
+[KSplash Theme: nightly-default]
+Name = Nightly (Default)
+Description = Nightly KSplash Theme using Default engine
+Version = 1.0
+Author = Robert Jaehne
+Engine = Default
+
+Icons Flashing = true
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
new file mode 100644
index 000000000..4c842babd
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
new file mode 100644
index 000000000..d12e12ad8
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
new file mode 100644
index 000000000..d2fe82b23
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
new file mode 100644
index 000000000..b4443a4d2
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
new file mode 100644
index 000000000..7fb403585
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
new file mode 100644
index 000000000..a2f883e59
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
new file mode 100644
index 000000000..4ce019d78
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
new file mode 100644
index 000000000..26811fce2
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
new file mode 100644
index 000000000..ed5b3438c
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
new file mode 100644
index 000000000..dd4220d28
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
new file mode 100644
index 000000000..40f348c81
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
new file mode 100644
index 000000000..f76c71bc4
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
new file mode 100644
index 000000000..800e1d284
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
new file mode 100644
index 000000000..4b318ce83
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
new file mode 100644
index 000000000..377c9108e
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
@@ -0,0 +1,25 @@
+[KSplash Theme: nightly-moodin]
+Name = Nightly (Moodin)
+Description = Nightly KSplash Theme using Moodin engine, based on Nightly wallpaper and Vallerie theme, with icons from Nuvola iconset.
+Version = 1.0
+Author = Robert Jaehne
+Engine = Moodin
+
+BeginOpacity = 0.1
+Background = background.png
+BaseResolution = 1600,1200
+
+UseIconSet = false
+
+ShowStatusText = true
+StatusFont = Arial Black L,14,-1,5,50,1
+StatusCoords = -1,350
+
+ImageCoords1 = 50,450
+ImageCoords2 = 250,320
+ImageCoords3 = 450,200
+ImageCoords4 = 650,140
+ImageCoords5 = 850,140
+ImageCoords6 = 1050,200
+ImageCoords7 = 1250,320
+ImageCoords8 = 1450,450
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
new file mode 100644
index 000000000..9ce61a7e8
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
new file mode 100644
index 000000000..e633691ca
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.png b/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.png
new file mode 100644
index 000000000..672ceca49
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.xcf b/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.xcf
new file mode 100644
index 000000000..e806fcd2c
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/pixmaps/debian-security.xcf differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
new file mode 100644
index 000000000..9aa289c7e
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
@@ -0,0 +1,18 @@
+[Desktop0]
+BackgroundMode=VerticalGradient
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=30,114,160
+Color2=192,192,192
+CurrentWallpaper=0
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=/usr/share/images/desktop-base/moreblue-orbit-wallpaper.png
+WallpaperList=
+WallpaperMode=Scaled
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
new file mode 100644
index 000000000..8bfbc19d1
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
@@ -0,0 +1,2 @@
+[KSplash]
+Theme=moreblue-orbit-default
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
new file mode 100644
index 000000000..507fde04d
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
@@ -0,0 +1,2 @@
+[Directories]
+dir_config=/usr/share/desktop-base/profiles/tde-profile/share/config/
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
new file mode 100644
index 000000000..2db7e8c45
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
@@ -0,0 +1,18 @@
+[Desktop0]
+BackgroundMode=Flat
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=0,0,0
+Color2=192,192,192
+CurrentWallpaperName=
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=/usr/share/images/desktop-base/moreblue-orbit-wallpaper.png
+WallpaperList=
+WallpaperMode=Scaled
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
new file mode 100644
index 000000000..9dcd0663c
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
@@ -0,0 +1,20 @@
+[Splash Screen]
+Engine=simple
+
+[General]
+SessionName=Default
+SaveOnExit=true
+
+# This the default session launched by xfce4-session if the
+# user hasn't saved any session yet or creates a new session.
+[Failsafe Session]
+Count=4
+Client0_Command=xfwm4
+Client0_PerScreen=False
+Client1_Command=xfce4-panel
+Client1_PerScreen=False
+Client2_Command=Thunar,--daemon
+Client2_PerScreen=False
+Client3_Command=xfdesktop
+Client3_PerScreen=False
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
new file mode 100644
index 000000000..fee4fd455
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
@@ -0,0 +1,5 @@
+[Engine: simple]
+Font=Sans Bold 10
+BgColor=#2073a0
+FgColor=#91bad0
+Image=/usr/share/images/desktop-base/desktop-splash
diff --git a/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
new file mode 100644
index 000000000..a1e4ea3ea
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
new file mode 100644
index 000000000..790b7ee75
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
new file mode 100644
index 000000000..e4e3157d4
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-splash-curves.png b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-splash-curves.png
new file mode 100644
index 000000000..98342bd13
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/gnome-splash-curves.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png b/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
new file mode 100644
index 000000000..54302fdb3
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
new file mode 100644
index 000000000..979bd5063
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.png b/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.png
new file mode 100644
index 000000000..f9dc212b5
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 b/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
new file mode 100644
index 000000000..bb8c73087
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
new file mode 100644
index 000000000..58cd6b5e6
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
new file mode 100644
index 000000000..233bcc116
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
new file mode 100644
index 000000000..e65a562ce
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
new file mode 100644
index 000000000..ece58c6df
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
@@ -0,0 +1,137 @@
+
+
+
+
+ moreblue-orbit
+ 1.0
+ MoreBlue Orbit theme
+ http://splashy.alioth.debian.org/themes
+ Fathi Boudra
+
+
+
+
+ 33
+ 90
+ 33
+ 1
+
+
+
+ 255
+ 255
+ 255
+ 255
+
+
+
+ no
+
+ 0
+ 0
+ 0
+ 255
+
+
+
+
+
+ 95
+ 146
+ 201
+ 255
+
+
+
+ forward
+ backward
+ forward
+ backward
+
+
+ yes
+ yes
+ yes
+ yes
+
+
+
+
+ background-color.png
+ background-color.png
+ background-bw.png
+ background-bw.png
+ background-bw.png
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+ no
+
+
+ 20
+ 50
+ 60
+ 40
+
+
+
+ 0
+ 0
+ 0
+ 127
+
+
+
+ yes
+
+ 0
+ 0
+ 0
+ 255
+
+
+
+
+
+ VeraSans.ttf
+ 10
+
+
+
+ 128
+ 128
+ 128
+ 255
+
+
+
+ no
+ no
+ no
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..b2a3511af
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=debian-moreblue.xml
+Name=Debian MoreBlue
+Description=Debian MoreBlue KDM Theme, based on Debian MoreBlue GDM Theme by Andre L. R. Ferreira
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira
+Copyright=(c) 2006 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..336b3d1ab
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=debian-moreblue.xml
+Name=Debian MoreBlue
+Description=Debian MoreBlue KDM Theme, based on Debian MoreBlue GDM Theme by Andre L. R. Ferreira
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira
+Copyright=(c) 2006 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
new file mode 100644
index 000000000..4bed799ac
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
@@ -0,0 +1,252 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
new file mode 100644
index 000000000..3ed8404dc
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
new file mode 100644
index 000000000..703e0d0f2
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+-
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ %c
+
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
new file mode 100644
index 000000000..6373e018d
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png
new file mode 100644
index 000000000..ac7843ced
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png
new file mode 100644
index 000000000..fc3e9982c
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
new file mode 100644
index 000000000..afdf212e3
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
@@ -0,0 +1,115 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..b4e9fb6d9
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=moreblue-orbit.xml
+Name=MoreBlue Orbit
+Description=MoreBlue Orbit KDM Theme, based on MoreBlue Orbit GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Copyright=(c) 2008 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..4b90c02ab
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=moreblue-orbit.xml
+Name=MoreBlue Orbit
+Description=MoreBlue Orbit KDM Theme, based on MoreBlue Orbit GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Author=Fathi Boudra, based on same GDM Theme by Andre L. R. Ferreira and Valessio S. Brito
+Copyright=(c) 2008 Fathi Boudra
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png
new file mode 100644
index 000000000..69916901f
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
new file mode 100644
index 000000000..b72c3b2f4
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
@@ -0,0 +1,6908 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
new file mode 100644
index 000000000..a09afa171
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
new file mode 100644
index 000000000..6373e018d
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
new file mode 100644
index 000000000..ac7843ced
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
new file mode 100644
index 000000000..2d1234bcd
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+-
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ %c
+
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
new file mode 100644
index 000000000..d8a494dbf
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
new file mode 100644
index 000000000..7e64bfcc0
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
new file mode 100644
index 000000000..2eae79097
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=nightly.xml
+Name=Nightly
+Description=Nightly KDM Theme
+Author=Robert Jaehne
+Copyright=(c) 2008 Robert Jaehne
+Screenshot=screenshot.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png
new file mode 100644
index 000000000..41aba5d88
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png
new file mode 100644
index 000000000..a1f0345ed
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System.png
new file mode 100644
index 000000000..240c2d9b5
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png
new file mode 100644
index 000000000..4bea4e785
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/background.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/background.png
new file mode 100644
index 000000000..e7a091ee7
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/background.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png
new file mode 100644
index 000000000..223b74725
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
new file mode 100644
index 000000000..22c6c1bd8
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
@@ -0,0 +1,139 @@
+
+
+
+
+
+-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
-
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+ -
+
+
+
-
+
+
+
-
+
+
+ Login failed.
+
+
+
+
+
+
+
+-
+
+
+
+
+-
+
+
+
+
-
+
+
+ %c
+
+
+
+ -
+
+
-
+
+
+
+
+ -
+
+
+
+
+ Sessions
+ Sessió
+ Sesión
+ Session
+
+
+
+
+ -
+
+
+
-
+
+
+
+
+ -
+
+
+
+
+ System Menu
+ Menú
+ Menú
+ Menu
+
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png
new file mode 100644
index 000000000..cf5236829
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
new file mode 100644
index 000000000..eadf355ac
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
@@ -0,0 +1,3 @@
+USETHEME="true"
+THEME="/usr/share/apps/tdm/themes/moreblue-orbit"
+WALLPAPER="/usr/share/apps/tdm/themes/moreblue-orbit/background.png"
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
new file mode 100644
index 000000000..6f677f506
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
@@ -0,0 +1,120 @@
+# usplash-theme-debian - Makefile
+#
+# Copyright © 2006 - 2007 David Härdeman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# This is the list of sizes to build and include in the theme
+# By convention, the sizes should go from smaller to larger
+sizes = 640x480 800x600 1024x768 1280x1024
+
+# This creates a list with entries like background_800x600.png...
+backgrounds = $(addsuffix .png, $(addprefix background_, $(sizes)))
+background_objs = $(backgrounds:.png=.o)
+progressfgs = $(addsuffix .png, $(addprefix progressfg_, $(sizes)))
+progressfg_objs = $(progressfgs:.png=.o)
+progressbgs = $(addsuffix .png, $(addprefix progressbg_, $(sizes)))
+progressbg_objs = $(progressbgs:.png=.o)
+theme = moreblue-orbit-theme.so
+
+CC = gcc
+CFLAGS = -g -Wall -fPIC
+LDFLAGS =
+INCLUDES =
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS)
+
+INSTALL = install
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_PROG = $(INSTALL) -m 755
+
+DESTDIR = /usr/lib/usplash
+
+# Default = silent build
+V =
+ifeq ($(strip $(V)),)
+E = @echo
+Q = @
+else
+E = @\#
+Q =
+endif
+export E Q
+
+all: $(theme)
+.PHONY: all
+.DEFAULT: all
+
+$(theme): theme.o $(background_objs) $(progressfg_objs) $(progressbg_objs)
+ $(E) " LINK " $@
+ $(Q) $(COMPILE) -shared -o $@ $^
+
+theme.h: theme.in progress.png themesetup.sh $(backgrounds) $(progressfgs) $(progressbgs)
+ $(E) " THMPARM " $@
+ $(Q) ./themesetup.sh $(sizes) > $@
+
+theme.o: theme.c theme.h
+
+background_%.png: background.svg cmap.gif
+ $(E) " BG " $@
+ $(Q) rsvg-convert -w `echo $* | cut -dx -f1` -h `echo $* | cut -dx -f2` -f png $< > $@
+
+progressfg_%.png: background_%.png progress.png cmap.gif
+ $(E) " PROGFG " $@
+ $(Q) composite -compose dst_over -gravity center $< progress.png $@
+
+progressbg_%.png: background_%.png progress.png cmap.gif
+ $(E) " PROGBG " $@
+ $(Q) composite -gravity center -dissolve 25x100 progress.png $< png:- | \
+ composite -gravity center -compose src_over png:- progress.png $@
+
+%.o: %.c
+ $(E) " CC " $@
+ $(Q) $(COMPILE) -o $@ -c $<
+
+%.c: %.png cmap.gif
+ $(E) " PNGSRC " $@
+ $(Q) convert $< +dither -map cmap.gif gif:- | \
+ convert gif:- $<
+ $(Q) pngtousplash $< > $@
+
+#cmap.gif: background.svg progress.png
+# $(E) " CMAP " $@
+# $(Q) rsvg-convert -w 1024 -h 768 -f png background.svg | \
+# composite -compose src_over -gravity center progress.png png:- +dither cmap.gif
+
+install: $(theme)
+ $(E) " INSTALL " $<
+ $(Q) $(INSTALL_DATA) -D $< $(DESTDIR)/$(theme)
+.PHONY: install
+
+install-strip: $(theme)
+ $(MAKE) INSTALL='$(INSTALL) -s' install
+.PHONY: install-strip
+
+clean:
+ $(E) " CLEAN "
+ $(Q) - find . -type f -name '*.png.c' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.cfont' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.o' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.so' -print0 | xargs -0r rm -f
+# $(Q) - find . -type f -name 'cmap.*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'background_*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'progressfg_*' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name 'progressbg_*' -print0 | xargs -0r rm -f
+ $(Q) - rm -f theme.h
+.PHONY: clean
+
+.PRECIOUS: %.c progressbg_%.png progressfg_%.png background_%.png
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
new file mode 100644
index 000000000..d60e2ed74
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
@@ -0,0 +1,6773 @@
+
+
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
new file mode 100644
index 000000000..ac8c4b80a
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
new file mode 100644
index 000000000..de57c529f
Binary files /dev/null and b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png differ
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
new file mode 100644
index 000000000..59632522e
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
@@ -0,0 +1,178 @@
+/* usplash
+ *
+ * theme.c - theme definition
+ *
+ * Copyright © 2006 David Härdeman
+ * based on example-theme from usplash which is
+ * Copyright © 2006 Dennis Kaarsemaker
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include
+#include
+
+void t_init(struct usplash_theme *theme);
+void t_draw_progressbar(struct usplash_theme *theme, int percentage);
+void t_clear_progressbar(struct usplash_theme *theme);
+void t_clear_text(struct usplash_theme *theme);
+void t_animate_step(struct usplash_theme* theme, int pulsating);
+
+/* Auto-generated theme definitions */
+#include "theme.h"
+
+static struct private_hack *phack = NULL;
+
+void
+t_init(struct usplash_theme *theme)
+{
+ int x, y;
+
+ /* START - HACKS R US */
+ phack = (struct private_hack *)theme->font;
+ theme->font = NULL;
+ /* FINISH - HACKS R US */
+ usplash_getdimensions(&x, &y);
+ theme->progressbar_x = (x - theme->pixmap->width)/2 + theme->progressbar_x;
+ theme->progressbar_y = (y - theme->pixmap->height)/2 + theme->progressbar_y;
+}
+
+void
+t_draw_progressbar(struct usplash_theme *theme, int percentage)
+{
+ int w = (phack->progress_bg->width * percentage / 100);
+ static int last_w = 0;
+
+ if (w != 0 && w == last_w)
+ return;
+
+ /* Check if we're changing mode between startup and shutdown */
+ if (last_w >= 0 && w < 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_fg);
+ last_w = 0;
+ } else if (last_w < 0 && w > 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_bg);
+ last_w = 0;
+ }
+
+ /* Draw only the part which has changed since last time */
+ if (percentage == 0) {
+ usplash_put(theme->progressbar_x,
+ theme->progressbar_y,
+ phack->progress_bg);
+ } else if (percentage < 0) {
+ usplash_put_part(theme->progressbar_x - last_w,
+ theme->progressbar_y,
+ -w + last_w,
+ phack->progress_bg->height,
+ phack->progress_bg,
+ -last_w, 0);
+ } else if (percentage > 0) {
+ usplash_put_part(theme->progressbar_x + last_w,
+ theme->progressbar_y,
+ w - last_w,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ last_w, 0);
+ }
+
+ last_w = w;
+}
+
+void
+t_clear_progressbar(struct usplash_theme *theme)
+{
+ t_draw_progressbar(theme, 0);
+}
+
+void
+t_clear_text(struct usplash_theme *theme)
+{
+ int x, y, x1, y1, x2, y2;
+ usplash_getdimensions(&x, &y);
+
+ /* Draw outer border */
+ x1 = (x - theme->pixmap->width)/2 + theme->text_x - TEXT_EXTRA_PX;
+ y1 = (y - theme->pixmap->height)/2 + theme->text_y - TEXT_EXTRA_PX;
+ x2 = x1 + theme->text_width + 2 * TEXT_EXTRA_PX;
+ y2 = y1 + theme->text_height + 2 * TEXT_EXTRA_PX;
+ usplash_clear(x1, y1, x2, y2, theme->text_foreground);
+
+ /* Draw main text area with TEXT_BORDER_PX pixels padding */
+ x1 += TEXT_BORDER_PX;
+ y1 += TEXT_BORDER_PX;
+ x2 -= TEXT_BORDER_PX;
+ y2 -= TEXT_BORDER_PX;
+ usplash_clear(x1, y1, x2, y2, theme->text_background);
+}
+
+void
+t_animate_step(struct usplash_theme* theme, int pulsating)
+{
+ static int pulsate_step = 0;
+ static int pulse_width = 70;
+ static int step_width = 1;
+ static int prev_step = 0;
+ static int reset = 1;
+ int num_steps = (phack->progress_fg->width - pulse_width)/step_width;
+ int x1;
+
+ if (!pulsating) {
+ reset = 1;
+ return;
+ }
+
+ if (reset) {
+ /* Reset pulse */
+ t_clear_progressbar(theme);
+ reset = 0;
+ pulsate_step = 0;
+ usplash_put_part(theme->progressbar_x,
+ theme->progressbar_y,
+ pulse_width,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ 0, 0);
+ } else {
+ /* Remove from left hand side of pulse */
+ x1 = step_width * prev_step;
+ usplash_put_part(theme->progressbar_x + x1,
+ theme->progressbar_y,
+ step_width,
+ phack->progress_bg->height,
+ phack->progress_bg,
+ x1, 0);
+ }
+
+ /* Add to right hand side of pulse */
+ x1 = step_width * pulsate_step + pulse_width;
+ usplash_put_part(theme->progressbar_x + x1,
+ theme->progressbar_y,
+ step_width,
+ phack->progress_fg->height,
+ phack->progress_fg,
+ x1, 0);
+
+ /* Check for wraparound */
+ prev_step = pulsate_step;
+ pulsate_step++;
+ if (pulsate_step >= num_steps)
+ reset = 1;
+}
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
new file mode 100644
index 000000000..ae8c4dd26
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
@@ -0,0 +1,20 @@
+#define PALETTE_BG 0
+#define PALETTE_PROGRESS_FG 0
+#define PALETTE_PROGRESS_BG 0
+#define PALETTE_TEXT_BG 251
+#define PALETTE_TEXT_FG 0
+#define PALETTE_TEXT_SUCCESS 67
+#define PALETTE_TEXT_FAILURE 134
+
+#define TEXT_BORDER_PX 1
+#define TEXT_PADDING_PX 9
+#define TEXT_EXTRA_PX (TEXT_BORDER_PX + TEXT_PADDING_PX)
+#define TEXT_MARGIN 30
+
+/* Horrible hack */
+struct private_hack {
+ struct usplash_pixmap *pixmap; /* Background image */
+ struct usplash_pixmap *progress_fg; /* Progress bar foreground */
+ struct usplash_pixmap *progress_bg; /* Progress bar background */
+};
+
diff --git a/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
new file mode 100755
index 000000000..81f0bd882
--- /dev/null
+++ b/ubuntu/raring/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+#
+# Sanity checks
+#
+if [ ! -e theme.in ]; then
+ exit 1
+fi
+
+if [ $# -lt 1 ]; then
+ exit 1
+fi
+
+#
+# Helper functions
+#
+struct_name() {
+ name=${1%.*}
+ echo "pixmap_$name"
+}
+
+#
+# Begin processing
+#
+
+echo "/*"
+echo " * Part 1 - Generic header part"
+echo " */"
+cat theme.in
+echo
+
+
+
+echo "/*"
+echo " * Part 2 - Forward theme struct declarations"
+echo " */"
+first=yes
+for size in $@; do
+ if [ $first = "yes" ]; then
+ THEMENAME="usplash_theme"
+ first=no
+ else
+ THEMENAME="usplash_theme_$size"
+ fi
+ echo "struct usplash_theme $THEMENAME;"
+done
+echo
+
+
+
+echo "/*"
+echo " * Step 3 - Actual theme struct defs"
+echo " */"
+first=yes
+while [ 1 ]; do
+ size="$1"
+ if [ -z "$size" ]; then
+ exit 0
+ fi
+
+ if [ $first = "yes" ]; then
+ THEMENAME="usplash_theme"
+ first=no
+ else
+ THEMENAME="usplash_theme_$size"
+ fi
+
+ if [ -z "$2" ]; then
+ THEMENEXT="NULL"
+ else
+ THEMENEXT="&usplash_theme_$2"
+ fi
+ shift
+
+ PGFG_PIX="progressfg_$size.png"
+ PGFG_STRUCT=$(struct_name "$PGFG_PIX")
+ PGBG_PIX="progressbg_$size.png"
+ PGBG_STRUCT=$(struct_name "$PGBG_PIX")
+ BG_PIX="background_$size.png"
+ BG_STRUCT=$(struct_name "$BG_PIX")
+
+ PROGRESS_WIDTH=$( identify "$PGFG_PIX" | cut -d' ' -f3 | cut -dx -f1)
+ PROGRESS_HEIGHT=$( identify "$PGFG_PIX" | cut -d' ' -f3 | cut -dx -f2)
+ WIDTH=${size%x*}
+ HEIGHT=${size#*x}
+
+ if [ $(( $WIDTH / 16 )) -eq $(( $HEIGHT / 9 )) ]; then
+ RATIO="USPLASH_16_9"
+ else
+ RATIO="USPLASH_4_3"
+ fi
+
+ cat <