diff -u sabayon-2.27.91/debian/sabayon.postrm sabayon-2.27.91/debian/sabayon.postrm --- sabayon-2.27.91/debian/sabayon.postrm +++ sabayon-2.27.91/debian/sabayon.postrm @@ -6,6 +6,9 @@ if [ -x /usr/sbin/userdel ] ; then userdel -r sabayon-admin || true fi + if [ -x /usr/sbin/groupdel ] ; then + groupdel sabayon-admin || true + fi fi #DEBHELPER# diff -u sabayon-2.27.91/debian/sabayon.postinst sabayon-2.27.91/debian/sabayon.postinst --- sabayon-2.27.91/debian/sabayon.postinst +++ sabayon-2.27.91/debian/sabayon.postinst @@ -4,11 +4,11 @@ if [ "$1" = "configure" ] ; then if ! getent group sabayon-admin >/dev/null; then - groupadd sabayon-admin + groupadd --system sabayon-admin fi if ! getent passwd sabayon-admin >/dev/null; then - useradd --home /var/run/sabayon-admin \ + useradd --system --home /var/run/sabayon-admin \ -c "Sabayon user" --gid sabayon-admin sabayon-admin mkdir -p /var/run/sabayon-admin chown sabayon-admin:sabayon-admin /var/run/sabayon-admin diff -u sabayon-2.27.91/debian/changelog sabayon-2.27.91/debian/changelog --- sabayon-2.27.91/debian/changelog +++ sabayon-2.27.91/debian/changelog @@ -1,3 +1,10 @@ +sabayon (2.27.91-0ubuntu5~ppa5) jaunty; urgency=low + + * sabayon-admin user now a system user (LP: #416998) + * Fixed up a few more dprint()'s in mozillasource per Federico + + -- Scott Balneaves Sun, 23 Aug 2009 22:58:23 -0500 + sabayon (2.27.91-0ubuntu4) jaunty; urgency=low * Fix paneldelegate.py crashers diff -u sabayon-2.27.91/debian/patches/04_mozillasource-dprint.patch sabayon-2.27.91/debian/patches/04_mozillasource-dprint.patch --- sabayon-2.27.91/debian/patches/04_mozillasource-dprint.patch +++ sabayon-2.27.91/debian/patches/04_mozillasource-dprint.patch @@ -3,10 +3,100 @@ -+++ sabayon-2.27.91.new/lib/sources/mozillasource.py 2009-08-19 13:53:15.000000000 -0500 -@@ -714,7 +714,7 @@ ++++ sabayon-2.27.91.new/lib/sources/mozillasource.py 2009-08-23 22:49:02.000000000 -0500 +@@ -212,8 +212,7 @@ + # INI File + # + if self.is_ini_file(rel_path): +- dprint(LOG_CHANGE, "%s ini file: %s", +- dirmonitor.event_to_string(change.event), rel_path) ++ dprint(LOG_CHANGE, "%s ini file: %s", dirmonitor.event_to_string(change.event), rel_path) + self.load_profiles_ini() + + # +@@ -221,8 +220,7 @@ + # + profile = self.is_profile_file(rel_path) + if profile: +- dprint(LOG_CHANGE, "%s profile file: %s", +- dirmonitor.event_to_string(change.event), rel_path) ++ dprint(LOG_CHANGE, "%s profile file: %s", dirmonitor.event_to_string(change.event), rel_path) + + profile_file = profile.add_file(rel_path) + profile_file_type = profile_file.get_type() +@@ -406,7 +404,7 @@ + + # -------------------- + if sabayon_pref_rel_path in pref_files: +- dprint(LOG_APPLY, "extracting %s" % sabayon_pref_rel_path) ++ dprint(LOG_APPLY, "extracting %s", sabayon_pref_rel_path) + self.source.storage.extract(sabayon_pref_rel_path, self.home_dir, True) + apply_pref = JavascriptPrefsFile(self.home_dir, sabayon_pref_rel_path) + apply_pref.read() +@@ -414,7 +412,7 @@ + apply_pref = None + + if sabayon_mandatory_pref_rel_path in pref_files: +- dprint(LOG_APPLY, "extracting %s" % sabayon_mandatory_pref_rel_path) ++ dprint(LOG_APPLY, "extracting %s", sabayon_mandatory_pref_rel_path) + self.source.storage.extract(sabayon_mandatory_pref_rel_path, self.home_dir, True) + mandatory_apply_pref = JavascriptPrefsFile(self.home_dir, sabayon_mandatory_pref_rel_path) + mandatory_apply_pref.read() +@@ -424,7 +422,7 @@ + # -------------------- + + if sabayon_bookmark_rel_path in bookmark_files: +- dprint(LOG_APPLY, "extracting %s" % sabayon_bookmark_rel_path) ++ dprint(LOG_APPLY, "extracting %s", sabayon_bookmark_rel_path) + self.source.storage.extract(sabayon_bookmark_rel_path, self.home_dir, True) + apply_bookmark = BookmarksFile(self.home_dir, sabayon_bookmark_rel_path) + apply_bookmark.read() +@@ -432,7 +430,7 @@ + apply_bookmark = None + + if sabayon_mandatory_bookmark_rel_path in bookmark_files: +- dprint(LOG_APPLY, "extracting %s" % sabayon_mandatory_bookmark_rel_path) ++ dprint(LOG_APPLY, "extracting %s", sabayon_mandatory_bookmark_rel_path) + self.source.storage.extract(sabayon_mandatory_bookmark_rel_path, self.home_dir, True) + mandatory_apply_bookmark = BookmarksFile(self.home_dir, sabayon_mandatory_bookmark_rel_path) + mandatory_apply_bookmark.read() +@@ -714,8 +712,7 @@ type = match.group(1) key = match.group(2) value = match.group(3) - dprint(LOG_PARSE, "(%d:%d) key='%s' value='%s'" % -+ dprint(LOG_PARSE, "(%d:%d) key='%s' value='%s'", - (match.start(), match.end(), key, value)) +- (match.start(), match.end(), key, value)) ++ dprint(LOG_PARSE, "(%d:%d) key='%s' value='%s'", (match.start(), match.end(), key, value)) self.prefs[key] = JavascriptPreference(type, key, value) start = match.end() + else: +@@ -731,7 +728,7 @@ + keys = self.prefs.keys() + keys.sort() + for key in keys: +- dprint(LOG_, "%s=%s" % (key, self.prefs[key])) ++ dprint(LOG_, "%s=%s", (key, self.prefs[key])) + + + # ------ Class FirefoxProfile ------ +@@ -833,8 +830,7 @@ + + + def read(self): +- dprint(LOG_OPERATION, "FirefoxProfilesIni.read() path = %s", +- self.get_full_path(self.rel_path)) ++ dprint(LOG_OPERATION, "FirefoxProfilesIni.read() path = %s", self.get_full_path(self.rel_path)) + self.profiles = {} + + try: +@@ -1121,11 +1117,11 @@ + + def cat_file(path): + if os.path.isfile(path): +- dprint(LOG_FILE_CONTENTS, "==== %s ====" % path) ++ dprint(LOG_FILE_CONTENTS, "==== %s ====", path) + for line in open(path): + dprint(LOG_FILE_CONTENTS, line.rstrip()) + else: +- dprint(LOG_FILE_CONTENTS, "WARNING, does not exist ==== %s ====" % path) ++ dprint(LOG_FILE_CONTENTS, "WARNING, does not exist ==== %s ====", path) + + + diff -u sabayon-2.27.91/debian/patches/02_gdk_display.patch sabayon-2.27.91/debian/patches/02_gdk_display.patch --- sabayon-2.27.91/debian/patches/02_gdk_display.patch +++ sabayon-2.27.91/debian/patches/02_gdk_display.patch @@ -1,7 +1,7 @@ -diff -Nur -x '*.orig' -x '*~' sabayon-2.27.1/lib/protosession.py sabayon-2.27.1.new/lib/protosession.py ---- sabayon-2.27.1/lib/protosession.py 2009-08-18 13:53:18.000000000 -0500 -+++ sabayon-2.27.1.new/lib/protosession.py 2009-08-18 15:12:36.000000000 -0500 -@@ -96,46 +96,12 @@ +diff -Nur -x '*.orig' -x '*~' sabayon-2.27.91/lib/protosession.py sabayon-2.27.91.new/lib/protosession.py +--- sabayon-2.27.91/lib/protosession.py 2009-08-18 13:36:35.000000000 -0500 ++++ sabayon-2.27.91.new/lib/protosession.py 2009-08-23 22:54:43.000000000 -0500 +@@ -96,57 +96,20 @@ def find_free_display (): def is_display_free (display_number): @@ -17,7 +17,7 @@ - - sock.close () - if not refused: -+ d = gtk.gdk.Display(":%d.0" % display_number) ++ d = gtk.gdk.Display (":%d.0" % display_number) + d.close () return False - @@ -54,0 +55,13 @@ + if is_display_free (display_number): +- break ++ return display_number + display_number += 1 + +- if display_number == 100: +- raise ProtoSessionError, _("Unable to find a free X display") +- +- return display_number ++ raise ProtoSessionError, _("Unable to find a free X display") + + # + # Everything beyond here gets run from sabayon-session