[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Hilko Bengen]

The following commit has been merged in the experimental branch:
commit b5cf7106e104df146d8418b6a6fd6dec6eec2a3a
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed May 1 13:05:11 2013 +0200

    Dropped patch for building the Perl bindings out-of-tree: A different solution has been adopted upstream

diff --git a/debian/patches/0003-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
similarity index 90%
rename from debian/patches/0003-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
index cdb5b13..ca5346a 100644
--- a/debian/patches/0003-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0002-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 9c85c69..7a30b0e 100644
+index 90df421..c3b140d 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
 @@ -30,8 +30,8 @@ EXTRA_DIST = \
@@ -24,10 +24,10 @@ index 9c85c69..7a30b0e 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3473b01..9c480d6 100644
+index 1aa028f..43c1186 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -117,7 +117,7 @@ libguestfs_la_SOURCES = \
+@@ -120,7 +120,7 @@ libguestfs_la_SOURCES = \
  	libguestfs.syms
  
  libguestfs_la_CPPFLAGS = \
diff --git a/debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch
deleted file mode 100644
index 5042c0c..0000000
--- a/debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 13 Aug 2011 22:11:10 +0200
-Subject: out-of-tree build: fix building Perl bindings
-
----
- perl/Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/perl/Makefile.am b/perl/Makefile.am
-index b0f9b5c..55466ec 100644
---- a/perl/Makefile.am
-+++ b/perl/Makefile.am
-@@ -64,6 +64,7 @@ all: Makefile-pl src_deps
- 	$(MAKE) -f Makefile-pl
- 
- Makefile-pl: Makefile.PL
-+	-[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/. $(builddir)/.
- 	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
- 
- # No!  Otherwise it is deleted before the clean-local rule runs.
diff --git a/debian/patches/series b/debian/patches/series
index e10a9ee..0552a51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Fix-for-systemd-based-Debian-systems.patch
-0002-out-of-tree-build-fix-building-Perl-bindings.patch
-0003-Fix-guestfs-supermin-appliance-path.patch
+0002-Fix-guestfs-supermin-appliance-path.patch

-- 
Libguestfs Debian packaging