r23391 - in /desktop/experimental/gdm3/debian: changelog gdm3.init gdm3.postinst gdm3.postrm rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Mar 25 18:11:27 UTC 2010


Author: joss
Date: Thu Mar 25 18:11:24 2010
New Revision: 23391

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23391
Log:
* Pass --with-screenshot-dir, newly introduced.
* Name the user Debian-gdm instead of gdm3, it’s better for the long 
  term.

Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/gdm3.init
    desktop/experimental/gdm3/debian/gdm3.postinst
    desktop/experimental/gdm3/debian/gdm3.postrm
    desktop/experimental/gdm3/debian/rules

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=23391&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Thu Mar 25 18:11:24 2010
@@ -1,5 +1,6 @@
 gdm3 (2.29.92-1) UNRELEASED; urgency=low
 
+  [ Luca Bruno ]
   * New upstream release.
   * debian/control.in:
     - Bump libglib2.0-dev build-depend to 2.22.0 and
@@ -14,6 +15,11 @@
     - Added, workaround until libxklavier bug gets fixed.
   * debian/patches/05_stop_welcome_session.patch:
     - Added, really stop the welcome session.
+
+  [ Josselin Mouette ]
+  * Pass --with-screenshot-dir, newly introduced.
+  * Name the user Debian-gdm instead of gdm3, it’s better for the long 
+    term.
 
  -- Luca Bruno <lethalman88 at gmail.com>  Wed, 24 Mar 2010 12:11:35 +0100
 

Modified: desktop/experimental/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.init?rev=23391&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.init [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.init [utf-8] Thu Mar 25 18:11:24 2010
@@ -73,7 +73,7 @@
         start-stop-daemon --stop --signal USR1 --quiet --pidfile \
                 /var/run/gdm3.pid --name gdm3
         start-stop-daemon --stop --signal HUP --quiet --name gconfd-2 \
-                --user gdm3 --oknodo
+                --user Debian-gdm --oknodo
         set -e
         log_end_msg $?
   ;;

Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=23391&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] Thu Mar 25 18:11:24 2010
@@ -7,18 +7,19 @@
 THIS_PACKAGE=gdm3
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
-# creating gdm3 group if it isn't already there
-if ! getent group gdm3 >/dev/null; then
-        addgroup --system gdm3
+# creating Debian-gdm group if it isn't already there
+if ! getent group Debian-gdm >/dev/null; then
+        addgroup --system Debian-gdm
 fi
 
-# creating gdm3 user if it isn't already there
-if ! getent passwd gdm3 >/dev/null; then
-        adduser --system --ingroup gdm3 --home /var/lib/gdm3 gdm3
-        usermod -c "Gnome Display Manager" gdm3
-        usermod -d "/var/lib/gdm3"         gdm3
-        usermod -g "gdm3"                  gdm3
-        usermod -s "/bin/false"            gdm3
+# creating Debian-gdm user if it isn't already there
+if ! getent passwd Debian-gdm >/dev/null; then
+        adduser --system \
+            --ingroup Debian-gdm \
+            --home /var/lib/gdm3 \
+            --shell /bin/false \
+            Debian-gdm
+        usermod -c "Gnome Display Manager" Debian-gdm
 fi
 
 # debconf is not a registry, so we only fiddle with the default file if it
@@ -50,7 +51,7 @@
 	--source=/usr/share/gdm/greeter-config \
 	--destination=/var/lib/gdm3/.gconf.mandatory \
 	--no-signal
-chown -R gdm3:gdm3 /var/lib/gdm3
+chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
 
 #DEBHELPER#
 

Modified: desktop/experimental/gdm3/debian/gdm3.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postrm?rev=23391&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postrm [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postrm [utf-8] Thu Mar 25 18:11:24 2010
@@ -15,14 +15,14 @@
 	rm -rf /var/run/gdm3
 	rm -rf /var/log/gdm3
 	rm -rf /var/cache/gdm
-        if getent passwd gdm3 >/dev/null; then
+        if getent passwd Debian-gdm >/dev/null; then
                 if [ -x /usr/sbin/deluser ]; then
-                        deluser --system gdm3
+                        deluser --system Debian-gdm
                 fi
         fi
-        if getent group gdm3 >/dev/null; then
+        if getent group Debian-gdm >/dev/null; then
                 if [ -x /usr/sbin/delgroup ]; then
-                        delgroup --system gdm3
+                        delgroup --system Debian-gdm
                 fi
         fi
 fi

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=23391&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Thu Mar 25 18:11:24 2010
@@ -19,8 +19,9 @@
 		--with-xauth-dir=/var/run/gdm3 \
 		--with-pid-file=/var/run/gdm3.pid \
 		--with-log-dir=/var/log/gdm3 \
+		--with-screenshot-dir=/var/run/gdm3/greeter \
 		--with-defaults-conf=/usr/share/gdm/defaults.conf \
-		--with-user=gdm3 --with-group=gdm3 \
+		--with-user=Debian-gdm --with-group=Debian-gdm \
 		--with-pam-domain=gdm3
 
 DEB_MAKE_EXTRA_ARGS += authdir=/var/lib/gdm3




More information about the pkg-gnome-commits mailing list