[kernel] r8128 - dists/sid/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Fri Jan  5 19:45:27 2007
New Revision: 8128

Modified:
   dists/sid/linux-2.6/debian/rules
Log:
debian/rules: Also extract the source package name from the changelog.


Modified: dists/sid/linux-2.6/debian/rules
==============================================================================
--- dists/sid/linux-2.6/debian/rules	(original)
+++ dists/sid/linux-2.6/debian/rules	Fri Jan  5 19:45:27 2007
@@ -5,9 +5,8 @@
 SHELL    := sh -e
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
-MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
+SOURCE   := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
+VERSION  := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)-[^-]*$$,\1,p')
 
 include debian/rules.defs
 
@@ -36,8 +35,8 @@
 $(BUILD_DIR) $(STAMPS_DIR):
 	@[ -d $@ ] || mkdir $@
 
-DIR_ORIG = ../orig/linux-$(MAJOR)-$(VERSION)
-TAR_ORIG = ../linux-$(MAJOR)_$(VERSION).orig.tar.gz
+DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
+TAR_ORIG = ../$(SOURCE)_$(VERSION).orig.tar.gz
 
 orig: $(DIR_ORIG)
 	rsync --delete --exclude debian --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .