r51379 - in /packages/unstable/eog-plugins/debian: changelog control control.in description.sh rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 11 22:08:20 2016
New Revision: 51379

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51379
Log:
Use the substvar mechanism to generate the package description.
This simplifies debian/rules.

Added:
    packages/unstable/eog-plugins/debian/description.sh   (with props)
Modified:
    packages/unstable/eog-plugins/debian/changelog
    packages/unstable/eog-plugins/debian/control
    packages/unstable/eog-plugins/debian/control.in
    packages/unstable/eog-plugins/debian/rules

Modified: packages/unstable/eog-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/changelog?rev=51379&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/changelog	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/changelog	[utf-8] Tue Oct 11 22:08:20 2016
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Bump debhelper compat level to 10.
+  * Use the substvar mechanism to generate the package description.
+    This simplifies debian/rules.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 11 Oct 2016 23:48:29 +0200
 

Modified: packages/unstable/eog-plugins/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control?rev=51379&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control	[utf-8] Tue Oct 11 22:08:20 2016
@@ -40,17 +40,4 @@
  eog-plugins contain a set of plugins for eog, Eye of GNOME.
  .
  The following plugins are included:
-  * Maximize Windows: Maximize new windows
-  * Hide Titlebar: Hides the titlebar of maximized Eye of GNOME windows
-  * Exif Display: Displays camera settings and histogram
-  * Map: Display the geolocation of the image on a map
-  * Slideshow Shuffle: Shuffles images in slideshow mode
-  * Fullscreen Background: Enables changing background in fullscreen mode
-  * Zoom to Fit Image Width: Fit images to the window width
-  * PicasaWeb Uploader: Upload your pictures to PicasaWeb
-  * Disable Dark Theme: Disables Eye of GNOME's preference of dark theme variants
-  * Python Console: Python console for Eye of GNOME
-  * Export to Folder: Export the current image to a separate directory
-  * Flickr Uploader: Upload your pictures to Flickr
-  * Send By Mail: Sends an image attached to a new mail
- 
+ ${Description}

Modified: packages/unstable/eog-plugins/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/control.in?rev=51379&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/control.in	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/control.in	[utf-8] Tue Oct 11 22:08:20 2016
@@ -40,4 +40,4 @@
  eog-plugins contain a set of plugins for eog, Eye of GNOME.
  .
  The following plugins are included:
- @PLUGINS_DESCRIPTION@
+ ${Description}

Added: packages/unstable/eog-plugins/debian/description.sh
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/description.sh?rev=51379&op=file
==============================================================================
--- packages/unstable/eog-plugins/debian/description.sh	(added)
+++ packages/unstable/eog-plugins/debian/description.sh	[utf-8] Tue Oct 11 22:08:20 2016
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo -n "Description="
+find . -iname \*.desktop.in | sort | while read f; do cat $f | awk -f debian/desktop2description.awk | sed 's/.*/ &\$\{Newline\}/' | tr -d '\n';  done
+echo

Propchange: packages/unstable/eog-plugins/debian/description.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/unstable/eog-plugins/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/eog-plugins/debian/rules?rev=51379&op=diff
==============================================================================
--- packages/unstable/eog-plugins/debian/rules	[utf-8] (original)
+++ packages/unstable/eog-plugins/debian/rules	[utf-8] Tue Oct 11 22:08:20 2016
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -14,17 +12,13 @@
 		--with-plugins=all \
 		--enable-python
 
-override_dh_gnome_clean:
-	dh_gnome_clean --no-control
-	plugins_desc_script="/^ @PLUGINS_DESCRIPTION@\$$/ c \\$$(find . -iname \*.desktop.in | while read f; do cat $$f | awk -f debian/desktop2description.awk; done | sed 's/.*/  &\\/'; echo " ")"; \
-		sed \
-			-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-			-e "$$plugins_desc_script" \
-			debian/control.in > debian/control
-
 override_dh_install:
 	dh_install
 	find debian/eog-plugins -name '*.la' -print -delete
 
 override_dh_python3:
 	dh_python3 --no-ext-rename /usr/lib/$(DEB_HOST_MULTIARCH)/eog/plugins
+
+override_dh_gencontrol:
+	sh debian/description.sh >> debian/eog-plugins.substvars
+	dh_gencontrol