[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.20.4-1-6-gd1ea0ec

Hilko Bengen bengen at debian.org
Wed Apr 17 07:28:45 UTC 2013 

The following commit has been merged in the master branch:
commit 98cd95ebd581a62c493a6749d04027e72aaa4f51
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Apr 11 21:06:16 2013 +0200

    Dropped patches that have been integrated upstream

diff --git a/debian/patches/0002-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
similarity index 85%
rename from debian/patches/0002-Fix-for-systemd-based-Debian-systems.patch
rename to debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
index 0b14528..09a1546 100644
--- a/debian/patches/0002-Fix-for-systemd-based-Debian-systems.patch
+++ b/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
@@ -7,10 +7,10 @@ Subject: Fix for systemd-based Debian systems
  1 file changed, 3 insertions(+)
 
 diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index 0335f6e..d541227 100755
+index 50c60f1..e198b05 100755
 --- a/appliance/make.sh.in
 +++ b/appliance/make.sh.in
-@@ -63,4 +63,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
+@@ -65,4 +65,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
      echo "/usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles-t
  fi
  
diff --git a/debian/patches/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch b/debian/patches/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
deleted file mode 100644
index 21778f3..0000000
--- a/debian/patches/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 3 Jul 2011 12:47:23 +0200
-Subject: Mount /run as tmpfs inside appliance (workaround for febootstrap's
- /init)
-
----
- appliance/init |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/appliance/init b/appliance/init
-index bbfd092..6259c45 100755
---- a/appliance/init
-+++ b/appliance/init
-@@ -18,6 +18,9 @@ mount -t proc /proc /proc
- if [ ! -d /sys ]; then rm -f /sys; fi
- mkdir -p /sys
- mount -t sysfs /sys /sys
-+# taken from initramfs-tools/init --Hilko Bengen
-+mkdir -p /run
-+mount -t tmpfs -o "nosuid,size=20%,mode=0755" tmpfs /run
- mkdir -p /run/lock
- 
- # devtmpfs is required since udev 176
diff --git a/debian/patches/0003-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch
similarity index 88%
rename from debian/patches/0003-out-of-tree-build-fix-building-Perl-bindings.patch
rename to debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch
index 3a52df7..5042c0c 100644
--- a/debian/patches/0003-out-of-tree-build-fix-building-Perl-bindings.patch
+++ b/debian/patches/0002-out-of-tree-build-fix-building-Perl-bindings.patch
@@ -7,10 +7,10 @@ Subject: out-of-tree build: fix building Perl bindings
  1 file changed, 1 insertion(+)
 
 diff --git a/perl/Makefile.am b/perl/Makefile.am
-index 404a4e9..253d990 100644
+index b0f9b5c..55466ec 100644
 --- a/perl/Makefile.am
 +++ b/perl/Makefile.am
-@@ -65,6 +65,7 @@ all: Makefile-pl src_deps
+@@ -64,6 +64,7 @@ all: Makefile-pl src_deps
  	$(MAKE) -f Makefile-pl
  
  Makefile-pl: Makefile.PL
diff --git a/debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0003-Fix-guestfs-supermin-appliance-path.patch
similarity index 90%
rename from debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0003-Fix-guestfs-supermin-appliance-path.patch
index 723e32d..cdb5b13 100644
--- a/debian/patches/0005-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0003-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 19f01dc..169ea15 100644
+index 9c85c69..7a30b0e 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
 @@ -30,8 +30,8 @@ EXTRA_DIST = \
@@ -24,10 +24,10 @@ index 19f01dc..169ea15 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 401b076..43ad424 100644
+index 3473b01..9c480d6 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -116,7 +116,7 @@ libguestfs_la_SOURCES = \
+@@ -117,7 +117,7 @@ libguestfs_la_SOURCES = \
  	libguestfs.syms
  
  libguestfs_la_CPPFLAGS = \
diff --git a/debian/patches/0004-ruby-install-to-vendor_ruby.patch b/debian/patches/0004-ruby-install-to-vendor_ruby.patch
deleted file mode 100644
index b617d8d..0000000
--- a/debian/patches/0004-ruby-install-to-vendor_ruby.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 17 Nov 2011 23:56:15 +0100
-Subject: ruby: install to vendor_ruby.
-
----
- ruby/Makefile.am |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index 5b755e5..3fbc9c9 100644
---- a/ruby/Makefile.am
-+++ b/ruby/Makefile.am
-@@ -51,14 +51,14 @@ all: $(generator_built)
- 	$(RAKE) build
- 	$(RAKE) rdoc
- 
--RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
--RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
-+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
-+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
- 
- install:
--	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
--	$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
--	$(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
--	$(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
-+	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
-+	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
-+	$(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB)
-+	$(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
- 
- TESTS = run-bindtests run-ruby-tests
- 
diff --git a/debian/patches/0006-erlang-Install-to-correct-directory.patch b/debian/patches/0006-erlang-Install-to-correct-directory.patch
deleted file mode 100644
index b768a43..0000000
--- a/debian/patches/0006-erlang-Install-to-correct-directory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Mon, 24 Dec 2012 09:25:03 +0100
-Subject: erlang: Install to correct directory
-
----
- erlang/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/erlang/Makefile.am b/erlang/Makefile.am
-index c7a52a9..a2c978f 100644
---- a/erlang/Makefile.am
-+++ b/erlang/Makefile.am
-@@ -30,7 +30,7 @@ EXTRA_DIST = \
- 
- if HAVE_ERLANG
- 
--erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
-+erlang_bindir = $(prefix)/lib/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
- 
- erlang_bin_DATA = guestfs.beam
- 
diff --git a/debian/patches/series b/debian/patches/series
index 0a7b7eb..e10a9ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
-0002-Fix-for-systemd-based-Debian-systems.patch
-0003-out-of-tree-build-fix-building-Perl-bindings.patch
-0004-ruby-install-to-vendor_ruby.patch
-0005-Fix-guestfs-supermin-appliance-path.patch
-0006-erlang-Install-to-correct-directory.patch
+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

-- 
Libguestfs Debian packaging

More information about the Pkg-libvirt-commits mailing list