[Pkg-xen-changes] r1164 - trunk/xen/debian

[Bastian Blank]

Author: waldi
Date: Sun May 12 13:05:09 2013
New Revision: 1164

Log:
debian/rules, debian/rules.real: Use dpkg-provided makefile snippets.

Modified:
   trunk/xen/debian/rules
   trunk/xen/debian/rules.real

Modified: trunk/xen/debian/rules
==============================================================================
--- trunk/xen/debian/rules	Sat May 11 22:21:35 2013	(r1163)
+++ trunk/xen/debian/rules	Sun May 12 13:05:09 2013	(r1164)
@@ -3,13 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+include /usr/share/dpkg/default.mk
 
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
-VERSION_UPSTREAM := $(shell echo "$(VERSION)" | sed -e 's,-[^-]*$$,,')
-VERSION_BINNMU := $(shell echo "$(VERSION)" | sed -ne 's,.*\+b\(.*\)$$,\1,p')
+VERSION_BINNMU := $(shell echo "$(DEB_VERSION)" | sed -ne 's,.*\+b\(.*\)$$,\1,p')
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
@@ -51,10 +48,10 @@
 
 binary:	binary-indep binary-arch
 
-DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
-TAR_ORIG_MAIN_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.gz
+DIR_ORIG = ../orig/$(SOURCE)-$(DEB_VERSION_EPOCH_UPSTREAM)
+TAR_ORIG_MAIN_NAME = $(SOURCE)_$(DEB_VERSION_EPOCH_UPSTREAM).orig.tar.gz
 TAR_ORIG_MAIN = $(firstword $(wildcard ../$(TAR_ORIG_MAIN_NAME)) $(wildcard ../orig/$(TAR_ORIG_MAIN_NAME)))
-TAR_ORIG_QEMU_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig-qemu.tar.gz
+TAR_ORIG_QEMU_NAME = $(SOURCE)_$(DEB_VERSION_EPOCH_UPSTREAM).orig-qemu.tar.gz
 TAR_ORIG_QEMU = $(firstword $(wildcard ../$(TAR_ORIG_QEMU_NAME)) $(wildcard ../orig/$(TAR_ORIG_QEMU_NAME)))
 
 orig: $(DIR_ORIG)

Modified: trunk/xen/debian/rules.real
==============================================================================
--- trunk/xen/debian/rules.real	Sat May 11 22:21:35 2013	(r1163)
+++ trunk/xen/debian/rules.real	Sun May 12 13:05:09 2013	(r1164)
@@ -1,9 +1,6 @@
+include /usr/share/dpkg/default.mk
 include /usr/share/ocaml/ocamlvars.mk
 
-DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
-
 export DH_OPTIONS
 
 setup_env := env -u ARCH -u FLAVOUR -u VERSION -u MAKEFLAGS