r50626 - in /desktop/unstable/gedit/debian: changelog rules

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Sep 15 09:41:23 2016
New Revision: 50626

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50626
Log:
* Remove usr/bin/gnome-text-editor symlink as installed by
  the upstream build system, as that symlink is already being
  registered in the debian alternatives system in postinst instead of
  shipped.
* Use --fail-missing

Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/rules

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=50626&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Thu Sep 15 09:41:23 2016
@@ -3,6 +3,11 @@
   * Bump dh compat to 10 (automatic dh-autoreconf)
   * Add explicit gnome-common build-dependency (Closes: #837862)
   * Remove '*.la' and '__pycache__' files which are not to be shipped.
+  * Remove usr/bin/gnome-text-editor symlink as installed by
+    the upstream build system, as that symlink is already being
+    registered in the debian alternatives system in postinst instead of
+    shipped.
+  * Use --fail-missing
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 15 Sep 2016 11:13:46 +0200
 

Modified: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=50626&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules	[utf-8] (original)
+++ desktop/unstable/gedit/debian/rules	[utf-8] Thu Sep 15 09:41:23 2016
@@ -21,7 +21,11 @@
 	dh_girepository	-ldebian/tmp/usr/share/gedit/gir-1.0 \
 		/usr/lib/$(DEB_HOST_MULTIARCH)/gedit/girepository-1.0
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_install:
+	# remove cruft
 	find debian/tmp -name '*.la' -delete
 	rm -rf debian/tmp/usr/lib/x86_64-linux-gnu/gedit/plugins/*/__pycache__/
+	# remove gnome-text-editor symlink, it's registered in the
+	# debian alternatives system instead. See postinst.
+	rm -f debian/tmp/usr/bin/gnome-text-editor
+	dh_install --fail-missing