r10291 - in /desktop/unstable/sabayon/debian: changelog control.in sabayon.postinst sabayon.postrm

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr 23 11:42:06 2007
New Revision: 10291

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10291
Log:
* Depend on passwd for useradd/userdel and groupadd/groupdel.
* Fix chown usage in postrm.
* Delete the sabayon-admin group on purge too.

Modified:
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/control.in
    desktop/unstable/sabayon/debian/sabayon.postinst
    desktop/unstable/sabayon/debian/sabayon.postrm

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=10291&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Mon Apr 23 11:42:06 2007
@@ -1,5 +1,6 @@
 sabayon (2.18.1-1) unstable; urgency=low
 
+  [ Alan Baghumian ]
   * New upstream release (Closes: #416719).
      - Many installation and build system fixes, including fixes
        for 64-bit platforms
@@ -7,11 +8,11 @@
      - Temporary fix to work on distributions which don't have the
        xdg.DesktopEntry module for Python
      - Be as lenient as we used to be while committing the changes
-       in a profile, instead of aborting immediately 
+       in a profile, instead of aborting immediately
      - API reference: http://sayamindu.randomink.org/sabayon_docs/
      - Scripting Sabayon with Python: http://live.gnome.org/PythonSabayon
   * Updated 01_desktop.patch
-  * Updated debian/control   
+  * Updated debian/control
      - Added myself as co- maintainer
      - Added home page URL
      - Added autotools-dev to build-deps
@@ -25,7 +26,12 @@
   * Updated debian/rules
      - Dropped dh_python call
 
- -- Alan Baghumian <alan at technotux.org>  Mon, 23 Apr 2007 09:53:51 +0330
+  [ Loic Minier ]
+  * Depend on passwd for useradd/userdel and groupadd/groupdel.
+  * Fix chown usage in postrm.
+  * Delete the sabayon-admin group on purge too.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 23 Apr 2007 13:40:36 +0200
 
 sabayon (2.12.4-4) unstable; urgency=low
 

Modified: desktop/unstable/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control.in?rev=10291&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control.in (original)
+++ desktop/unstable/sabayon/debian/control.in Mon Apr 23 11:42:06 2007
@@ -9,7 +9,7 @@
 
 Package: sabayon
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.5.3), python-gnome2 (>= 2.6.0), python-gamin, python-libxml2, xnest, gconf2 (>=  2.10.0-0ubuntu2), python-ldap, gksu, gdm
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2 (>= 2.5.3), python-gnome2 (>= 2.6.0), python-gamin, python-libxml2, xnest, gconf2 (>=  2.10.0-0ubuntu2), python-ldap, gksu, gdm, passwd
 XB-Python-Version: ${python:Versions}
 Description: system administration tool to manage GNOME desktop settings
  Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys:

Modified: desktop/unstable/sabayon/debian/sabayon.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/sabayon.postinst?rev=10291&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/sabayon.postinst (original)
+++ desktop/unstable/sabayon/debian/sabayon.postinst Mon Apr 23 11:42:06 2007
@@ -3,15 +3,15 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-    if ! getent group sabayon-admin >/dev/null; then	
-	groupadd sabayon-admin	
+    if ! getent group sabayon-admin >/dev/null; then
+        groupadd sabayon-admin
     fi
 
-    if ! getent passwd sabayon-admin >/dev/null; then	
+    if ! getent passwd sabayon-admin >/dev/null; then
         useradd --home /var/run/sabayon-admin \
-            -c "Sabayon user" --gid sabayon-admin sabayon-admin >/dev/null
-	# stupid usradd!
-	mkdir -p /var/run/sabayon-admin && chown sabayon-admin.sabayon-admin /var/run/sabayon-admin > /dev/null
+            -c "Sabayon user" --gid sabayon-admin sabayon-admin
+        mkdir -p /var/run/sabayon-admin
+        chown sabayon-admin:sabayon-admin /var/run/sabayon-admin
     fi
 fi
 

Modified: desktop/unstable/sabayon/debian/sabayon.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/sabayon.postrm?rev=10291&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/sabayon.postrm (original)
+++ desktop/unstable/sabayon/debian/sabayon.postrm Mon Apr 23 11:42:06 2007
@@ -4,7 +4,11 @@
 
 if [ "$1" = "purge" ] ; then
     if [ -x /usr/sbin/userdel ] ; then
-    	userdel -r sabayon-admin > /dev/null || true
+        userdel -r sabayon-admin || true
+    fi
+
+    if [ -x /usr/sbin/groupdel ] ; then
+        groupdel sabayon-admin || true
     fi
 fi