r28149 - in /desktop/experimental/gdm3/debian: changelog control control.in gdm3.install patches/07_libexec-paths.patch patches/91_dconf_override.patch patches/93_xdg_data_dirs.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue May 31 22:40:13 UTC 2011 

Author: joss
Date: Tue May 31 22:40:13 2011
New Revision: 28149

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28149
Log:
* New upstream bugfix & security release.
* Require accountsservice 0.6.12.
* 07_libexec-paths.patch, 91_dconf_override.patch: updated for the new 
  version.
* 93_xdg_data_dirs.patch: new patch. Add /usr/share/gdm to 
  XDG_DATA_DIRS.
* debian/gdm3.install: install the dummy desktop handler and the 
  mimeapps.list to /usr/share/gdm/applications.

Added:
    desktop/experimental/gdm3/debian/patches/93_xdg_data_dirs.patch
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/gdm3.install
    desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
    desktop/experimental/gdm3/debian/patches/91_dconf_override.patch
    desktop/experimental/gdm3/debian/patches/series

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Tue May 31 22:40:13 2011
@@ -1,3 +1,16 @@
+gdm3 (3.0.4-1) experimental; urgency=low
+
+  * New upstream bugfix & security release.
+  * Require accountsservice 0.6.12.
+  * 07_libexec-paths.patch, 91_dconf_override.patch: updated for the new 
+    version.
+  * 93_xdg_data_dirs.patch: new patch. Add /usr/share/gdm to 
+    XDG_DATA_DIRS.
+  * debian/gdm3.install: install the dummy desktop handler and the 
+    mimeapps.list to /usr/share/gdm/applications.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 01 Jun 2011 00:40:08 +0200
+
 gdm3 (3.0.0-2) experimental; urgency=low
 
   * 18_switch_kill_greeter.patch: remove the 2 second timeout, it is 

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Tue May 31 22:40:13 2011
@@ -23,7 +23,7 @@
                libcanberra-gtk3-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
                libupower-glib-dev (>= 0.9.0),
-               libaccountsservice-dev (>= 0.6.5),
+               libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
                libpolkit-gobject-1-dev (>= 0.92),
                libpolkit-gtk-1-dev (>= 0.92),
@@ -63,7 +63,7 @@
          lsb-base (>= 3.2-14),
          librsvg2-common,
          gconf2 (>= 2.26.2-3),
-         accountsservice (>= 0.6.9-2),
+         accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.26),
          dconf-gsettings-backend

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Tue May 31 22:40:13 2011
@@ -18,7 +18,7 @@
                libcanberra-gtk3-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
                libupower-glib-dev (>= 0.9.0),
-               libaccountsservice-dev (>= 0.6.5),
+               libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
                libpolkit-gobject-1-dev (>= 0.92),
                libpolkit-gtk-1-dev (>= 0.92),
@@ -58,7 +58,7 @@
          lsb-base (>= 3.2-14),
          librsvg2-common,
          gconf2 (>= 2.26.2-3),
-         accountsservice (>= 0.6.9-2),
+         accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.26),
          dconf-gsettings-backend

Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install [utf-8] Tue May 31 22:40:13 2011
@@ -3,4 +3,6 @@
 debian/greeter.gsettings		etc/gdm3
 debian/default.desktop			usr/share/gdm/BuiltInSessions
 data/session-setup.entries		usr/share/gdm/greeter-config
+data/mimeapps.list			usr/share/gdm/applications
+data/mime-dummy-handler.desktop		usr/share/gdm/applications
 debian/insserv.conf.d			etc

Modified: desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch [utf-8] Tue May 31 22:40:13 2011
@@ -1,10 +1,10 @@
 GNOME #645918
 
-Index: gdm-2.91.94/daemon/gdm-server.c
+Index: gdm-3.0.4/daemon/gdm-server.c
 ===================================================================
---- gdm-2.91.94.orig/daemon/gdm-server.c	2011-03-28 14:01:49.000000000 +0530
-+++ gdm-2.91.94/daemon/gdm-server.c	2011-03-28 14:39:25.987040200 +0530
-@@ -134,7 +134,7 @@
+--- gdm-3.0.4.orig/daemon/gdm-server.c	2011-05-31 23:59:46.000000000 +0200
++++ gdm-3.0.4/daemon/gdm-server.c	2011-06-01 00:00:15.501219261 +0200
+@@ -134,7 +134,7 @@ _gdm_server_query_ck_for_display_device
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
          error = NULL;
@@ -13,10 +13,10 @@
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
-Index: gdm-2.91.94/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+Index: gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
 ===================================================================
---- gdm-2.91.94.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-03-17 19:53:18.000000000 +0530
-+++ gdm-2.91.94/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-03-28 14:15:39.099040320 +0530
+--- gdm-3.0.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
 @@ -1,8 +1,8 @@
  [Desktop Entry]
  Type=Application
@@ -28,11 +28,11 @@
  OnlyShowIn=GNOME;
  X-GNOME-Autostart-Phase=Initialization
  X-GNOME-Autostart-Notify=true
-Index: gdm-2.91.94/gui/simple-chooser/gdm-chooser-session.c
+Index: gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c
 ===================================================================
---- gdm-2.91.94.orig/gui/simple-chooser/gdm-chooser-session.c	2011-03-17 19:53:18.000000000 +0530
-+++ gdm-2.91.94/gui/simple-chooser/gdm-chooser-session.c	2011-03-28 14:16:02.211041102 +0530
-@@ -131,7 +131,7 @@
+--- gdm-3.0.4.orig/gui/simple-chooser/gdm-chooser-session.c	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c	2011-06-01 00:00:15.501219261 +0200
+@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession
          ret = FALSE;
  
          error = NULL;
@@ -41,10 +41,10 @@
          if (error != NULL) {
                  g_warning ("Error starting settings daemon: %s", error->message);
                  g_error_free (error);
-Index: gdm-2.91.94/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
+Index: gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
 ===================================================================
---- gdm-2.91.94.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-03-07 23:10:37.000000000 +0530
-+++ gdm-2.91.94/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-03-28 14:43:07.931290431 +0530
+--- gdm-3.0.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-03-07 18:40:37.000000000 +0100
++++ gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
 @@ -1,5 +1,5 @@
  [Desktop Entry]
  Type=Application
@@ -52,19 +52,19 @@
 -Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
 +Exec=@PK_GNOME_LIBEXECDIR@/polkit-gnome-authentication-agent-1
  OnlyShowIn=GNOME;
-Index: gdm-2.91.94/configure.ac
+Index: gdm-3.0.4/configure.ac
 ===================================================================
---- gdm-2.91.94.orig/configure.ac	2011-03-28 14:22:04.635041861 +0530
-+++ gdm-2.91.94/configure.ac	2011-03-28 15:41:16.251040749 +0530
-@@ -52,6 +52,7 @@
+--- gdm-3.0.4.orig/configure.ac	2011-05-31 23:59:43.000000000 +0200
++++ gdm-3.0.4/configure.ac	2011-06-01 00:00:32.821303957 +0200
+@@ -52,6 +52,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
  FONTCONFIG_REQUIRED_VERSION=2.5.0
  UPOWER_REQUIRED_VERSION=0.9.0
- ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.5
+ ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
 +GSD_REQUIRED_VERSION=2.91.2
  
  EXTRA_COMPILE_WARNINGS(yes)
  
-@@ -170,6 +171,39 @@
+@@ -170,6 +171,39 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
  AM_GCONF_SOURCE_2
  
  dnl ---------------------------------------------------------------------------
@@ -104,11 +104,11 @@
  dnl - Configuration file stuff
  dnl ---------------------------------------------------------------------------
  
-Index: gdm-2.91.94/daemon/Makefile.am
+Index: gdm-3.0.4/daemon/Makefile.am
 ===================================================================
---- gdm-2.91.94.orig/daemon/Makefile.am	2011-03-28 15:17:18.107041508 +0530
-+++ gdm-2.91.94/daemon/Makefile.am	2011-03-28 15:26:55.835039673 +0530
-@@ -12,6 +12,7 @@
+--- gdm-3.0.4.orig/daemon/Makefile.am	2011-05-31 16:28:03.000000000 +0200
++++ gdm-3.0.4/daemon/Makefile.am	2011-06-01 00:00:15.501219261 +0200
+@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
  	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
  	-DLIBDIR=\"$(libdir)\"				\
  	-DLIBEXECDIR=\"$(libexecdir)\"			\
@@ -116,11 +116,11 @@
  	-DLOGDIR=\"$(logdir)\"				\
  	-DSBINDIR=\"$(sbindir)\"			\
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-Index: gdm-2.91.94/data/greeter-autostart/Makefile.am
+Index: gdm-3.0.4/data/greeter-autostart/Makefile.am
 ===================================================================
---- gdm-2.91.94.orig/data/greeter-autostart/Makefile.am	2011-03-28 15:15:59.075041316 +0530
-+++ gdm-2.91.94/data/greeter-autostart/Makefile.am	2011-03-28 15:25:53.855291378 +0530
-@@ -5,6 +5,9 @@
+--- gdm-3.0.4.orig/data/greeter-autostart/Makefile.am	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/data/greeter-autostart/Makefile.am	2011-06-01 00:00:15.501219261 +0200
+@@ -5,6 +5,9 @@ edit = sed \
  	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
  	-e 's|@LIBDIR[@]|$(libdir)|g' \
  	-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
@@ -130,10 +130,10 @@
  	-e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
  
  %.desktop.in: %.desktop.in.in Makefile
-Index: gdm-2.91.94/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in
+Index: gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in
 ===================================================================
---- gdm-2.91.94.orig/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-03-28 15:27:24.795041790 +0530
-+++ gdm-2.91.94/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-03-28 15:27:35.871042164 +0530
+--- gdm-3.0.4.orig/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=Application

Modified: desktop/experimental/gdm3/debian/patches/91_dconf_override.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/91_dconf_override.patch?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/91_dconf_override.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/91_dconf_override.patch [utf-8] Tue May 31 22:40:13 2011
@@ -1,8 +1,8 @@
-Index: gdm-3.0.0/data/Makefile.am
+Index: gdm-3.0.4/data/Makefile.am
 ===================================================================
---- gdm-3.0.0.orig/data/Makefile.am	2011-05-11 22:14:01.807002942 +0200
-+++ gdm-3.0.0/data/Makefile.am	2011-05-11 22:15:26.103415033 +0200
-@@ -120,12 +120,6 @@ MAINTAINERCLEANFILES =			\
+--- gdm-3.0.4.orig/data/Makefile.am	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/data/Makefile.am	2011-06-01 00:05:14.258679779 +0200
+@@ -122,12 +122,6 @@ MAINTAINERCLEANFILES =			\
  	dconf-override-db		\
  	Makefile.in
  
@@ -15,10 +15,10 @@
  uninstall-hook:
  	rm -f \
  	$(DESTDIR)$(GDM_CUSTOM_CONF) \
-@@ -137,19 +131,13 @@ uninstall-hook:
- 	$(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \
- 	$(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
+@@ -141,19 +135,13 @@ uninstall-hook:
  	$(DESTDIR)$(workingdir)/.gconf.path \
+ 	$(DESTDIR)$(workingdir)/.local/share/applications/mime-dummy-handler.desktop \
+ 	$(DESTDIR)$(workingdir)/.local/share/applications/mimeapps.list \
 -	$(DESTDIR)$(sysconfdir)/dconf/db/gdm \
 -	$(DESTDIR)$(sysconfdir)/dconf/profile/gdm \
  	-rf \
@@ -36,8 +36,8 @@
  	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \
  		chmod 755 $(DESTDIR)$(gdmconfdir); \
-@@ -247,18 +235,6 @@ install-data-hook: gdm.conf-custom Xsess
- 		chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \
+@@ -257,18 +245,6 @@ install-data-hook: gdm.conf-custom Xsess
+ 		chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
  	fi
  
 -	if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/profile; then \
@@ -55,22 +55,25 @@
  	if test '!' -d $(DESTDIR)$(cachedir); then \
  		$(mkinstalldirs) $(DESTDIR)$(cachedir); \
  		chmod 1755 $(DESTDIR)$(cachedir); \
-@@ -272,6 +248,3 @@ install-data-hook: gdm.conf-custom Xsess
+@@ -282,8 +258,5 @@ install-data-hook: gdm.conf-custom Xsess
  	chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
  	chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml
  
 -	$(INSTALL_DATA) $(srcdir)/dconf-override-db $(DESTDIR)$(sysconfdir)/dconf/db/gdm
 -	$(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm
 -
-Index: gdm-3.0.0/data/make-dconf-override-db.sh
+ 	$(INSTALL_DATA) $(srcdir)/mime-dummy-handler.desktop $(DESTDIR)$(workingdir)/.local/share/applications/mime-dummy-handler.desktop
+ 	$(INSTALL_DATA) $(srcdir)/mimeapps.list $(DESTDIR)$(workingdir)/.local/share/applications/mimeapps.list
+Index: gdm-3.0.4/data/make-dconf-override-db.sh
 ===================================================================
---- gdm-3.0.0.orig/data/make-dconf-override-db.sh	2011-05-11 22:16:11.311636062 +0200
-+++ gdm-3.0.0/data/make-dconf-override-db.sh	2011-05-11 22:26:09.582560838 +0200
-@@ -2,10 +2,16 @@
+--- gdm-3.0.4.orig/data/make-dconf-override-db.sh	2011-05-31 18:19:38.000000000 +0200
++++ gdm-3.0.4/data/make-dconf-override-db.sh	2011-06-01 00:06:10.026952479 +0200
+@@ -2,11 +2,16 @@
  
  set -e
  
 -export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD")
+-export XDG_CACHE_HOME="$XDG_CONFIG_HOME"
 -eval `dbus-launch --sh-syntax`
 -
 -trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR
@@ -87,7 +90,7 @@
  
  gsettings set org.gnome.power-manager show-actions false
  
-@@ -49,8 +55,3 @@ gsettings set org.gnome.settings-daemon.
+@@ -50,8 +55,3 @@ gsettings set org.gnome.settings-daemon.
  gsettings set org.gnome.settings-daemon.plugins.sound active true
  gsettings set org.gnome.settings-daemon.plugins.xrandr active true
  gsettings set org.gnome.settings-daemon.plugins.xsettings active true

Added: desktop/experimental/gdm3/debian/patches/93_xdg_data_dirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/93_xdg_data_dirs.patch?rev=28149&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/93_xdg_data_dirs.patch (added)
+++ desktop/experimental/gdm3/debian/patches/93_xdg_data_dirs.patch [utf-8] Tue May 31 22:40:13 2011
@@ -1,0 +1,12 @@
+Index: gdm-3.0.4/daemon/gdm-welcome-session.c
+===================================================================
+--- gdm-3.0.4.orig/daemon/gdm-welcome-session.c	2011-06-01 00:30:51.050192803 +0200
++++ gdm-3.0.4/daemon/gdm-welcome-session.c	2011-06-01 00:31:56.786514173 +0200
+@@ -440,6 +440,7 @@ get_welcome_environment (GdmWelcomeSessi
+         g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
+         g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
+         g_hash_table_insert (hash, g_strdup ("GSETTINGS_SCHEMA_DIR"), g_strdup ("/var/lib/gdm3"));
++        g_hash_table_insert (hash, g_strdup ("XDG_DATA_DIRS"), g_strdup ("/usr/share/gdm:/usr/local/share:/usr/share"));
+ 
+         g_hash_table_foreach (hash, (GHFunc)listify_hash, env);
+         g_hash_table_destroy (hash);

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=28149&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Tue May 31 22:40:13 2011
@@ -17,3 +17,4 @@
 90_config_comments.patch
 91_dconf_override.patch
 92_gsettings_path.patch
+93_xdg_data_dirs.patch

More information about the pkg-gnome-commits mailing list