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

ah at users.alioth.debian.org ah at users.alioth.debian.org
Mon Mar 10 23:45:51 UTC 2014


Author: ah
Date: Mon Mar 10 23:45:51 2014
New Revision: 40876

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40876
Log:
* New upstream development release.
* debian/rules: add --with-gnome-settings-daemon-directory configure flag.
* Drop debian/patches/07_libexec-paths.patch, obsoleted by previous entry.
* Drop debian/patches/10_no_gettext.patch, merged upstream.
* Drop debian/patches/20_credentials.patch, merged upstream.
* Drop debian/patches/22_noconsole.patch, merged upstream.
* Drop debian/patches/95_check_x11_display.patch
  - Obsoleted by upstream changes, see commit 04116535f7a2f37a9724835
    "daemon: don't require seat to locate reauth channel"
* Have quilt refresh remaining patches to apply cleanly.
* Build-depend on dconf-cli 0.19.90
  - "dconf compile ..." used during build.
* debian/rules: drop moving gdm dconf profile out of /etc
  - upstream gdm has been fixed to not misuse dconf anymore.
* Update debian/libgdm1.symbols
  - 4 symbols dropped related to language selection, upstream
    commit 0b2d22f63b3e6b31 says:
    "This commit drops the interface, since it's unused, and
     we don't have any API guarantees in libgdm."

Removed:
    desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
    desktop/experimental/gdm3/debian/patches/10_no_gettext.patch
    desktop/experimental/gdm3/debian/patches/20_credentials.patch
    desktop/experimental/gdm3/debian/patches/22_noconsole.patch
    desktop/experimental/gdm3/debian/patches/95_check_x11_display.patch
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/libgdm1.symbols
    desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
    desktop/experimental/gdm3/debian/patches/09_default_session.patch
    desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
    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=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Mon Mar 10 23:45:51 2014
@@ -1,5 +1,6 @@
-gdm3 (3.10.0.1-3) UNRELEASED; urgency=low
-
+gdm3 (3.11.90-1) UNRELEASED; urgency=low
+
+  [ Laurent Bigonville ]
   * debian/gdm-launch-environment.pam: Drop the symlink to gdm3-autologin and
     install a real pam service. The differences with gdm3-autologin service
     are that gdm-launch-environment should not transition out of the xdm_t
@@ -15,7 +16,28 @@
   * Drop debian/patches/96_check_libs.patch: Since check 0.9.10-2, check.pc is
     containing the needed libraries for linking, bump build-dep accordingly
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 21 Nov 2013 09:35:43 +0100
+  [ Andreas Henriksson ]
+  * New upstream development release.
+  * debian/rules: add --with-gnome-settings-daemon-directory configure flag.
+  * Drop debian/patches/07_libexec-paths.patch, obsoleted by previous entry.
+  * Drop debian/patches/10_no_gettext.patch, merged upstream.
+  * Drop debian/patches/20_credentials.patch, merged upstream.
+  * Drop debian/patches/22_noconsole.patch, merged upstream.
+  * Drop debian/patches/95_check_x11_display.patch
+    - Obsoleted by upstream changes, see commit 04116535f7a2f37a9724835
+      "daemon: don't require seat to locate reauth channel"
+  * Have quilt refresh remaining patches to apply cleanly.
+  * Build-depend on dconf-cli 0.19.90
+    - "dconf compile ..." used during build.
+  * debian/rules: drop moving gdm dconf profile out of /etc
+    - upstream gdm has been fixed to not misuse dconf anymore.
+  * Update debian/libgdm1.symbols
+    - 4 symbols dropped related to language selection, upstream
+      commit 0b2d22f63b3e6b31 says:
+      "This commit drops the interface, since it's unused, and
+       we don't have any API guarantees in libgdm."
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 23 Feb 2014 18:24:33 +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=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Mon Mar 10 23:45:51 2014
@@ -7,11 +7,12 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, 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~),
                dh-autoreconf,
+               dconf-cli (>= 1.19.90),
                intltool (>= 0.40.0),
                libdbus-glib-1-dev (>= 0.74),
                libglib2.0-dev (>= 2.36.0),

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Mon Mar 10 23:45:51 2014
@@ -7,6 +7,7 @@
                debhelper (>= 8.1.3),
                cdbs (>= 0.4.93~),
                dh-autoreconf,
+               dconf-cli (>= 0.19.90),
                intltool (>= 0.40.0),
                libdbus-glib-1-dev (>= 0.74),
                libglib2.0-dev (>= 2.36.0),

Modified: desktop/experimental/gdm3/debian/libgdm1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/libgdm1.symbols?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/libgdm1.symbols	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/libgdm1.symbols	[utf-8] Mon Mar 10 23:45:51 2014
@@ -43,9 +43,9 @@
  gdm_greeter_call_begin_auto_login at Base 3.8.3
  gdm_greeter_call_begin_auto_login_finish at Base 3.8.3
  gdm_greeter_call_begin_auto_login_sync at Base 3.8.3
- gdm_greeter_call_select_language at Base 3.8.3
- gdm_greeter_call_select_language_finish at Base 3.8.3
- gdm_greeter_call_select_language_sync at Base 3.8.3
+#MISSING: 3.11.90-1# gdm_greeter_call_select_language at Base 3.8.3
+#MISSING: 3.11.90-1# gdm_greeter_call_select_language_finish at Base 3.8.3
+#MISSING: 3.11.90-1# gdm_greeter_call_select_language_sync at Base 3.8.3
  gdm_greeter_call_select_session at Base 3.8.3
  gdm_greeter_call_select_session_finish at Base 3.8.3
  gdm_greeter_call_select_session_sync at Base 3.8.3
@@ -56,7 +56,7 @@
  gdm_greeter_call_start_session_when_ready_finish at Base 3.8.3
  gdm_greeter_call_start_session_when_ready_sync at Base 3.8.3
  gdm_greeter_complete_begin_auto_login at Base 3.8.3
- gdm_greeter_complete_select_language at Base 3.8.3
+#MISSING: 3.11.90-1# gdm_greeter_complete_select_language at Base 3.8.3
  gdm_greeter_complete_select_session at Base 3.8.3
  gdm_greeter_complete_select_user at Base 3.8.3
  gdm_greeter_complete_start_session_when_ready at Base 3.8.3

Modified: desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch	[utf-8] Mon Mar 10 23:45:51 2014
@@ -1,6 +1,6 @@
 --- a/daemon/gdm-session.c
 +++ b/daemon/gdm-session.c
-@@ -1914,6 +1914,7 @@
+@@ -1888,6 +1888,7 @@
                                 0,
                                 service_name);
  

Modified: desktop/experimental/gdm3/debian/patches/09_default_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/09_default_session.patch?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/09_default_session.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/09_default_session.patch	[utf-8] Mon Mar 10 23:45:51 2014
@@ -3,7 +3,7 @@
 Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=594733
 --- a/daemon/gdm-session.c
 +++ b/daemon/gdm-session.c
-@@ -521,7 +521,7 @@
+@@ -533,7 +533,7 @@
                  }
          }
  

Modified: desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/16_xserver_path.patch?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/16_xserver_path.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/16_xserver_path.patch	[utf-8] Mon Mar 10 23:45:51 2014
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1240,7 +1240,10 @@
+@@ -1222,7 +1222,10 @@
  # and /usr/X11 since they often symlink to each other, and configure
  # should use the more stable location (the real directory) if possible.
  #

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series	[utf-8] Mon Mar 10 23:45:51 2014
@@ -1,13 +1,8 @@
 #02_xnest-wrapper.patch
 #06_first_vt.patch
-07_libexec-paths.patch
 08_frequent-users_greeter.patch
 09_default_session.patch
-10_no_gettext.patch
 #11_xephyr_nested.patch
 16_xserver_path.patch
-20_credentials.patch
-22_noconsole.patch
 90_config_comments.patch
 92_gsettings_path.patch
-95_check_x11_display.patch

Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40876&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules	[utf-8] Mon Mar 10 23:45:51 2014
@@ -34,6 +34,7 @@
 		--disable-split-authentication \
 		--with-check-accelerated-directory=/usr/lib/gnome-session/ \
 		--with-ran-once-marker-directory=/var/run/gdm3 \
+		--with-gnome-settings-daemon-directory="`pkg-config --variable=binary gnome-settings-daemon`" \
 		--with-initial-vt=7 \
 		--disable-fallback-greeter
 
@@ -68,10 +69,6 @@
 	dh_installpam -pgdm3 --name=gdm-password
 	rm -rf debian/gdm3/var/lib/gdm3/.[cgl]*
 	rm -rf debian/gdm3/var/run
-	cd debian/gdm3 && \
-		mv etc/dconf/profile/gdm usr/share/gdm/dconf-profile && \
-		mv etc/dconf/db/gdm.d usr/share/gdm/dconf && \
-		rmdir etc/dconf/db etc/dconf/profile etc/dconf
 	rm -rf debian/gdm3/usr/include
 	rm -rf debian/gdm3/usr/lib/pkgconfig
 # Not sure why the following files are still shipped (https://bugzilla.gnome.org/show_bug.cgi?id=710847)




More information about the pkg-gnome-commits mailing list