r4052 - trunk/linux-2.6/debian

[Simon Horman]

Author: horms
Date: 2005-08-25 04:31:42 +0000 (Thu, 25 Aug 2005)
New Revision: 4052

Modified:
   trunk/linux-2.6/debian/changelog
   trunk/linux-2.6/debian/rules.real
Log:
Set versions in apply and unapply scripts

Modified: trunk/linux-2.6/debian/changelog
===================================================================
--- trunk/linux-2.6/debian/changelog	2005-08-24 18:02:00 UTC (rev 4051)
+++ trunk/linux-2.6/debian/changelog	2005-08-25 04:31:42 UTC (rev 4052)
@@ -17,8 +17,9 @@
   * net-sockglue-cap.patch
     [Security] Restrict socket policy loading to CAP_NET_ADMIN.
     See CAN-2005-2555.
+  * Set versions in apply and unapply scripts (closes: #324583)
 
- -- Simon Horman <horms at debian.org>  Mon, 22 Aug 2005 15:04:40 +0900
+ -- Simon Horman <horms at debian.org>  Thu, 25 Aug 2005 13:28:13 +0900
 
 linux-2.6 (2.6.12-5) unstable; urgency=low
 

Modified: trunk/linux-2.6/debian/rules.real
===================================================================
--- trunk/linux-2.6/debian/rules.real	2005-08-24 18:02:00 UTC (rev 4051)
+++ trunk/linux-2.6/debian/rules.real	2005-08-25 04:31:42 UTC (rev 4052)
@@ -262,8 +262,8 @@
 	dh_installdirs $(DH_OPTIONS) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
 	dh_install $(DH_OPTIONS) debian/patches-debian/* $(pbase)/debian
 #	Install the debian patches
-	sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
-	sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+	sed 's/@version@/$(SOURCE_VERSION)/g' debian/bin/apply > $(pfull)/apply/debian
+	sed 's/@upstream@/$(VERSION)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
 	chmod 755 $(pfull)/apply/debian $(pfull)/unpatch/debian
 	chmod 644 $(pfull)/debian/*.patch
 	bzip2 -9 $(pfull)/debian/*.patch