r52161 - in /desktop/experimental/glib2.0/debian: changelog control rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri Mar  3 23:41:49 2017
New Revision: 52161

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52161
Log:
Let dh_gnome_clean update the Uploaders instead of reinventing it

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=52161&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Fri Mar  3 23:41:49 2017
@@ -30,6 +30,7 @@
   * Install some missing files detected by dh_install --list-missing
   * Move to debhelper compat level 10
   * Remove indirection via $(SHARED_PKG), etc. variables
+  * Let dh_gnome_clean update the Uploaders instead of reinventing it
 
  -- Simon McVittie <smcv at debian.org>  Thu, 02 Mar 2017 09:15:48 +0000
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=52161&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control	[utf-8] Fri Mar  3 23:41:49 2017
@@ -1,3 +1,7 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
 Source: glib2.0
 Section: libs
 Priority: optional

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=52161&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Fri Mar  3 23:41:49 2017
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-DISABLE_UPDATE_UPLOADERS := 1
 
 include /usr/share/dpkg/default.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -37,6 +35,9 @@
 		$(NULL)
 
 override_dh_clean:
+	rm -rf $(CURDIR)/debian/build \
+	       $(CURDIR)/debian/install \
+	       $(CURDIR)/debian/tmp-xdg-runtime-dir
 	dh_clean -Xorg.gtk.test.gschema.xml.orig
 
 override_dh_makeshlibs:
@@ -136,19 +137,6 @@
 override_dh_python3:
 	dh_python3 -plibglib2.0-dev-bin /usr/share/glib-2.0/codegen
 
-# Don't regenerate d/control, we do that explicitly in clean
-override_dh_gnome_clean:
-	dh_gnome_clean --no-control
-
-clean:
-	sed \
-		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-		debian/control.in > debian/control
-	rm -rf $(CURDIR)/debian/build \
-	       $(CURDIR)/debian/install \
-	       $(CURDIR)/debian/tmp-xdg-runtime-dir
-	dh clean --with gnome,python3
-
 override_dh_install:
 	# Unwanted bits from the .deb build
 	rm -f debian/install/deb/lib/*/*.la