r40267 - in /desktop/experimental/gdm3/debian: ./ patches/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Nov 21 07:02:06 UTC 2013 

Author: bigon
Date: Thu Nov 21 07:02:05 2013
New Revision: 40267

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40267
Log:
* Drop debian/patches/10_gdm3_pam.patch and rename all the pam services back
  to their upstream names. Also bump gnome-shell dependency as it uses gdm
  PAM services and the names must be synchronized.
* debian/gdm3.init: Fix inconsistency regarding the usage of PIDFILE
  variable, thanks to Leo Antunes <costela at debian.org> (Closes: #729489)

Added:
    desktop/experimental/gdm3/debian/gdm3.gdm-autologin.pam
      - copied unchanged from r40259, desktop/experimental/gdm3/debian/gdm3-autologin.pam
    desktop/experimental/gdm3/debian/gdm3.gdm-launch-environment.pam
      - copied unchanged from r40260, desktop/experimental/gdm3/debian/gdm-launch-environment.pam
    desktop/experimental/gdm3/debian/gdm3.gdm-password.pam
      - copied unchanged from r40259, desktop/experimental/gdm3/debian/gdm3.pam
Removed:
    desktop/experimental/gdm3/debian/gdm-launch-environment.pam
    desktop/experimental/gdm3/debian/gdm3-autologin.pam
    desktop/experimental/gdm3/debian/gdm3.pam
    desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/gdm3.init
    desktop/experimental/gdm3/debian/gdm3.maintscript
    desktop/experimental/gdm3/debian/patches/series
    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=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Thu Nov 21 07:02:05 2013
@@ -5,8 +5,13 @@
     are that gdm-launch-environment should not transition out of the xdm_t
     SELinux domain and not set a loginuid (as it's daemon's internal and not
     a real user)
-
- -- Laurent Bigonville <bigon at debian.org>  Sat, 09 Nov 2013 14:01:16 +0100
+  * Drop debian/patches/10_gdm3_pam.patch and rename all the pam services back
+    to their upstream names. Also bump gnome-shell dependency as it uses gdm
+    PAM services and the names must be synchronized.
+  * debian/gdm3.init: Fix inconsistency regarding the usage of PIDFILE
+    variable, thanks to Leo Antunes <costela at debian.org> (Closes: #729489)
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 17 Nov 2013 13:39:17 +0100
 
 gdm3 (3.10.0.1-2) experimental; urgency=low
 

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Thu Nov 21 07:02:05 2013
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: gnome-pkg-tools (>= 0.16.3),
                debhelper (>= 8.1.3),
                cdbs (>= 0.4.93~),

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Thu Nov 21 07:02:05 2013
@@ -59,7 +59,7 @@
          libpam-runtime (>= 0.76-13.1),
          gnome-session-bin (>= 3.10),
          gnome-settings-daemon (>= 3.2),
-         gnome-shell (>= 3.10),
+         gnome-shell (>= 3.10.1-2~),
          gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
          lsb-base (>= 3.2-14),
          librsvg2-common,

Modified: desktop/experimental/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.init?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.init	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.init	[utf-8] Thu Nov 21 07:02:05 2013
@@ -16,6 +16,7 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/gdm3
+PIDFILE=/var/run/gdm3.pid
 
 test -x $DAEMON || exit 0
 
@@ -76,7 +77,7 @@
                 log_daemon_msg "Starting GNOME Display Manager" "gdm3"
                 gen_config
                 rm -f /var/lib/gdm/.ICEauthority
-                start-stop-daemon --start --quiet --pidfile /var/run/gdm3.pid \
+                start-stop-daemon --start --quiet --pidfile $PIDFILE \
 			--background --exec $DAEMON || log_end_msg 1
                 log_end_msg 0
         fi
@@ -84,7 +85,7 @@
   stop)
         log_daemon_msg "Stopping GNOME Display Manager" "gdm3"
         set +e
-        start-stop-daemon --stop --quiet --pidfile /var/run/gdm3.pid \
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
                 --name gdm3 --retry 5
         set -e
         log_end_msg $?
@@ -93,8 +94,8 @@
         log_daemon_msg "Scheduling reload of GNOME Display Manager configuration" "gdm3"
         set +e
         gen_config
-        start-stop-daemon --stop --signal HUP --quiet --pidfile \
-                /var/run/gdm3.pid --name gdm3
+        start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
+                --name gdm3
         start-stop-daemon --stop --signal HUP --quiet --name dconf-service \
                 --user Debian-gdm --oknodo
         set -e

Modified: desktop/experimental/gdm3/debian/gdm3.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.maintscript?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.maintscript	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.maintscript	[utf-8] Thu Nov 21 07:02:05 2013
@@ -1 +1,3 @@
 rm_conffile /etc/gdm3/greeter.gconf-defaults 3.4
+mv_conffile /etc/pam.d/gdm3 /etc/pam.d/gdm-password 3.10.0.1-3~
+mv_conffile /etc/pam.d/gdm3-autologin /etc/pam.d/gdm-autologin 3.10.0.1-3~

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series	[utf-8] Thu Nov 21 07:02:05 2013
@@ -3,7 +3,6 @@
 07_libexec-paths.patch
 08_frequent-users_greeter.patch
 09_default_session.patch
-10_gdm3_pam.patch
 10_no_gettext.patch
 #11_xephyr_nested.patch
 16_xserver_path.patch

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40267&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules	[utf-8] Thu Nov 21 07:02:05 2013
@@ -30,7 +30,6 @@
 		--with-screenshot-dir=/var/run/gdm3/greeter \
 		--with-defaults-conf=/usr/share/gdm/defaults.conf \
 		--with-user=Debian-gdm --with-group=Debian-gdm \
-		--with-pam-domain=gdm3 \
 		--with-lang-file=/etc/default/locale \
 		--disable-split-authentication \
 		--with-check-accelerated-directory=/usr/lib/gnome-session/ \
@@ -64,9 +63,9 @@
 binary-install/gdm3::
 	mv debian/gdm3/usr/sbin/gdm debian/gdm3/usr/sbin/gdm3
 	chmod 755 debian/gdm3/etc/gdm3/Xsession
-	rm -f debian/gdm3/etc/pam.d/gdm-*
-	dh_installpam -pgdm3 --name=gdm3-autologin
+	dh_installpam -pgdm3 --name=gdm-autologin
 	dh_installpam -pgdm3 --name=gdm-launch-environment
+	dh_installpam -pgdm3 --name=gdm-password
 	rm -rf debian/gdm3/var/lib/gdm3/.[cgl]*
 	rm -rf debian/gdm3/var/run
 	cd debian/gdm3 && \
@@ -75,8 +74,6 @@
 		rmdir etc/dconf/db etc/dconf/profile etc/dconf
 	rm -rf debian/gdm3/usr/include
 	rm -rf debian/gdm3/usr/lib/pkgconfig
-	rm -f debian/gdm3/etc/pam.d/gdm
-	rm -f debian/gdm3/etc/pam.d/gdm-autologin
 # Not sure why the following files are still shipped (https://bugzilla.gnome.org/show_bug.cgi?id=710847)
 	rm -f debian/gdm3/usr/share/gdm/greeter/applications/gdm-simple-greeter.desktop
 	rm -f debian/gdm3/usr/share/gdm/greeter/applications/polkit-gnome-authentication-agent-1.desktop

More information about the pkg-gnome-commits mailing list