[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

[Hilko Bengen]

The following commit has been merged in the master branch:
commit f0017a729cf279c65196a51cce6d2d2894818b66
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Jul 9 19:21:50 2012 +0200

    Added change to podwrapper.sh.in to pass a specific date to pod2man which should avoid multiarch co-installability problems (Closes: #680885, #680886)

diff --git a/debian/patches/0008-podwrapper.sh-Use-date-from-ChangeLog.patch b/debian/patches/0008-podwrapper.sh-Use-date-from-ChangeLog.patch
new file mode 100644
index 0000000..ad9cb83
--- /dev/null
+++ b/debian/patches/0008-podwrapper.sh-Use-date-from-ChangeLog.patch
@@ -0,0 +1,30 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Mon, 9 Jul 2012 19:18:17 +0200
+Subject: podwrapper.sh: Use date from ChangeLog
+
+---
+ podwrapper.sh.in |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/podwrapper.sh.in b/podwrapper.sh.in
+index ec750f1..0a84d13 100755
+--- a/podwrapper.sh.in
++++ b/podwrapper.sh.in
+@@ -53,6 +53,9 @@ if [ -z "$abs_top_builddir" ]; then
+     exit 1
+ fi
+ 
++DATE=`awk '/^[0-9]+-[0-9]+-[0-9]+/ { print $1; exit }' \
++        $abs_top_srcdir/ChangeLog`
++
+ declare -a inserts
+ declare -a pattern
+ declare -a indent
+@@ -167,6 +170,7 @@ fi
+ # Now generate the final output format(s).
+ if [ -n "$man_output" ]; then
+     "$POD2MAN" "$POD2_STDERR_OPTION" "$POD2_UTF8_OPTION" \
++        --date $DATE \
+         --section "$section" -c "Virtualization Support" --name "$name" \
+         --release "$PACKAGE_NAME-$PACKAGE_VERSION" \
+         < $tmpdir/full.pod > "$man_output".tmp
diff --git a/debian/patches/series b/debian/patches/series
index cd037d0..31f863d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-out-of-tree-build-daemon.patch
 0006-ruby-install-to-vendor_ruby.patch
 0007-autoreconf.patch
+0008-podwrapper.sh-Use-date-from-ChangeLog.patch

-- 
Libguestfs Debian packaging