Tue Apr 5 23:21:12 UTC 2016

Author: biebl
Date: Tue Apr  5 23:21:10 2016
New Revision: 47855

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47855
Log:
Drop uploaders.mk from debian/rules as this breaks the clean target with dh

Instead use the gnome dh addon which updates debian/control via dh_gnome_clean.


Modified:
    desktop/experimental/gnome-music/debian/changelog
    desktop/experimental/gnome-music/debian/rules
    desktop/experimental/gnome-online-miners/debian/changelog
    desktop/experimental/gnome-online-miners/debian/rules
    desktop/experimental/gnome-photos/debian/changelog
    desktop/experimental/gnome-photos/debian/rules
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/rules
    desktop/unstable/ekiga/debian/changelog
    desktop/unstable/ekiga/debian/rules
    desktop/unstable/gnome-maps/debian/changelog
    desktop/unstable/gnome-maps/debian/rules
    desktop/unstable/gnome-music/debian/changelog
    desktop/unstable/gnome-music/debian/rules
    desktop/unstable/gnome-online-miners/debian/changelog
    desktop/unstable/gnome-online-miners/debian/rules
    desktop/unstable/gnome-photos/debian/changelog
    desktop/unstable/gnome-photos/debian/rules
    desktop/unstable/libsecret/debian/changelog
    desktop/unstable/libsecret/debian/rules
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/rules
    packages/experimental/gnome-builder/debian/changelog
    packages/experimental/gnome-builder/debian/rules
    packages/experimental/gnome-calendar/debian/changelog
    packages/experimental/gnome-calendar/debian/rules
    packages/experimental/gnome-logs/debian/changelog
    packages/experimental/gnome-logs/debian/rules
    packages/unstable/gfbgraph/debian/changelog
    packages/unstable/gfbgraph/debian/rules
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/rules
    packages/unstable/gnome-calendar/debian/changelog
    packages/unstable/gnome-calendar/debian/rules
    packages/unstable/gnome-characters/debian/changelog
    packages/unstable/gnome-characters/debian/rules
    packages/unstable/gnome-clocks/debian/changelog
    packages/unstable/gnome-clocks/debian/rules
    packages/unstable/gnome-logs/debian/changelog
    packages/unstable/gnome-logs/debian/rules
    packages/unstable/gnome-software/debian/changelog
    packages/unstable/gnome-software/debian/rules
    packages/unstable/gnome-taquin/debian/changelog
    packages/unstable/gnome-taquin/debian/rules
    packages/unstable/gsound/debian/changelog
    packages/unstable/gsound/debian/rules
    packages/unstable/libproxy/debian/changelog
    packages/unstable/libproxy/debian/rules
    packages/unstable/libpwquality/debian/changelog
    packages/unstable/libpwquality/debian/rules
    packages/unstable/polari/debian/changelog
    packages/unstable/polari/debian/rules

Modified: desktop/experimental/gnome-music/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-music/debian/changelog?rev=47855&op=diff
==============================================================================

--- desktop/experimental/gnome-music/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-music/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,6 +1,12 @@
 gnome-music (3.20.0-2) UNRELEASED; urgency=medium
 
+  [ Rico Tzschichholz ]
   * Switch grilo-plugins dependency to -0.3
+
+  [ Michael Biebl ]
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Sun, 03 Apr 2016 09:34:33 +0200
 

Modified: desktop/experimental/gnome-music/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-music/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/experimental/gnome-music/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-music/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with python3
+	dh $@ --with python3,gnome
 
 override_dh_auto_install:
 	dh_auto_install

Modified: desktop/experimental/gnome-online-miners/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-online-miners/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/experimental/gnome-online-miners/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-online-miners/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-online-miners (3.20.0-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 00:55:28 +0200
+
 gnome-online-miners (3.20.0-1) experimental; urgency=medium
 
   [ Laurent Bigonville ]

Modified: desktop/experimental/gnome-online-miners/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-online-miners/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/experimental/gnome-online-miners/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-online-miners/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+%:
+	dh $@  --with autotools-dev,gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- --libexec=/usr/lib/gnome-online-miners
 
 override_dh_install:
 	find debian/ -name \*.la -delete -o -name \*.a -delete
 	dh_install
 
-%:
-	dh $@  --with autotools-dev
-
-override_dh_auto_configure:
-	dh_auto_configure -- --libexec=/usr/lib/gnome-online-miners
-
 override_dh_makeshlibs:
 	dh_makeshlibs -Xlibgom

Modified: desktop/experimental/gnome-photos/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,6 @@
 gnome-photos (3.20.0-1) UNRELEASED; urgency=medium
 
+  [ Andreas Henriksson ]
   * New upstream release.
   * Update build-dependencies according to configure.ac changes:
     - Drop libexempi-dev
@@ -15,6 +16,11 @@
   * Bump Standards-Version to 3.9.7
   * Add debian/patches/libpng12.patch to avoid entangling libpng16 transition
   * Recommend grilo-plugins-0.3 for grl-flickr plugin
+
+  [ Michael Biebl ]
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
 
  -- Andreas Henriksson <andreas at fatal.se>  Sat, 02 Apr 2016 11:29:28 +0200
 

Modified: desktop/experimental/gnome-photos/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-photos/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/experimental/gnome-photos/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-photos/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
+
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules
 
-override_dh_auto_test:
+override_dh_auto_test:

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog	[utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+pygobject (3.20.0-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 00:58:18 +0200
+
 pygobject (3.20.0-1) experimental; urgency=medium
 
   * New upstream release.

Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules	[utf-8] (original)
+++ desktop/experimental/pygobject/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -2,9 +2,6 @@
 
 include /usr/share/dpkg/default.mk
 include /usr/share/python/python.mk
-# breaks debclean, need to do this manually
-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
 
 PYVERS := $(shell pyversions --requested -v debian/control) $(shell py3versions --supported -v)
@@ -24,7 +21,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python2,python3,autoreconf
+	dh $@ --with python2,python3,autoreconf,gnome
 
 override_dh_auto_configure:
 	set -e && for x in $(FLAVOURS); do \
@@ -88,8 +85,6 @@
 	dh_python2 --no-guessing-versions
 
 override_dh_clean:
-	# from uploaders.mk; this uses cdbs-style clean:: which breaks dh clean
-	{ cat $(CONTROL_HEADER) ; sed "s/@GNOME_TEAM@/$(UPLOADERS)/" debian/control.in ; } > debian/control
 	rm -rf debian/install-*
 	find \( -name '*.pyc' -o -name '*.pyo' -o -name '*.la' \) -delete; \
 	dh_clean

Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog	[utf-8] (original)
+++ desktop/unstable/ekiga/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+ekiga (4.0.1-7) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 00:59:05 +0200
+
 ekiga (4.0.1-6) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules	[utf-8] (original)
+++ desktop/unstable/ekiga/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with autoreconf --parallel
+	dh $@ --with autoreconf,gnome --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure --\

Modified: desktop/unstable/gnome-maps/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-maps/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-maps/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-maps (3.20.0-3) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:02:24 +0200
+
 gnome-maps (3.20.0-2) unstable; urgency=medium
 
   * Bump gjs (build-)dependencies to >= 1.44.0 (Closes: #819548)

Modified: desktop/unstable/gnome-maps/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-maps/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-maps/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf,gir
+	dh $@ --with autoreconf,gir,gnome
 
 override_dh_auto_install:
 	dh_auto_install

Modified: desktop/unstable/gnome-music/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-music/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-music/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-music/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-music (3.18.2-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:04:27 +0200
+
 gnome-music (3.18.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-music/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-music/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-music/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-music/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with python3
+	dh $@ --with python3,gnome
 
 override_dh_auto_install:
 	dh_auto_install

Modified: desktop/unstable/gnome-online-miners/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-miners/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-online-miners/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-online-miners/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-online-miners (3.14.3-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:04:44 +0200
+
 gnome-online-miners (3.14.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-online-miners/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-online-miners/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-online-miners/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-online-miners/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,17 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+%:
+	dh $@  --with autotools-dev,gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- --libexec=/usr/lib/gnome-online-miners
 
 override_dh_install:
 	find debian/ -name \*.la -delete -o -name \*.a -delete
 	dh_install
 
-%:
-	dh $@  --with autotools-dev
-
-override_dh_auto_configure:
-	dh_auto_configure -- --libexec=/usr/lib/gnome-online-miners
-
 override_dh_makeshlibs:
 	dh_makeshlibs -Xlibgom

Modified: desktop/unstable/gnome-photos/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-photos (3.18.2-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:05:18 +0200
+
 gnome-photos (3.18.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-photos/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
+
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules
 
-override_dh_auto_test:
+override_dh_auto_test:

Modified: desktop/unstable/libsecret/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+libsecret (0.18.4-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:05:43 +0200
+
 libsecret (0.18.4-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/libsecret/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/rules	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with autoreconf,gir
+	dh $@ --with autoreconf,gir,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=47855&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+pygobject (3.18.2-3) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:15:27 +0200
+
 pygobject (3.18.2-2) unstable; urgency=medium
 
   * Fix rules when deciding for which architecture the test-suite failure

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=47855&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -2,9 +2,6 @@
 
 include /usr/share/dpkg/default.mk
 include /usr/share/python/python.mk
-# breaks debclean, need to do this manually
-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
 
 PYVERS := $(shell pyversions --requested -v debian/control) $(shell py3versions --supported -v)
@@ -24,7 +21,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python2,python3,autoreconf
+	dh $@ --with python2,python3,autoreconf,gnome
 
 override_dh_auto_configure:
 	set -e && for x in $(FLAVOURS); do \
@@ -88,8 +85,6 @@
 	dh_python2 --no-guessing-versions
 
 override_dh_clean:
-	# from uploaders.mk; this uses cdbs-style clean:: which breaks dh clean
-	{ cat $(CONTROL_HEADER) ; sed "s/@GNOME_TEAM@/$(UPLOADERS)/" debian/control.in ; } > debian/control
 	rm -rf debian/install-*
 	find \( -name '*.pyc' -o -name '*.pyo' -o -name '*.la' \) -delete; \
 	dh_clean

Modified: packages/experimental/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,6 @@
 gnome-builder (3.20.0-1) UNRELEASED; urgency=medium
 
+  [ Andreas Henriksson ]
   * New upstream release.
   * Drop debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch
     - merged upstream.
@@ -32,6 +33,11 @@
     - devhelp plugin: libdevhelp-dev to >= 3.20.0
     - git plugin: libgit2-glib-1.0-dev to >= 0.24.0
     Note: added/new plugins not taken into consideration here (yet).
+
+  [ Michael Biebl ]
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
 
  -- Andreas Henriksson <andreas at fatal.se>  Sat, 02 Apr 2016 14:39:35 +0200
 

Modified: packages/experimental/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # output every command that modifies files on the build system.
@@ -20,7 +20,7 @@
 
 
 %:
-	dh $@  --with autoreconf,gir
+	dh $@  --with autoreconf,gir,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-static \

Modified: packages/experimental/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-calendar (3.19.92-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:16:29 +0200
+
 gnome-calendar (3.19.92-1) experimental; urgency=medium
 
   * New upstream release.

Modified: packages/experimental/gnome-calendar/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-calendar/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-calendar/debian/rules	[utf-8] (original)
+++ packages/experimental/gnome-calendar/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@
+	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules

Modified: packages/experimental/gnome-logs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-logs/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-logs/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-logs/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-logs (3.19.92-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:16:39 +0200
+
 gnome-logs (3.19.92-1) experimental; urgency=medium
 
   * New upstream release.

Modified: packages/experimental/gnome-logs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-logs/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/experimental/gnome-logs/debian/rules	[utf-8] (original)
+++ packages/experimental/gnome-logs/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with autoreconf
+	dh $@  --with autoreconf,gnome

Modified: packages/unstable/gfbgraph/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gfbgraph/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gfbgraph/debian/changelog	[utf-8] (original)
+++ packages/unstable/gfbgraph/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gfbgraph (0.2.3-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:16:57 +0200
+
 gfbgraph (0.2.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gfbgraph/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gfbgraph/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gfbgraph/debian/rules	[utf-8] (original)
+++ packages/unstable/gfbgraph/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@  --with autoreconf,gir
+	dh $@  --with autoreconf,gir,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-builder (3.18.1-3) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:17:09 +0200
+
 gnome-builder (3.18.1-2) unstable; urgency=medium
 
   [ Tim Lunn ]

Modified: packages/unstable/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # output every command that modifies files on the build system.
@@ -20,7 +20,7 @@
 
 
 %:
-	dh $@  --with autotools-dev,gir
+	dh $@  --with autotools-dev,gir,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-static \

Modified: packages/unstable/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-calendar/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-calendar/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-calendar/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-calendar (3.18.3-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:17:17 +0200
+
 gnome-calendar (3.18.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gnome-calendar/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-calendar/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-calendar/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-calendar/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@
+	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules

Modified: packages/unstable/gnome-characters/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-characters/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-characters/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-characters/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-characters (3.20.0-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:17:27 +0200
+
 gnome-characters (3.20.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gnome-characters/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-characters/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-characters/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-characters/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@
+	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules --disable-dogtail

Modified: packages/unstable/gnome-clocks/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-clocks/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-clocks/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-clocks/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -11,6 +11,11 @@
     - bump gtk+ to >= 3.19.8
   * Bump build-dependency on valac to >= 0.32.0
     - we need valac-0.32-vapi for the GTK+ 3.20 API updates.
+
+  [ Michael Biebl ]
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
 
  -- Andreas Henriksson <andreas at fatal.se>  Fri, 25 Mar 2016 08:18:33 +0100
 

Modified: packages/unstable/gnome-clocks/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-clocks/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-clocks/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-clocks/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev,gnome
 
 override_dh_auto_configure:
 	find . -name "*_vala.stamp" | xargs rm -f

Modified: packages/unstable/gnome-logs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-logs/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-logs/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-logs (3.18.1-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:17:45 +0200
+
 gnome-logs (3.18.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gnome-logs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-logs/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-logs/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with autoreconf
+	dh $@  --with autoreconf,gnome

Modified: packages/unstable/gnome-software/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-software/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-software/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-software (3.18.3-4) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:17:56 +0200
+
 gnome-software (3.18.3-3) unstable; urgency=medium
 
   * Add 01_fwupd-dont-crash.patch: Don't crash when the fwupd daemon

Modified: packages/unstable/gnome-software/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-software/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-software/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-software/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GS_CONFIGURE_FLAGS = --libdir=/usr/lib \

Modified: packages/unstable/gnome-taquin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-taquin/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-taquin/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-taquin/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gnome-taquin (3.19.91-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:18:08 +0200
+
 gnome-taquin (3.19.91-1) unstable; urgency=low
 
   * Initial release

Modified: packages/unstable/gnome-taquin/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-taquin/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gnome-taquin/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-taquin/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@
+	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules

Modified: packages/unstable/gsound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gsound/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/gsound/debian/changelog	[utf-8] (original)
+++ packages/unstable/gsound/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+gsound (1.0.2-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:18:25 +0200
+
 gsound (1.0.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gsound/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gsound/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/gsound/debian/rules	[utf-8] (original)
+++ packages/unstable/gsound/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 %:
-	dh $@ --with gir
+	dh $@ --with gir,gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules

Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog	[utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+libproxy (0.4.11-6) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:18:36 +0200
+
 libproxy (0.4.11-5) unstable; urgency=medium
 
   [ Peter Pentchev ]

Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules	[utf-8] (original)
+++ packages/unstable/libproxy/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 SHLIBVER := 0.4.11
 libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+(v5)?)[[:space:]]*$$/\1/p' debian/control.in)
@@ -63,4 +61,4 @@
 	dh_gencontrol -- -Vlibproxy=${libproxy}
 
 %:
-	dh $@ $(WITH_CLI) --with python2
+	dh $@ $(WITH_CLI) --with python2,gnome

Modified: packages/unstable/libpwquality/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpwquality/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/libpwquality/debian/changelog	[utf-8] (original)
+++ packages/unstable/libpwquality/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+libpwquality (1.2.3-2) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:18:48 +0200
+
 libpwquality (1.2.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/unstable/libpwquality/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpwquality/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/libpwquality/debian/rules	[utf-8] (original)
+++ packages/unstable/libpwquality/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 TARBALL_EXT = tar.bz2
@@ -20,4 +19,4 @@
 		--with-pythonsitedir=/usr/lib/$(PYVER)/dist-packages/
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,gnome

Modified: packages/unstable/polari/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/polari/debian/changelog?rev=47855&op=diff
==============================================================================
--- packages/unstable/polari/debian/changelog	[utf-8] (original)
+++ packages/unstable/polari/debian/changelog	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,3 +1,11 @@
+polari (3.18.1-3) UNRELEASED; urgency=medium
+
+  * Drop uploaders.mk from debian/rules as this breaks the clean target with
+    dh. Instead use the gnome dh addon which updates debian/control via
+    dh_gnome_clean.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 06 Apr 2016 01:18:58 +0200
+
 polari (3.18.1-2) unstable; urgency=medium
 
   * Add patches from upstream fixing appdata syntax (Closes: #813874)

Modified: packages/unstable/polari/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/polari/debian/rules?rev=47855&op=diff
==============================================================================
--- packages/unstable/polari/debian/rules	[utf-8] (original)
+++ packages/unstable/polari/debian/rules	[utf-8] Tue Apr  5 23:21:10 2016
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-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,-z,defs -Wl,-O1 -Wl,--as-needed


