[Pkg-xen-changes] r465 - trunk/xen-3/debian

[Bastian Blank]

Author: waldi
Date: Mon Oct 15 22:04:24 2007
New Revision: 465

Log:
* debian/rules: Update orig code from linux-2.6.
* debian/rules.defs: Remove unused definition.


Modified:
   trunk/xen-3/debian/rules
   trunk/xen-3/debian/rules.defs

Modified: trunk/xen-3/debian/rules
==============================================================================
--- trunk/xen-3/debian/rules	(original)
+++ trunk/xen-3/debian/rules	Mon Oct 15 22:04:24 2007
@@ -6,7 +6,9 @@
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-VERSION := $(shell dpkg-parsechangelog | perl -ne '/^Version:\s+(\S+)-[^-]+$$/ && print $$1;')
+SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
+VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
+VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,-[^-]*$$,,')
 
 include debian/rules.defs
 
@@ -44,10 +46,20 @@
 
 binary:	binary-indep binary-arch
 
-DIR_ORIG = ../orig/xen-$(MAJOR)-$(VERSION)
+DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
+TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)
-	rsync --delete --exclude debian --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+	rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+
+$(DIR_ORIG):
+ifeq ($(TAR_ORIG),)
+	$(error Cannot find orig tarball $(TAR_ORIG_NAME))
+else
+	mkdir -p ../orig
+	tar -C ../orig -xzf $(TAR_ORIG)
+endif
 
 CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*) 
 CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines)

Modified: trunk/xen-3/debian/rules.defs
==============================================================================
--- trunk/xen-3/debian/rules.defs	(original)
+++ trunk/xen-3/debian/rules.defs	Mon Oct 15 22:04:24 2007
@@ -1,5 +1,4 @@
 KERNELVERSION := 2.6.22-2
-MAJOR := 3
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates