r40173 - in /desktop/experimental/gdm3/debian: changelog control control.in rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Nov 1 21:34:42 UTC 2013


Author: sjoerd
Date: Fri Nov  1 21:34:42 2013
New Revision: 40173

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40173
Log:
Use logind session tracking on linux

Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    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=40173&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Fri Nov  1 21:34:42 2013
@@ -1,4 +1,4 @@
-gdm3 (3.10.0.1-1) UNRELEASED; urgency=low
+gdm3 (3.10.0.1-1) experimental; urgency=low
 
   [ Michael Biebl ]
   * Drop Depends on policykit-1-gnome, with the gdm-fallback session gone,
@@ -22,8 +22,9 @@
 
   [ Sjoerd Simons ]
   * Add dependency on systemd for systemd-logind
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Oct 2013 12:51:55 +0200
+  * Use logind session tracking on linux
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 01 Nov 2013 22:34:17 +0100
 
 gdm3 (3.8.4-2) unstable; urgency=low
 

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=40173&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Fri Nov  1 21:34:42 2013
@@ -19,7 +19,6 @@
                libpango1.0-dev (>= 1.3.0),
                libcanberra-gtk3-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
-               libupower-glib-dev (>= 0.9.0),
                libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
                gnome-settings-daemon (>= 2.91.2),
@@ -47,8 +46,8 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-login-dev (>= 186),
-               libsystemd-daemon-dev (>= 186)
+               libsystemd-login-dev (>= 186) [linux-any],
+               libsystemd-daemon-dev (>= 186) [linux-any]
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
@@ -66,7 +65,6 @@
          gnome-session-bin (>= 3.6),
          gnome-settings-daemon (>= 3.2),
          gnome-shell (>= 3.6),
-         upower,
          gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
          lsb-base (>= 3.2-14),
          librsvg2-common,
@@ -77,7 +75,7 @@
          dconf-gsettings-backend (>= 0.12.1-2),
          x11-common (>= 1:7.6+11),
          x11-xserver-utils,
-         systemd
+         systemd [linux-any]
 Recommends: zenity,
             xserver-xephyr,
             x11-xkb-utils,

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=40173&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Fri Nov  1 21:34:42 2013
@@ -14,7 +14,6 @@
                libpango1.0-dev (>= 1.3.0),
                libcanberra-gtk3-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
-               libupower-glib-dev (>= 0.9.0),
                libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
                gnome-settings-daemon (>= 2.91.2),
@@ -42,8 +41,8 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-login-dev (>= 186),
-               libsystemd-daemon-dev (>= 186)
+               libsystemd-login-dev (>= 186) [linux-any],
+               libsystemd-daemon-dev (>= 186) [linux-any]
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
@@ -61,7 +60,6 @@
          gnome-session-bin (>= 3.6),
          gnome-settings-daemon (>= 3.2),
          gnome-shell (>= 3.6),
-         upower,
          gnome-session | x-session-manager | x-window-manager | x-terminal-emulator,
          lsb-base (>= 3.2-14),
          librsvg2-common,
@@ -72,7 +70,7 @@
          dconf-gsettings-backend (>= 0.12.1-2),
          x11-common (>= 1:7.6+11),
          x11-xserver-utils,
-         systemd
+         systemd [linux-any]
 Recommends: zenity,
             xserver-xephyr,
             x11-xkb-utils,

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40173&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules	[utf-8] Fri Nov  1 21:34:42 2013
@@ -32,13 +32,17 @@
 		--with-user=Debian-gdm --with-group=Debian-gdm \
 		--with-pam-domain=gdm3 \
 		--with-lang-file=/etc/default/locale \
-		--with-systemd \
-		--without-consolekit \
 		--disable-split-authentication \
 		--with-check-accelerated-directory=/usr/lib/gnome-session/ \
 		--with-ran-once-marker-directory=/var/run/gdm3 \
 		--with-initial-vt=7 \
 		--disable-fallback-greeter
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+		DEB_CONFIGURE_EXTRA_FLAGS += --with-systemd --without-consolekit
+else
+		DEB_CONFIGURE_EXTRA_FLAGS += --without-systemd --with-consolekit
+endif
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 




More information about the pkg-gnome-commits mailing list