← Back to team overview

xubuntu-dev team mailing list archive

[Branch ~xubuntu-dev/xubuntu-default-settings/trunk] Rev 326: * Fix broken theme in only-ubiquity mode (lp: #840094):

 

------------------------------------------------------------
revno: 326
fixes bug: https://launchpad.net/bugs/840094
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2011-11-19 20:05:13 +0100
message:
  * Fix broken theme in only-ubiquity mode (lp: #840094):
    - debian/control: add a new xubuntu-live-settings binary package.
    - debian/{gconf-defaults,post*,pre*}: renamed to
      debian/xubuntu-default-settings.*.
    - debian/*.install: added, now that we have several binary packages.
    - casper/48xubuntu_maybe_ubiquity: added, stolen from
      mythbuntu-live-autostart.
added:
  casper/
  casper/48xubuntu_maybe_ubiquity
  debian/xubuntu-default-settings.install
  debian/xubuntu-live-settings.install
renamed:
  debian/gconf-defaults => debian/xubuntu-default-settings.gconf-defaults
  debian/postinst => debian/xubuntu-default-settings.postinst
  debian/postrm => debian/xubuntu-default-settings.postrm
  debian/preinst => debian/xubuntu-default-settings.preinst
  debian/prerm => debian/xubuntu-default-settings.prerm*
modified:
  debian/changelog
  debian/control
  debian/xubuntu-default-settings.prerm*


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription
=== added directory 'casper'
=== added file 'casper/48xubuntu_maybe_ubiquity'
--- casper/48xubuntu_maybe_ubiquity	1970-01-01 00:00:00 +0000
+++ casper/48xubuntu_maybe_ubiquity	2011-11-19 19:05:13 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Preparing for maybe-ubiquity mode..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+#should cover both maybe-ubiquity and only-ubiquity and automatic-ubiquity modes
+if grep "ubiquity" /proc/cmdline >/dev/null; then
+    mkdir -p /root/home/$USERNAME/.config
+    cp -R /root/etc/xdg/xdg-xubuntu/xfce4  /root/home/$USERNAME/.config
+    chroot /root chown -R $USERNAME:$USERNAME /home/$USERNAME/.config
+fi
+
+log_end_msg

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-28 19:59:06 +0000
+++ debian/changelog	2011-11-19 19:05:13 +0000
@@ -1,3 +1,15 @@
+xubuntu-default-settings (12.04.0) UNRELEASED; urgency=low
+
+  * Fix broken theme in only-ubiquity mode (lp: #840094):
+    - debian/control: add a new xubuntu-live-settings binary package.
+    - debian/{gconf-defaults,post*,pre*}: renamed to
+      debian/xubuntu-default-settings.*.
+    - debian/*.install: added, now that we have several binary packages.
+    - casper/48xubuntu_maybe_ubiquity: added, stolen from
+      mythbuntu-live-autostart.
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 19 Nov 2011 19:58:43 +0100
+
 xubuntu-default-settings (11.10.6) oneiric; urgency=low
 
   * Finally add the lightdm greeter theme! lp: #861309

=== modified file 'debian/control'
--- debian/control	2011-09-28 19:50:30 +0000
+++ debian/control	2011-11-19 19:05:13 +0000
@@ -17,3 +17,9 @@
 Provides: lightdm-gtk-greeter-config
 Description: default settings for the Xubuntu desktop
  This package contains the default settings used by Xubuntu.
+
+Package: xubuntu-live-settings
+Architecture: all
+Depends: ${misc:Depends}, casper, xubuntu-default-settings
+Description: configuration for the Xubuntu live cd
+ This package contains live cd customzations used by Xubuntu.

=== renamed file 'debian/gconf-defaults' => 'debian/xubuntu-default-settings.gconf-defaults'
=== added file 'debian/xubuntu-default-settings.install'
--- debian/xubuntu-default-settings.install	1970-01-01 00:00:00 +0000
+++ debian/xubuntu-default-settings.install	2011-11-19 19:05:13 +0000
@@ -0,0 +1,2 @@
+debian/tmp/etc
+debian/tmp/usr

=== renamed file 'debian/postinst' => 'debian/xubuntu-default-settings.postinst'
=== renamed file 'debian/postrm' => 'debian/xubuntu-default-settings.postrm'
=== renamed file 'debian/preinst' => 'debian/xubuntu-default-settings.preinst'
=== renamed file 'debian/prerm' => 'debian/xubuntu-default-settings.prerm' (properties changed: -x to +x)
=== added file 'debian/xubuntu-live-settings.install'
--- debian/xubuntu-live-settings.install	1970-01-01 00:00:00 +0000
+++ debian/xubuntu-live-settings.install	2011-11-19 19:05:13 +0000
@@ -0,0 +1,1 @@
+casper/* usr/share/initramfs-tools/scripts/casper-bottom/