[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 6e1f12cba637e40954fc5f1f85e02d0bde2a8d96
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Aug 11 20:57:15 2012 +0200

    Rebased patch queue

diff --git a/debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch
similarity index 95%
rename from debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch
index 31a3a52..66ae4a3 100644
--- a/debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch
@@ -9,7 +9,7 @@ The supermin appliance files are not installed to the multiarch lib directory.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 5958997..e87f67c 100644
+index f106921..bf79834 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
 @@ -29,8 +29,8 @@ EXTRA_DIST = \
@@ -24,7 +24,7 @@ index 5958997..e87f67c 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 30e5070..cda57e0 100644
+index 130519d..2099b16 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -161,7 +161,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
diff --git a/debian/patches/0007-podwrapper.sh-Use-date-from-ChangeLog.patch b/debian/patches/0007-podwrapper.sh-Use-date-from-ChangeLog.patch
deleted file mode 100644
index ad9cb83..0000000
--- a/debian/patches/0007-podwrapper.sh-Use-date-from-ChangeLog.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 d806aa0..504bfd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
 0004-out-of-tree-build-fix-building-Perl-bindings.patch
 0005-out-of-tree-build-daemon.patch
 0006-ruby-install-to-vendor_ruby.patch
-0007-podwrapper.sh-Use-date-from-ChangeLog.patch
-0008-Fix-guestfs-supermin-appliance-path.patch
+0007-Fix-guestfs-supermin-appliance-path.patch

-- 
Libguestfs Debian packaging