[Pkg-xen-changes] r513 - in trunk/xen-common/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sat Jan 26 23:14:54 2008
New Revision: 513

Log:
* debian/changelog: Update.
* debian/patches/network-bridge.dpatch: Fix.
* debian/rules: Use supplied makefile to build manpages.


Modified:
   trunk/xen-common/debian/changelog
   trunk/xen-common/debian/patches/network-bridge.dpatch
   trunk/xen-common/debian/rules

Modified: trunk/xen-common/debian/changelog
==============================================================================
--- trunk/xen-common/debian/changelog	(original)
+++ trunk/xen-common/debian/changelog	Sat Jan 26 23:14:54 2008
@@ -1,3 +1,9 @@
+xen-common (3.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 26 Jan 2008 22:56:00 +0000
+
 xen-common (3.1.0-1) unstable; urgency=low
 
   [ Julien Danjou ]

Modified: trunk/xen-common/debian/patches/network-bridge.dpatch
==============================================================================
--- trunk/xen-common/debian/patches/network-bridge.dpatch	(original)
+++ trunk/xen-common/debian/patches/network-bridge.dpatch	Sat Jan 26 23:14:54 2008
@@ -14,6 +14,6 @@
  
 +modprobe netloop > /dev/null 2>&1 || true
 +
- vifnum=${vifnum:-$(ip route list | awk '/^default / { print $NF }' | sed 's/^[^0-9]*//')}
- vifnum=${vifnum:-0}
- bridge=${bridge:-xenbr${vifnum}}
+ is_network_root () {
+     local rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' /etc/mtab)
+     local rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)

Modified: trunk/xen-common/debian/rules
==============================================================================
--- trunk/xen-common/debian/rules	(original)
+++ trunk/xen-common/debian/rules	Sat Jan 26 23:14:54 2008
@@ -22,16 +22,8 @@
 	dpatch -d $(BUILD_DIR) apply-all
 	touch $@
 
-define build_man
-	mkdir -p $(BUILD_DIR)/docs/out
-	pod2man --release=$(VERSION) --name=$(3) -s $(4) -c Xen $(BUILD_DIR)/docs/man/$(1) $(BUILD_DIR)/docs/out/$(2)
-endef
-
 build: $(STAMPS_DIR)/source
-	mkdir -p $(BUILD_DIR)/docs/man
-	$(call build_man,xend-config.sxp.pod.5,xend-config.sxp.5,xend-config.sxp,5)
-	$(call build_man,xmdomain.cfg.pod.5,xmdomain.cfg.5,xmdomain.cfg,5)
-	$(call build_man,xm.pod.1,xm.1,xm,1)
+	make -C $(BUILD_DIR)/docs man-pages
 
 clean:
 	dh_testdir
@@ -80,7 +72,7 @@
 	dh_installexamples
 	dh_installinit -p xen-utils-common --name xend --no-restart-on-upgrade -- defaults 20 21
 	dh_installinit -p xen-utils-common --name xendomains --no-start -- defaults 21 20
-	dh_installman $(BUILD_DIR)/docs/man/*
+	dh_installman $(BUILD_DIR)/docs/man1/* $(BUILD_DIR)/docs/man5/*
 	dh_link
 	dh_strip
 	dh_compress
@@ -94,4 +86,4 @@
 binary-arch:
 
 binary: build binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install #PHONY_CONFIGURE#
+.PHONY: build clean binary-indep binary-arch binary install