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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr  2 13:24:03 2007
New Revision: 9488

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9488
Log:
* Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
  its logic; build-dep on gnome-pkg-tools >= 0.11.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    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=9488&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Mon Apr  2 13:24:03 2007
@@ -2,6 +2,8 @@
 
   * Run "make check" test suite for the deb flavor except if DEB_BUILD_OPTIONS
     contains the "nocheck" keyword; ignore failures.
+  * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
+    its logic; build-dep on gnome-pkg-tools >= 0.11.
 
  -- Loic Minier <lool at dooz.org>  Mon, 02 Apr 2007 15:16:13 +0200
 

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=9488&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control (original)
+++ desktop/experimental/glib2.0/debian/control Mon Apr  2 13:24:03 2007
@@ -2,8 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools (>= 0.10), quilt, dpkg-dev (>= 1.13.19)
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools (>= 0.11), quilt, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: libglib2.0-0

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=9488&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in (original)
+++ desktop/experimental/glib2.0/debian/control.in Mon Apr  2 13:24:03 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools (>= 0.10), quilt, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>> 5.0.22), pkg-config (>= 0.14.0), gettext, autotools-dev, gnome-pkg-tools (>= 0.11), quilt, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: @SHARED_PKG@

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=9488&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Mon Apr  2 13:24:03 2007
@@ -1,16 +1,11 @@
 #!/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/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := glib
-
-# Members list of Debian GNOME Maintainers
-TEAM_LIST ?= /usr/share/gnome-pkg-tools/pkg-gnome.team
-
-# Remove maintainer from uploaders list
-maintainer := $(shell sed -n 's/^Maintainer: //p' debian/control.in)
-uploaders := $(shell grep -vF '$(maintainer)' $(TEAM_LIST))
 
 STAMP_DIR := debian/stampdir
 
@@ -150,7 +145,7 @@
 		-e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
 		-e "s#@DOC_PKG@#$(DOC_PKG)#g" \
 		-e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \
-		-e "s#@GNOME_TEAM@#$(uploaders)#g" \
+		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
 		$@.in > $@
 
 clean: debian/control