Bug#324583: compiling 2.6.12 with the debian patch

[Horms <horms@debian.org>]

tag 324583 +pending
tag 324583 +patch
thanks

Hi,

I have put the attched patch into SVN which should resolve this problem.
It should appear in the next relase, likely 2.6.12-6

Thanks


Index: debian/rules.real
===================================================================
--- debian/rules.real	(revision 4051)
+++ debian/rules.real	(working copy)
@@ -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