r39481 - in /desktop/experimental/gdm3/debian: changelog gdm3.install gdm3.lintian-overrides greeter.gsettings rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Sep  5 10:03:44 2013
New Revision: 39481

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39481
Log:
Explicitly disable gdm-simple-greeter, it has been removed in the archive for quite sometime now and will be gone again in the next major release anyway.


Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/gdm3.install
    desktop/experimental/gdm3/debian/gdm3.lintian-overrides
    desktop/experimental/gdm3/debian/greeter.gsettings
    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=39481&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Thu Sep  5 10:03:44 2013
@@ -2,8 +2,9 @@
 
   [ Laurent Bigonville ]
   * New upstream release
-    - debian/gdm3.install, debian/rules, debian/greeter.gsettings: Re-enable
-      gdm-simple-greeter
+    - debian/rules: Explicitly disable gdm-simple-greeter, it has been removed
+      in the archive for quite sometime now and will be gone again in the next
+      major release anyway.
   * debian/control.in:
     - Bump Standards-Version to 3.9.4 (no further changes)
     - Use canonical URLs for VCS fields
@@ -17,7 +18,6 @@
   * debian/gdm3.manpages, debian/libgdm.manpages: Move gdmflexiserver manpage
     to libgdm package so it follows the executable
   * debian/rules: List non-installed files
-  * debian/gdm3.lintian-overrides: Adjust overrides file
   * debian/gdm-screenshot.1.pod, debian/gdm3.manpages: Add manpage for
     gdm-screenshot executable, thanks to Nathan Handler (Closes: #691295)
 

Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=39481&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install	[utf-8] Thu Sep  5 10:03:44 2013
@@ -1,7 +1,6 @@
 etc/*
 usr/bin/gdm-screenshot
 usr/lib/gdm3/gdm-*
-usr/lib/*/libgdmsimplegreeter.so.*
 # gets renamed to gdm3 in binary-install
 usr/sbin/gdm
 usr/share/pixmaps/

Modified: desktop/experimental/gdm3/debian/gdm3.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.lintian-overrides?rev=39481&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.lintian-overrides	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.lintian-overrides	[utf-8] Thu Sep  5 10:03:44 2013
@@ -1,5 +1,2 @@
 # internal use only
 gdm3: unused-debconf-template gdm3/daemon_name
-# libgdmsimplegreeter1 is only used by gdm-simple-greeter inside the same package
-gdm3: package-name-doesnt-match-sonames libgdmsimplegreeter1
-gdm3: no-symbols-control-file usr/lib/x86_64-linux-gnu/libgdmsimplegreeter.so.1.0.0

Modified: desktop/experimental/gdm3/debian/greeter.gsettings
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/greeter.gsettings?rev=39481&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/greeter.gsettings	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/greeter.gsettings	[utf-8] Thu Sep  5 10:03:44 2013
@@ -19,10 +19,10 @@
 
 # Greeter session choice
 # ======================
-# Use 'gdm-fallback' for the fallback (simple) version.
+# Use 'gdm-shell' for the GNOME Shell version.
 # Never use anything not starting with 'gdm-'.
 #[org.gnome.desktop.session]
-#session-name='gdm-fallback'
+#session-name='gdm-shell'
 
 # Login manager options
 # =====================
@@ -37,8 +37,3 @@
 # - Show a login welcome message
 # banner-message-enable=true
 # banner-message-text='Welcome'
-
-# The metacity compositor doesn’t go well with the greeter
-# so just to be sure
-[org.gnome.metacity]
-compositing-manager=false

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=39481&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules	[utf-8] Thu Sep  5 10:03:44 2013
@@ -39,7 +39,7 @@
 		--with-check-accelerated-directory=/usr/lib/gnome-session/ \
 		--with-ran-once-marker-directory=/var/run/gdm3 \
 		--with-initial-vt=7 \
-                --enable-fallback-greeter
+                --disable-fallback-greeter
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
@@ -76,6 +76,11 @@
 	rm -f debian/gdm3/etc/pam.d/gdm
 	rm -f debian/gdm3/etc/pam.d/gdm-autologin
 	rm -f debian/gdm3/usr/share/gdm/autostart/LoginWindow/gnome-session-check-accelerated.desktop
+# gdm-simple-greeter is built even if the --disable-fallback-greeter flag is passed to the configure
+	rm -f debian/gdm3/usr/lib/gdm3/gdm-simple-greeter
+	rm -f debian/gdm3/usr/share/gdm/gdm-greeter-login-window.ui
+	rm -f debian/gdm3/usr/share/gnome-session/sessions/gdm-fallback.session
+	rm -f debian/gdm3/usr/share/gdm/simple-greeter/extensions/unified/page.ui
 
 INFILES := $(wildcard debian/*.desktop.in)
 OUTFILES := $(INFILES:.desktop.in=.desktop)