r51470 - in /desktop/unstable/gdm3/debian: changelog gdm3.maintscript gdm3.postinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Oct 16 20:59:28 2016
New Revision: 51470

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51470
Log:
Remove migration code from pre-wheezy.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.maintscript
    desktop/unstable/gdm3/debian/gdm3.postinst

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=51470&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Sun Oct 16 20:59:28 2016
@@ -4,6 +4,7 @@
   * Refresh debian/patches/16_xserver_path.patch.
   * Strip debian/tmp/ from .install files.
   * Bump debhelper compat level to 10.
+  * Remove migration code from pre-wheezy.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 22 Sep 2016 15:03:20 +0200
 

Modified: desktop/unstable/gdm3/debian/gdm3.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.maintscript?rev=51470&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.maintscript	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.maintscript	[utf-8] Sun Oct 16 20:59:28 2016
@@ -1,3 +1,2 @@
-rm_conffile /etc/gdm3/greeter.gconf-defaults 3.4
 mv_conffile /etc/pam.d/gdm3 /etc/pam.d/gdm-password 3.10.0.1-3~
 mv_conffile /etc/pam.d/gdm3-autologin /etc/pam.d/gdm-autologin 3.10.0.1-3~

Modified: desktop/unstable/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.postinst?rev=51470&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.postinst	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.postinst	[utf-8] Sun Oct 16 20:59:28 2016
@@ -62,20 +62,6 @@
 S=30
 K=01
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.2"; then
-  # Remove 3.0 gsettings configuration - now we use dconf
-  rm -f /var/lib/gdm3/gschemas.compiled
-fi
-
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.4" \
-	&& [ -d /var/lib/gdm3 ]; then
-  # Remove anything GConf related
-  (
-    cd /var/lib/gdm3
-    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
@@ -106,24 +92,6 @@
 
 #DEBHELPER#
 
-if [ -f /var/run/gdm.pid ]; then
-  # We are probably upgrading from the old GDM version
-  old_pid=$(cat /var/run/gdm.pid)
-  if [ -L /proc/"$old_pid"/exe ] && [ $(readlink /proc/"$old_pid"/exe | awk '{print $1}') = /usr/sbin/gdm ]; then
-    # Paint me ugly: when you reload GDM 2.20, it will re-execute itself
-    # when possible. This means we need a temporary /usr/sbin/gdm that
-    # will delete itself (so that the old /etc/init.d/gdm becomes again
-    # a no-op).
-    cat > /usr/sbin/gdm << EOF
-#! /bin/sh
-rm -f /usr/sbin/gdm
-exec /usr/sbin/gdm3 "\$@"
-EOF
-    chmod 755 /usr/sbin/gdm
-    kill -s USR1 "$old_pid" || true
-  fi
-fi
-
 if [ -x /etc/init.d/gdm3 ]; then
   update-rc.d gdm3 defaults $S $K >/dev/null 2>&1
   invoke-rc.d gdm3 reload || true