r50797 - in /desktop/unstable/gnome-session/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Sep 19 23:24:56 2016
New Revision: 50797

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50797
Log:
Don't fail to restore the old desktop session files if we only build
architecture specific binary packages (gnome-session is arch:all).

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/rules

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=50797&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog	[utf-8] Mon Sep 19 23:24:56 2016
@@ -3,6 +3,8 @@
   * New upstream release.
   * Drop debian/patches/git_fix-bashism.patch, merged upstream.
   * Bump debhelper compat level to 10.
+  * Don't fail to restore the old desktop session files if we only build
+    architecture specific binary packages (gnome-session is arch:all).
 
  -- Michael Biebl <biebl at debian.org>  Tue, 20 Sep 2016 00:53:07 +0200
 

Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=50797&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/rules	[utf-8] Mon Sep 19 23:24:56 2016
@@ -20,9 +20,12 @@
 		--enable-ipv6 \
 		$(CONFFLAGS)
 
+override_dh_auto_install:
+	dh_auto_install
+	# Switch back to Xorg by default
+	rm debian/tmp/usr/share/wayland-sessions/gnome.desktop
+	rm debian/tmp/usr/share/xsessions/gnome-xorg.desktop
+	install -m 0644 debian/gnome-wayland.desktop debian/tmp/usr/share/wayland-sessions
+
 override_dh_install:
 	dh_install --list-missing
-	# Switch back to Xorg by default
-	rm debian/gnome-session/usr/share/wayland-sessions/gnome.desktop
-	rm debian/gnome-session/usr/share/xsessions/gnome-xorg.desktop
-	install -m 0644 debian/gnome-wayland.desktop debian/gnome-session/usr/share/wayland-sessions