r35382 - in /desktop/unstable/gdm3/debian: changelog control control.in gdm3.dirs gdm3.postinst gdm3.postrm greeter.gsettings patches/07_libexec-paths.patch patches/91_shell_version_control.patch patches/93_private_lib.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Jun 20 20:10:00 UTC 2012 

Author: joss
Date: Wed Jun 20 20:09:59 2012
New Revision: 35382

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35382
Log:
  + Now we use full path for the icon.
* 07_libexec-paths.patch:
  + Use the binary path as provided by g-s-d.pc.
  + Add a check for gnome-session, which is also used.
* gdm3.post{inst,rm}: add a gdm-welcome PAM service, which is now 
  needed for the login session. It's just a symlink.
* 91_shell_version_control.patch: new patch, Debian-specific. Add 
  strict version checking for gnome-shell in order to go to the fall 
  back session in case of potential incompatibility.
* 93_private_lib.patch: also install the typelib file in the private 
  directory, and drop the gir file.
* gdm3.dirs: /usr/lib/gnome-shell
* rules:
  + Remove pre-built gdm.schemas which includes incorrect settings.
  + Enable introspection.
  + Instruct dh_girepository to look at the typelib file in the right 
    place.
  + Add symbolic links for the library and typelib in the gnome-shell 
    directory so that it can use them.
* Add gir (build-)dependencies.

Added:
    desktop/unstable/gdm3/debian/patches/91_shell_version_control.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/control
    desktop/unstable/gdm3/debian/control.in
    desktop/unstable/gdm3/debian/gdm3.dirs
    desktop/unstable/gdm3/debian/gdm3.postinst
    desktop/unstable/gdm3/debian/gdm3.postrm
    desktop/unstable/gdm3/debian/greeter.gsettings
    desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch
    desktop/unstable/gdm3/debian/patches/93_private_lib.patch
    desktop/unstable/gdm3/debian/patches/series
    desktop/unstable/gdm3/debian/rules

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Wed Jun 20 20:09:59 2012
@@ -76,13 +76,16 @@
   [ Josselin Mouette ]
   * New upstream release.
   * Move login manager defaults from gconf to gsettings.
+    + Now we use full path for the icon.
   * Add the metacity default to gsettings too.
   * Require a metacity version which supports gsettings.
   * Get rid of anything related to GConf.
   * Use dh maintscript support to remove the old GConf config file.
   * Force disable systemd support.
   * 06_first_vt.patch, 17_switch_on_finish.patch: refreshed.
-  * 07_libexec-paths.patch: use the binary path as provided by g-s-d.pc.
+  * 07_libexec-paths.patch:
+    + Use the binary path as provided by g-s-d.pc.
+    + Add a check for gnome-session, which is also used.
   * 10_gdm3_pam.patch: handle the bucket of FAIL that is hardcoding the 
     service name in various places since split authentication was 
     introduced.
@@ -90,6 +93,22 @@
     19_static_transient_display.patch, 20_switch_kill_greeter.patch,
     21_static_display_purge.patch: adapt to systemd/multiseat changes.
   * Require dconf 0.12.1-2.
+  * gdm3.post{inst,rm}: add a gdm-welcome PAM service, which is now 
+    needed for the login session. It's just a symlink.
+  * 91_shell_version_control.patch: new patch, Debian-specific. Add 
+    strict version checking for gnome-shell in order to go to the fall 
+    back session in case of potential incompatibility.
+  * 93_private_lib.patch: also install the typelib file in the private 
+    directory, and drop the gir file.
+  * gdm3.dirs: /usr/lib/gnome-shell
+  * rules:
+    + Remove pre-built gdm.schemas which includes incorrect settings.
+    + Enable introspection.
+    + Instruct dh_girepository to look at the typelib file in the right 
+      place.
+    + Add symbolic links for the library and typelib in the gnome-shell 
+      directory so that it can use them.
+  * Add gir (build-)dependencies.
 
  -- Laurent Bigonville <bigon at debian.org>  Fri, 23 Mar 2012 11:36:02 +0100
 

Modified: desktop/unstable/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control [utf-8] Wed Jun 20 20:09:59 2012
@@ -33,6 +33,8 @@
                libxt-dev,
                libxext-dev,
                check (>= 0.9.4),
+               libgirepository1.0-dev (>= 0.9.12),
+               gobject-introspection (>= 0.10.7-1~),
                libpam0g-dev,
                libxdmcp-dev,
                libwrap0-dev,
@@ -54,6 +56,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gir:Depends},
          adduser,
          libpam-modules (>= 0.72-1),
          libpam-runtime (>= 0.76-13.1),

Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Wed Jun 20 20:09:59 2012
@@ -28,6 +28,8 @@
                libxt-dev,
                libxext-dev,
                check (>= 0.9.4),
+               libgirepository1.0-dev (>= 0.9.12),
+               gobject-introspection (>= 0.10.7-1~),
                libpam0g-dev,
                libxdmcp-dev,
                libwrap0-dev,
@@ -49,6 +51,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gir:Depends},
          adduser,
          libpam-modules (>= 0.72-1),
          libpam-runtime (>= 0.76-13.1),

Modified: desktop/unstable/gdm3/debian/gdm3.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.dirs?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.dirs [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.dirs [utf-8] Wed Jun 20 20:09:59 2012
@@ -2,6 +2,7 @@
 etc/gdm3/Init
 etc/gdm3/PreSession
 etc/gdm3/PostSession
+usr/lib/gnome-shell
 usr/share/gdm/BuiltInSessions
 usr/share/gdm/greeter-settings
 var/lib/gdm3

Modified: desktop/unstable/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.postinst?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.postinst [utf-8] Wed Jun 20 20:09:59 2012
@@ -61,6 +61,10 @@
 
 chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
 
+if [ ! -f /etc/pam.d/gdm-welcome ]; then
+    ln -s gdm3-autologin /etc/pam.d/gdm-welcome
+fi
+
 #DEBHELPER#
 
 if [ -f /var/run/gdm.pid ]; then

Modified: desktop/unstable/gdm3/debian/gdm3.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.postrm?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.postrm [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.postrm [utf-8] Wed Jun 20 20:09:59 2012
@@ -15,6 +15,7 @@
 	rm -rf /var/run/gdm3
 	rm -rf /var/log/gdm3
 	rm -rf /var/cache/gdm
+	rm -f /etc/pam.d/gdm-welcome
         if getent passwd Debian-gdm >/dev/null; then
                 if [ -x /usr/sbin/deluser ]; then
                         deluser --system Debian-gdm || echo "Could not remove Debian-gdm user."

Modified: desktop/unstable/gdm3/debian/greeter.gsettings
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/greeter.gsettings?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] (original)
+++ desktop/unstable/gdm3/debian/greeter.gsettings [utf-8] Wed Jun 20 20:09:59 2012
@@ -28,8 +28,8 @@
 # Login manager options
 # =====================
 [org.gnome.login-screen]
-logo=debian-swirl
-fallback-logo=debian-swirl
+logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png'
+fallback-logo='/usr/share/icons/gnome/48x48/places/debian-swirl.png'
 
 # - Disable user list
 # disable-user-list=true

Modified: desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch [utf-8] Wed Jun 20 20:09:59 2012
@@ -2,8 +2,8 @@
 
 Index: gdm-3.4.1/daemon/gdm-server.c
 ===================================================================
---- gdm-3.4.1.orig/daemon/gdm-server.c	2012-06-09 15:53:17.011212473 +0200
-+++ gdm-3.4.1/daemon/gdm-server.c	2012-06-09 15:54:36.031598779 +0200
+--- gdm-3.4.1.orig/daemon/gdm-server.c	2012-06-20 20:53:20.643879549 +0200
++++ gdm-3.4.1/daemon/gdm-server.c	2012-06-20 20:53:20.679879718 +0200
 @@ -142,7 +142,7 @@ _gdm_server_query_ck_for_display_device
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -15,8 +15,8 @@
          g_debug ("GdmServer: Running helper %s", command);
 Index: gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c
 ===================================================================
---- gdm-3.4.1.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-04 20:44:17.000000000 +0200
-+++ gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c	2012-06-09 16:06:24.735063457 +0200
+--- gdm-3.4.1.orig/gui/simple-chooser/gdm-chooser-session.c	2012-06-20 20:53:13.515844704 +0200
++++ gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c	2012-06-20 20:53:20.679879718 +0200
 @@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession
          ret = FALSE;
  
@@ -28,8 +28,8 @@
                  g_error_free (error);
 Index: gdm-3.4.1/configure.ac
 ===================================================================
---- gdm-3.4.1.orig/configure.ac	2012-06-09 15:52:59.475126744 +0200
-+++ gdm-3.4.1/configure.ac	2012-06-09 16:44:13.078152829 +0200
+--- gdm-3.4.1.orig/configure.ac	2012-06-20 20:53:20.611879386 +0200
++++ gdm-3.4.1/configure.ac	2012-06-20 20:53:20.679879718 +0200
 @@ -67,6 +67,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
  FONTCONFIG_REQUIRED_VERSION=2.5.0
  UPOWER_REQUIRED_VERSION=0.9.0
@@ -38,7 +38,7 @@
  NSS_REQUIRED_VERSION=3.11.1
  
  EXTRA_COMPILE_WARNINGS(yes)
-@@ -187,6 +188,31 @@ LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GOb
+@@ -187,6 +188,34 @@ LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GOb
  AC_SUBST(LIBGDMGREETER_GIR_INCLUDES)
  
  dnl ---------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 +GSD_BINARY=`pkg-config --variable=binary gnome-settings-daemon`
 +AC_SUBST(GSD_BINARY)
 +
-+dnl This should be done with pkg-config, but ConsoleKit doesn’t
++dnl This should be done with pkg-config, but ConsoleKit doesn't
 +dnl ship .pc files
 +dnl Because of that we only handle the case where libexecdir is the same
 +dnl (e.g. Red Hat), and the case where libexecdir = pkglibdir (e.g. Debian)
@@ -60,11 +60,14 @@
 +if test x`basename "$libexecdir"` = "xlibexec"; then
 +        AC_MSG_RESULT($libexecdir)
 +        CK_LIBEXECDIR="$libexecdir"
++        SESSION_LIBEXECDIR="$libexecdir"
 +else
 +        AC_MSG_RESULT("$libdir/Consolekit")
 +        CK_LIBEXECDIR="$libdir/ConsoleKit"
++        SESSION_LIBEXECDIR="$libdir/gnome-session"
 +fi
 +AC_SUBST(CK_LIBEXECDIR)
++AC_SUBST(SESSION_LIBEXECDIR)
 +
 +dnl ---------------------------------------------------------------------------
  dnl - Configuration file stuff
@@ -72,8 +75,8 @@
  
 Index: gdm-3.4.1/daemon/Makefile.am
 ===================================================================
---- gdm-3.4.1.orig/daemon/Makefile.am	2012-04-14 20:52:00.000000000 +0200
-+++ gdm-3.4.1/daemon/Makefile.am	2012-06-09 16:43:11.457851581 +0200
+--- gdm-3.4.1.orig/daemon/Makefile.am	2012-06-20 20:53:13.515844704 +0200
++++ gdm-3.4.1/daemon/Makefile.am	2012-06-20 20:53:20.679879718 +0200
 @@ -12,6 +12,7 @@ AM_CPPFLAGS = \
  	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
  	-DLIBDIR=\"$(libdir)\"				\
@@ -84,8 +87,8 @@
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 Index: gdm-3.4.1/gui/simple-chooser/Makefile.am
 ===================================================================
---- gdm-3.4.1.orig/gui/simple-chooser/Makefile.am	2011-09-04 20:44:17.000000000 +0200
-+++ gdm-3.4.1/gui/simple-chooser/Makefile.am	2012-06-09 16:17:50.334415186 +0200
+--- gdm-3.4.1.orig/gui/simple-chooser/Makefile.am	2012-06-20 20:53:13.515844704 +0200
++++ gdm-3.4.1/gui/simple-chooser/Makefile.am	2012-06-20 20:53:20.679879718 +0200
 @@ -12,6 +12,7 @@ AM_CPPFLAGS = \
  	-DSBINDIR=\""$(sbindir)"\"		 	\
  	-DPIXMAPDIR=\""$(pixmapdir)"\"		 	\
@@ -94,3 +97,27 @@
  	$(GTK_CFLAGS)					\
  	$(XLIB_CFLAGS)					\
  	$(XDMCP_CFLAGS)					\
+Index: gdm-3.4.1/data/Makefile.am
+===================================================================
+--- gdm-3.4.1.orig/data/Makefile.am	2012-06-20 20:53:13.515844704 +0200
++++ gdm-3.4.1/data/Makefile.am	2012-06-20 20:53:20.679879718 +0200
+@@ -79,7 +79,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in
+ 		<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
+ 
+ gdm-shell.session: $(srcdir)/gdm-shell.session.in
+-	sed	-e 's,[@]libexecdir[@],$(libexecdir),g' \
++	sed	-e 's,[@]SESSION_LIBEXECDIR[@],$(SESSION_LIBEXECDIR),g' \
+ 		< $(srcdir)/gdm-shell.session.in > gdm-shell.session
+ 
+ localealiasdir = $(datadir)/gdm
+Index: gdm-3.4.1/data/gdm-shell.session.in
+===================================================================
+--- gdm-3.4.1.orig/data/gdm-shell.session.in	2012-06-20 20:53:11.635835509 +0200
++++ gdm-3.4.1/data/gdm-shell.session.in	2012-06-20 20:53:44.015993807 +0200
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @SESSION_LIBEXECDIR@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback

Added: desktop/unstable/gdm3/debian/patches/91_shell_version_control.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/91_shell_version_control.patch?rev=35382&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/91_shell_version_control.patch (added)
+++ desktop/unstable/gdm3/debian/patches/91_shell_version_control.patch [utf-8] Wed Jun 20 20:09:59 2012
@@ -1,0 +1,36 @@
+Index: gdm-3.4.1/configure.ac
+===================================================================
+--- gdm-3.4.1.orig/configure.ac	2012-06-20 21:36:05.936420624 +0200
++++ gdm-3.4.1/configure.ac	2012-06-20 21:36:06.004420954 +0200
+@@ -37,6 +37,8 @@ AC_SUBST(LT_AGE)
+ AC_HEADER_STDC
+ 
+ AC_SUBST(VERSION)
++MAJOR_VERSION=`echo $VERSION | cut -d. -f -2`
++AC_SUBST(MAJOR_VERSION)
+ 
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+Index: gdm-3.4.1/data/Makefile.am
+===================================================================
+--- gdm-3.4.1.orig/data/Makefile.am	2012-06-20 21:36:05.800419964 +0200
++++ gdm-3.4.1/data/Makefile.am	2012-06-20 21:36:06.008420978 +0200
+@@ -80,6 +80,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in
+ 
+ gdm-shell.session: $(srcdir)/gdm-shell.session.in
+ 	sed	-e 's,[@]SESSION_LIBEXECDIR[@],$(SESSION_LIBEXECDIR),g' \
++		-e 's,[@]MAJOR_VERSION[@],$(MAJOR_VERSION),g' \
+ 		< $(srcdir)/gdm-shell.session.in > gdm-shell.session
+ 
+ localealiasdir = $(datadir)/gdm
+Index: gdm-3.4.1/data/gdm-shell.session.in
+===================================================================
+--- gdm-3.4.1.orig/data/gdm-shell.session.in	2012-06-20 21:36:05.800419964 +0200
++++ gdm-3.4.1/data/gdm-shell.session.in	2012-06-20 21:53:17.285462627 +0200
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @SESSION_LIBEXECDIR@/gnome-session-check-accelerated'
++IsRunnableHelper=bash -c 'gnome-shell --version | cut -d\  -f 3 | cut -d. -f -2 | xargs test @MAJOR_VERSION@ = && @SESSION_LIBEXECDIR@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback

Modified: desktop/unstable/gdm3/debian/patches/93_private_lib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/93_private_lib.patch?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/93_private_lib.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/93_private_lib.patch [utf-8] Wed Jun 20 20:09:59 2012
@@ -1,7 +1,7 @@
-Index: gdm-3.2.1.1/gui/libgdmgreeter/Makefile.am
+Index: gdm-3.4.1/gui/libgdmgreeter/Makefile.am
 ===================================================================
---- gdm-3.2.1.1.orig/gui/libgdmgreeter/Makefile.am	2011-12-19 02:12:33.299676088 +0100
-+++ gdm-3.2.1.1/gui/libgdmgreeter/Makefile.am	2011-12-19 02:12:36.363691068 +0100
+--- gdm-3.4.1.orig/gui/libgdmgreeter/Makefile.am	2012-06-20 20:51:40.555390238 +0200
++++ gdm-3.4.1/gui/libgdmgreeter/Makefile.am	2012-06-20 21:31:01.862934073 +0200
 @@ -11,7 +11,7 @@ AM_CPPFLAGS = \
          -DDATADIR=\""$(datadir)"\"                                            \
          $(END_OF_LIST)
@@ -11,10 +11,22 @@
          libgdmgreeter.la                                                      \
          $(END_OF_LIST)
  
-Index: gdm-3.2.1.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
+@@ -46,9 +46,9 @@ dist_pkgconfig_DATA = gdmgreeter.pc
+ -include $(INTROSPECTION_MAKEFILE)
+ 
+ if HAVE_INTROSPECTION
+-girdir = $(datadir)/gir-1.0
++girdir = $(pkglibdir)
+ gir_DATA = GdmGreeter-1.0.gir
+-typelibsdir = $(libdir)/girepository-1.0
++typelibsdir = $(pkglibdir)
+ typelibs_DATA = $(gir_DATA:.gir=.typelib)
+ INTROSPECTION_GIRS = $(gir_DATA)
+ 
+Index: gdm-3.4.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
 ===================================================================
---- gdm-3.2.1.1.orig/gui/simple-greeter/libgdmsimplegreeter/Makefile.am	2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am	2011-12-19 02:13:24.683927311 +0100
+--- gdm-3.4.1.orig/gui/simple-greeter/libgdmsimplegreeter/Makefile.am	2012-06-20 20:51:40.555390238 +0200
++++ gdm-3.4.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am	2012-06-20 21:14:19.326032929 +0200
 @@ -14,7 +14,7 @@ AM_CPPFLAGS = \
  	$(GTK_CFLAGS)				\
  	$(NULL)

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Wed Jun 20 20:09:59 2012
@@ -13,5 +13,6 @@
 21_static_display_purge.patch
 22_noconsole.patch
 90_config_comments.patch
+91_shell_version_control.patch
 92_gsettings_path.patch
 93_private_lib.patch

Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=35382&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Wed Jun 20 20:09:59 2012
@@ -29,7 +29,6 @@
 		--with-user=Debian-gdm --with-group=Debian-gdm \
 		--with-pam-domain=gdm3 \
 		--with-lang-file=/etc/default/locale \
-		--disable-introspection \
 		--without-systemd \
 		--disable-split-authentication
 
@@ -48,6 +47,8 @@
 
 DEB_DH_INSTALLINIT_ARGS := --noscripts
 DEB_DH_MAKESHLIBS_ARGS_gdm3 := --no-act
+
+DEB_DH_GIREPOSITORY_ARGS_gdm3 := -l$(CURDIR)/gui/libgdmgreeter /usr/lib/gdm/
 
 binary-install/gdm3::
 	mv debian/gdm3/usr/sbin/gdm-binary debian/gdm3/usr/sbin/gdm3
@@ -68,7 +69,9 @@
 	rm -f debian/gdm3/etc/pam.d/gdm-autologin
 	rm -f debian/gdm3/usr/share/gdm/autostart/LoginWindow/gnome-session-check-accelerated.desktop
 	cd debian/gdm3/usr/lib/gdm && \
-		rm -f lib*.a lib*.la lib*.so
+		rm -f lib*.a lib*.la lib*.so *.gir
+	cd debian/gdm3/usr/lib/gnome-shell && \
+		ln -s ../gdm/*.typelib . && ln -s ../gdm/libgdmgreeter*.so.? .
 
 INFILES := $(wildcard debian/*.desktop.in)
 OUTFILES := $(INFILES:.desktop.in=.desktop)
@@ -85,6 +88,7 @@
 clean::
 	rm -f $(MANPAGES)
 	rm -f $(OUTFILES)
+	rm -f data/gdm.schemas data/gdm.schemas.in
 
 %: %.pod
 	pod2man --section=$(shell echo $@ | sed 's/.*\.//') \

More information about the pkg-gnome-commits mailing list