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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Apr 26 18:35:09 UTC 2014 

Author: joss
Date: Sat Apr 26 18:35:09 2014
New Revision: 41514

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41514
Log:
* Install files in /usr/share/dconf
* Depend on dconf 0.20 for file-db support.
* 92_gsettings_path.patch: removed. Dconf now supports database files 
  with hardcoded paths.
* 91_dconf_database_path.patch: new patch. Point to a dconf path in 
  /var/lib/gdm3 instead of the one in $DATADIR.
* Don’t install the pre-generated dconf database.
* Install the source dconf databases to their former place in 
  /usr/share/gdm/dconf.
* greeter.dconf-defaults: this is a new file to remove the old 
  greeter.gsettings
* Convert greeter.gsettings to greeter.dconf-defaults at postinst time 
  and use ucf to update the file.
* Make a direct symlink to the new greeter.dconf-defaults file in the 
  dconf defaults directory.
* Simplify the dconf regeneration in gdm3.init thanks to that.

Added:
    desktop/experimental/gdm3/debian/gdm3.links
    desktop/experimental/gdm3/debian/greeter.dconf-defaults
    desktop/experimental/gdm3/debian/greeter.dconf-defaults.md5sum
    desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch
Removed:
    desktop/experimental/gdm3/debian/greeter.gsettings
    desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch
Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/gdm3.init
    desktop/experimental/gdm3/debian/gdm3.install
    desktop/experimental/gdm3/debian/gdm3.postinst
    desktop/experimental/gdm3/debian/gdm3.postrm
    desktop/experimental/gdm3/debian/gir1.2-gdm3.install
    desktop/experimental/gdm3/debian/libgdm-dev.install
    desktop/experimental/gdm3/debian/libgdm1.install
    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=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Sat Apr 26 18:35:09 2014
@@ -15,6 +15,22 @@
   * Remove firstVT patch, it has been replaced upstream by 
     --with-initial-vt.
   * 90_config_comments.patch: stop documenting FirstVT.
+  * Install files in /usr/share/dconf
+  * Depend on dconf 0.20 for file-db support.
+  * 92_gsettings_path.patch: removed. Dconf now supports database files 
+    with hardcoded paths.
+  * 91_dconf_database_path.patch: new patch. Point to a dconf path in 
+    /var/lib/gdm3 instead of the one in $DATADIR.
+  * Don’t install the pre-generated dconf database.
+  * Install the source dconf databases to their former place in 
+    /usr/share/gdm/dconf.
+  * greeter.dconf-defaults: this is a new file to remove the old 
+    greeter.gsettings
+  * Convert greeter.gsettings to greeter.dconf-defaults at postinst time 
+    and use ucf to update the file.
+  * Make a direct symlink to the new greeter.dconf-defaults file in the 
+    dconf defaults directory.
+  * Simplify the dconf regeneration in gdm3.init thanks to that.
 
  -- Laurent Bigonville <bigon at debian.org>  Fri, 11 Apr 2014 15:25:51 +0200
 

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Sat Apr 26 18:35:09 2014
@@ -73,8 +73,9 @@
          accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.35.0),
-         dconf-cli (>= 0.12.1-2),
-         dconf-gsettings-backend (>= 0.12.1-2),
+         dconf-cli (>= 0.20),
+         dconf-gsettings-backend (>= 0.20),
+         ucf,
          x11-common (>= 1:7.6+11),
          x11-xserver-utils,
          systemd [linux-any]

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Sat Apr 26 18:35:09 2014
@@ -68,8 +68,9 @@
          accountsservice (>= 0.6.12),
          gsettings-desktop-schemas,
          libglib2.0-bin (>= 2.35.0),
-         dconf-cli (>= 0.12.1-2),
-         dconf-gsettings-backend (>= 0.12.1-2),
+         dconf-cli (>= 0.20),
+         dconf-gsettings-backend (>= 0.20),
+         ucf,
          x11-common (>= 1:7.6+11),
          x11-xserver-utils,
          systemd [linux-any]

Modified: desktop/experimental/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.init?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.init	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.init	[utf-8] Sat Apr 26 18:35:09 2014
@@ -32,16 +32,19 @@
 HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+DEFAULTS_GENERATED=/var/lib/gdm3/greeter-dconf-defaults
+DEFAULTS_DIR=/usr/share/gdm/dconf
+
 gen_config() {
   # GSettings configuration uses dconf update to generate a gdm profile
   if [ -d /var/lib/gdm3 ]; then
     needed=no
-    if [ -f /var/lib/gdm3/dconf/db/gdm ]; then
+    if [ -f $DEFAULTS_GENERATED ]; then
       for f in \
-          /usr/share/gdm/dconf /usr/share/gdm/dconf/*-settings \
-          /usr/share/gdm/dconf/locks /usr/share/gdm/dconf/locks/*-locks \
-          /etc/gdm3/greeter.gsettings; do
-        if [ "$f" -nt /var/lib/gdm3/dconf/db/gdm ]; then
+          $DEFAULTS_DIR $DEFAULTS_DIR/*-settings \
+          $DEFAULTS_DIR/locks $DEFAULTS_DIR/locks/*-locks \
+          /etc/gdm3/greeter.dconf-defaults; do
+        if [ "$f" -nt $DEFAULTS_GENERATED ]; then
           needed=yes
           break
         fi
@@ -50,16 +53,7 @@
       needed=yes
     fi
     if [ "$needed" = yes ]; then
-      rm -rf /var/lib/gdm3/dconf
-      mkdir -p /var/lib/gdm3/dconf/profile /var/lib/gdm3/dconf/db/gdm.d/locks
-      ln -s /usr/share/gdm/dconf-profile /var/lib/gdm3/dconf/profile/gdm
-      ln -s /usr/share/gdm/dconf/*-settings /var/lib/gdm3/dconf/db/gdm.d/
-      ln -s /usr/share/gdm/dconf/locks/*-locks /var/lib/gdm3/dconf/db/gdm.d/locks/
-      # The configuration file in /etc uses org.gnome.blah gsettings syntax.
-      # Convert it to org/gnome/blah dconf syntax.
-      awk '/\[.*\]/ { gsub("\\.","/"); } ! /^#/ { print;}' \
-        /etc/gdm3/greeter.gsettings > /var/lib/gdm3/dconf/db/gdm.d/90-debian-settings
-      dconf update /var/lib/gdm3/dconf/db 2> /dev/null
+      dconf compile $DEFAULTS_GENERATED $DEFAULTS_DIR
     fi
   fi
 }

Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install	[utf-8] Sat Apr 26 18:35:09 2014
@@ -1,17 +1,22 @@
-etc/*
-usr/bin/gdm-screenshot
-usr/lib/gdm3/gdm-*
+debian/tmp/etc/*
+debian/tmp/usr/bin/gdm-screenshot
+debian/tmp/usr/lib/gdm3/gdm-*
 # gets renamed to gdm3 in binary-install
-usr/sbin/gdm
-usr/share/pixmaps/
-usr/share/gnome-session/
-usr/share/locale/
-usr/share/icons/
-usr/share/help/
-usr/share/gdm/
-usr/share/glib-2.0/
-var/*
-debian/Xsession		etc/gdm3
-debian/greeter.gsettings		etc/gdm3
+debian/tmp/usr/sbin/gdm
+debian/tmp/usr/share/pixmaps/
+debian/tmp/usr/share/gnome-session/
+debian/tmp/usr/share/locale/
+debian/tmp/usr/share/icons/
+debian/tmp/usr/share/help/
+debian/tmp/usr/share/gdm/gdb-cmd
+debian/tmp/usr/share/gdm/locale.alias
+debian/tmp/usr/share/gdm/greeter
+debian/tmp/usr/share/gdm/*.schemas
+debian/tmp/usr/share/glib-2.0/
+debian/tmp/usr/share/dconf/
+debian/tmp/var/*
+debian/Xsession				etc/gdm3
+debian/greeter.dconf-defaults*		usr/share/gdm
 debian/default.desktop			usr/share/gdm/BuiltInSessions
 debian/insserv.conf.d			etc
+data/dconf/defaults/*			usr/share/gdm/dconf

Added: desktop/experimental/gdm3/debian/gdm3.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.links?rev=41514&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.links	(added)
+++ desktop/experimental/gdm3/debian/gdm3.links	[utf-8] Sat Apr 26 18:35:09 2014
@@ -0,0 +1 @@
+etc/gdm3/greeter.dconf-defaults usr/share/gdm/dconf/90-debian-settings

Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst	[utf-8] Sat Apr 26 18:35:09 2014
@@ -38,8 +38,6 @@
     fi
   fi
 fi
-# debconf hangs if gdm3 gets started below without this
-db_stop || true
 
 # update-rc.d levels
 S=30
@@ -58,6 +56,28 @@
     rm -rf .gconf .gconf.mandatory .gconf.path .gconfd
   )
 fi
+
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.12.1" \
+	&& [ -d /var/lib/gdm3 ]; then
+  # Remove old autogenerated dconf settings
+  rm -rf /var/lib/gdm3/dconf
+
+  # DON'T DO THIS AT HOME, KIDS
+  # Convert the old GSettings settings file to a dconf one
+  # Yes it's stupid to just convert GSettings paths to dconf ones, but
+  # this is what the init script used to do.
+  if [ -f /etc/gdm3/greeter.gsettings ] && ! [ -f /etc/gdm3/greeter.dconf-defaults ]; then
+    awk '/^[ \t#]*\[.*\]/ { gsub("\\.","/"); } { print;}' \
+      /etc/gdm3/greeter.gsettings > /etc/gdm3/greeter.dconf-defaults
+    rm -f /etc/gdm3/greeter.gsettings
+  fi
+fi
+
+ucf --debconf-ok --three-way /usr/share/gdm/greeter.dconf-defaults /etc/gdm3/greeter.dconf-defaults
+ucfr gdm3 /etc/gdm3/greeter.dconf-defaults
+
+# debconf hangs if gdm3 gets started below without this
+db_stop || true
 
 chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
 

Modified: desktop/experimental/gdm3/debian/gdm3.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postrm?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postrm	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postrm	[utf-8] Sat Apr 26 18:35:09 2014
@@ -16,7 +16,12 @@
 				rmdir --ignore-fail-on-non-empty /etc/gdm3/$i 2> /dev/null
 			fi
 		done
+		rm -f /etc/gdm3/greeter.dconf-defaults
 		rmdir --ignore-fail-on-non-empty /etc/gdm3
+        fi
+        if which ucf >/dev/null; then
+        	ucf --purge /etc/gdm3/greeter.dconf-defaults
+        	ucfr --purge gdm3 /etc/gdm3/greeter.dconf-defaults
         fi
 	rm -rf /var/lib/gdm3
 	rm -rf /var/run/gdm3

Modified: desktop/experimental/gdm3/debian/gir1.2-gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gir1.2-gdm3.install?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gir1.2-gdm3.install	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gir1.2-gdm3.install	[utf-8] Sat Apr 26 18:35:09 2014
@@ -1 +1 @@
-usr/lib/*/girepository-1.0/ usr/lib/
+debian/tmp/usr/lib/*/girepository-1.0/ usr/lib/

Added: desktop/experimental/gdm3/debian/greeter.dconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/greeter.dconf-defaults?rev=41514&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/greeter.dconf-defaults	(added)
+++ desktop/experimental/gdm3/debian/greeter.dconf-defaults	[utf-8] Sat Apr 26 18:35:09 2014
@@ -0,0 +1,35 @@
+# These are the options for the greeter session that can be set 
+# through GSettings. Any GSettings setting that is used by the 
+# greeter session can be set here.
+
+# Note that you must configure the path used by dconf to store the 
+# configuration, not the GSettings path.
+
+
+# Theming options
+# ===============
+#  - Change the GTK+ theme
+# [org/gnome/desktop/interface]
+# gtk-theme='Adwaita'
+#  - Use another background
+# [org/gnome/desktop/background]
+# picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
+# picture-options='zoom'
+#  - Or no background at all
+# [org/gnome/desktop/background]
+# picture-options='none'
+# primary-color='#000000'
+
+# Login manager options
+# =====================
+[org/gnome/login-screen]
+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
+# - Disable restart buttons
+# disable-restart-buttons=true
+# - Show a login welcome message
+# banner-message-enable=true
+# banner-message-text='Welcome'

Added: desktop/experimental/gdm3/debian/greeter.dconf-defaults.md5sum
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/greeter.dconf-defaults.md5sum?rev=41514&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/greeter.dconf-defaults.md5sum	(added)
+++ desktop/experimental/gdm3/debian/greeter.dconf-defaults.md5sum	[utf-8] Sat Apr 26 18:35:09 2014
@@ -0,0 +1,2 @@
+e2279492b09aaf7846125ad66f358442  3.8_unstable
+5e372c504c951d1ee2f578432de494f4  3.4_wheezy

Modified: desktop/experimental/gdm3/debian/libgdm-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/libgdm-dev.install?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/libgdm-dev.install	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/libgdm-dev.install	[utf-8] Sat Apr 26 18:35:09 2014
@@ -1,7 +1,4 @@
-usr/include/gdm/gdm-client-glue.h
-usr/include/gdm/gdm-client.h
-usr/include/gdm/gdm-sessions.h
-usr/include/gdm/gdm-user-switching.h
-usr/share/gir-1.0/
-usr/lib/*/pkgconfig/gdm.pc
-usr/lib/*/libgdm.so
+debian/tmp/usr/include/gdm
+debian/tmp/usr/share/gir-1.0/
+debian/tmp/usr/lib/*/pkgconfig/gdm.pc
+debian/tmp/usr/lib/*/libgdm.so

Modified: desktop/experimental/gdm3/debian/libgdm1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/libgdm1.install?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/libgdm1.install	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/libgdm1.install	[utf-8] Sat Apr 26 18:35:09 2014
@@ -1,2 +1,2 @@
-usr/bin/gdmflexiserver
-usr/lib/*/libgdm.so.*
+debian/tmp/usr/bin/gdmflexiserver
+debian/tmp/usr/lib/*/libgdm.so.*

Added: desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch?rev=41514&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch	(added)
+++ desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch	[utf-8] Sat Apr 26 18:35:09 2014
@@ -0,0 +1,8 @@
+Index: gdm3-3.12.1/data/dconf/gdm.in
+===================================================================
+--- gdm3-3.12.1.orig/data/dconf/gdm.in	2014-04-10 18:58:02.000000000 +0200
++++ gdm3-3.12.1/data/dconf/gdm.in	2014-04-26 18:44:47.549758440 +0200
+@@ -1,2 +1,2 @@
+ user-db:user
+-file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults
++file-db:/var/lib/gdm3/greeter-dconf-defaults

Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=41514&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series	[utf-8] Sat Apr 26 18:35:09 2014
@@ -2,4 +2,4 @@
 09_default_session.patch
 16_xserver_path.patch
 90_config_comments.patch
-92_gsettings_path.patch
+91_dconf_database_path.patch

More information about the pkg-gnome-commits mailing list