r22417 - in /tools/gnome-pkg-tools: 1/rules/uploaders.mk control.header debian/changelog debian/control debian/gnome-pkg-tools.install debian/rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov 21 10:51:59 2009
New Revision: 22417

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22417
Log:
* uploaders.mk: add a comment at the top of debian/control explaining 
  that the file is autogenerated.
* control.header: add a file containing the default header. It can be 
  overriden by the CONTROL_HEADER make variable.

Added:
    tools/gnome-pkg-tools/control.header
Modified:
    tools/gnome-pkg-tools/1/rules/uploaders.mk
    tools/gnome-pkg-tools/debian/changelog
    tools/gnome-pkg-tools/debian/control
    tools/gnome-pkg-tools/debian/gnome-pkg-tools.install
    tools/gnome-pkg-tools/debian/rules

Modified: tools/gnome-pkg-tools/1/rules/uploaders.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/uploaders.mk?rev=22417&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/uploaders.mk [utf-8] (original)
+++ tools/gnome-pkg-tools/1/rules/uploaders.mk [utf-8] Sat Nov 21 10:51:59 2009
@@ -21,9 +21,12 @@
 UPLOADERS ?= $(shell (echo "$(ALWAYS_UPLOADS)"; sed 's/,//' $(TEAM_LIST); $(GET_RECENT_UPLOADERS_CMD)) | grep -vF "`$(GET_MAINTAINER_CMD)`" | sort | uniq -d | sed '$$,$$! s/$$/,/')
 # backward compatibility
 uploaders := $(UPLOADERS)
+# Header for debian/control (warning to not modify it directly)
+CONTROL_HEADER ?= /usr/share/gnome-pkg-tools/control.header
 
 ifeq ($(DISABLE_UPDATE_UPLOADERS),)
 clean::
-	sed "s/@GNOME_TEAM@/$(UPLOADERS)/" \
-		debian/control.in > debian/control
+	{ cat $(CONTROL_HEADER) ; \
+	  sed "s/@GNOME_TEAM@/$(UPLOADERS)/" debian/control.in ; } \
+	> debian/control
 endif

Added: tools/gnome-pkg-tools/control.header
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/control.header?rev=22417&op=file
==============================================================================
--- tools/gnome-pkg-tools/control.header (added)
+++ tools/gnome-pkg-tools/control.header [utf-8] Sat Nov 21 10:51:59 2009
@@ -1,0 +1,5 @@
+# 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.
+

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=22417&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/changelog [utf-8] Sat Nov 21 10:51:59 2009
@@ -1,3 +1,12 @@
+gnome-pkg-tools (0.16) unstable; urgency=low
+
+  * uploaders.mk: add a comment at the top of debian/control explaining 
+    that the file is autogenerated.
+  * control.header: add a file containing the default header. It can be 
+    overriden by the CONTROL_HEADER make variable.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 21 Nov 2009 11:47:41 +0100
+
 gnome-pkg-tools (0.15.2) unstable; urgency=low
 
   [ Andreas Henriksson ]

Modified: tools/gnome-pkg-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/control?rev=22417&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/control [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/control [utf-8] Sat Nov 21 10:51:59 2009
@@ -1,8 +1,13 @@
+# 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: gnome-pkg-tools
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>, Kilian Krause <kilian at debian.org>, Laurent Bigonville <bigon at debian.org>, Loic Minier <lool at dooz.org>, Loïc Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Julian Andres Klode <jak at debian.org>, Kilian Krause <kilian at debian.org>, Laurent Bigonville <bigon at debian.org>, Loic Minier <lool at dooz.org>, Loïc Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5)
 Build-Depends-Indep: xmlto

Modified: tools/gnome-pkg-tools/debian/gnome-pkg-tools.install
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/gnome-pkg-tools.install?rev=22417&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/gnome-pkg-tools.install [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/gnome-pkg-tools.install [utf-8] Sat Nov 21 10:51:59 2009
@@ -1,4 +1,5 @@
 pkg-gnome.team                  usr/share/gnome-pkg-tools/
 1                               usr/share/gnome-pkg-tools/
+control.header                  usr/share/gnome-pkg-tools/
 gnome-dupload                   usr/bin/
 desktop-check-mime-types        usr/bin/

Modified: tools/gnome-pkg-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/rules?rev=22417&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/rules [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/rules [utf-8] Sat Nov 21 10:51:59 2009
@@ -4,6 +4,7 @@
 
 # Use local copies to generate Uploaders: field
 TEAM_LIST := ./pkg-gnome.team
+CONTROL_HEADER := ./control.header
 include ./1/rules/uploaders.mk
 
 # check for missing trailing comma or superfluous comma (on last line)