r3790 - in trunk/kernel/source/linux-2.6: . debian debian/templates

[Bastian Blank]

Author: waldi
Date: 2005-08-09 11:53:21 +0000 (Tue, 09 Aug 2005)
New Revision: 3790

Modified:
   trunk/kernel/source/linux-2.6/
   trunk/kernel/source/linux-2.6/debian/changelog
   trunk/kernel/source/linux-2.6/debian/rules
   trunk/kernel/source/linux-2.6/debian/templates/control.source.in
Log:
r3781: waldi | 2005-08-09 09:09:10 +0000
debian/rules: Use md5sum to check for changed input files in debian/control
build.

r3782: waldi | 2005-08-09 09:13:12 +0000
* debian/changelog: Prepare to release (2.6.12-2).
* debian/templates/control.source.in: Add myself to Uploaders.



Property changes on: trunk/kernel/source/linux-2.6
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6-merge-9224:3776
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6-merge-9224:3776

Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog	2005-08-09 11:52:26 UTC (rev 3789)
+++ trunk/kernel/source/linux-2.6/debian/changelog	2005-08-09 11:53:21 UTC (rev 3790)
@@ -11,6 +11,8 @@
     will be enabled.
     Closes: #321885
 
+  * Link palinfo statically on ia64. (dann frazier) (Closes: #321885)
+
  -- Simon Horman <horms at debian.org>  Tue,  9 Aug 2005 11:00:51 +0900
 
 linux-2.6 (2.6.12-2) unstable; urgency=low
@@ -70,9 +72,7 @@
 
   * Added list of flavours built to common header package. (Sven Luther)
 
-  * Link palinfo statically on ia64. (dann frazier) (Closes: #321885)
-
- -- Andres Salomon <dilinger at debian.org>  Mon, 08 Aug 2005 20:15:58 -0400
+ -- Bastian Blank <waldi at debian.org>  Tue, 09 Aug 2005 11:12:40 +0200
  
 linux-2.6 (2.6.12-1) unstable; urgency=low
 

Modified: trunk/kernel/source/linux-2.6/debian/rules
===================================================================
--- trunk/kernel/source/linux-2.6/debian/rules	2005-08-09 11:52:26 UTC (rev 3789)
+++ trunk/kernel/source/linux-2.6/debian/rules	2005-08-09 11:53:21 UTC (rev 3790)
@@ -229,7 +229,17 @@
 # variable values into the template.
 #
 debian/control: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
+	if [ -f debian/control.md5sum ]; then \
+		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
+			$(MAKE) -f debian/rules debian/control-real; \
+		fi \
+	else \
+		$(MAKE) -f debian/rules debian/control-real; \
+	fi
+
+debian/control-real: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
 	debian/bin/gencontrol.py
+	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure
 	@echo that it is NEVER run during the automated build. Please

Modified: trunk/kernel/source/linux-2.6/debian/templates/control.source.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-09 11:52:26 UTC (rev 3789)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.source.in	2005-08-09 11:53:21 UTC (rev 3790)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Andres Salomon <dilinger at debian.org>
+Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>
 Standards-Version: 3.6.1.0
 Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)