[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.13-1
Hilko Bengen
bengen at debian.org
Sat Mar 31 13:50:42 UTC 2012
The following commit has been merged in the master branch:
commit 007ca10599d983f9be9f46412cfb0772dd5112f0
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Mar 31 14:11:00 2012 +0200
Rebased patch queue
diff --git a/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
index 199ac61..53fc746 100644
--- a/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
+++ b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
@@ -5,7 +5,7 @@ Subject: Disable fuse tests if /dev/fuse doesn't exist
e.g. when running in a chroot.
---
fuse/test-fuse.sh | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
index 517222a..431ac28 100755
diff --git a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch b/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
index 613edff..0034b34 100644
--- a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+++ b/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
@@ -5,10 +5,10 @@ Subject: Mount /run as tmpfs inside appliance (workaround for febootstrap's
---
appliance/init | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
diff --git a/appliance/init b/appliance/init
-index 77d0281..a29353d 100755
+index f44ad7b..0c0ad76 100755
--- a/appliance/init
+++ b/appliance/init
@@ -16,6 +16,9 @@ rm -f /proc; mkdir /proc
diff --git a/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
index 2095d3f..c40a977 100644
--- a/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
+++ b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
@@ -4,13 +4,13 @@ Subject: configure.ac: do not generate debian/changelog
---
configure.ac | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index bb85961..35d888a 100644
+index 09daf99..9e55043 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1100,7 +1100,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1129,7 +1129,6 @@ AC_CONFIG_FILES([Makefile
clone/Makefile
csharp/Makefile
daemon/Makefile
diff --git a/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
index c555d8e..0b14528 100644
--- a/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
+++ b/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
@@ -4,7 +4,7 @@ Subject: Fix for systemd-based Debian systems
---
appliance/make.sh.in | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index 0335f6e..d541227 100755
diff --git a/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
index a136663..3a52df7 100644
--- a/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
+++ b/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
@@ -4,7 +4,7 @@ Subject: out-of-tree build: fix building Perl bindings
---
perl/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 404a4e9..253d990 100644
diff --git a/debian/patches/0006-out-of-tree-build-daemon.patch b/debian/patches/0006-out-of-tree-build-daemon.patch
index 84a728f..90c528a 100644
--- a/debian/patches/0006-out-of-tree-build-daemon.patch
+++ b/debian/patches/0006-out-of-tree-build-daemon.patch
@@ -4,7 +4,7 @@ Subject: out-of-tree build: daemon
---
daemon/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3a698cc..0c905d0 100644
diff --git a/debian/patches/0007-ruby-install-to-vendor_ruby.patch b/debian/patches/0007-ruby-install-to-vendor_ruby.patch
index 2fbf425..40978ea 100644
--- a/debian/patches/0007-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0007-ruby-install-to-vendor_ruby.patch
@@ -4,7 +4,7 @@ Subject: ruby: install to vendor_ruby.
---
ruby/Makefile.am | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index c4b680f..db6ec9e 100644
diff --git a/debian/patches/0008-Fix-out-of-tree-build-for-Java-bindings.patch b/debian/patches/0008-Fix-out-of-tree-build-for-Java-bindings.patch
deleted file mode 100644
index 11aea86..0000000
--- a/debian/patches/0008-Fix-out-of-tree-build-for-Java-bindings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 27 Mar 2012 13:32:27 +0200
-Subject: Fix out-of-tree build for Java bindings
-
----
- java/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/java/Makefile.am b/java/Makefile.am
-index c753672..a01f100 100644
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -58,7 +58,7 @@ libguestfs_jardir = $(JAR_INSTALL_DIR)
- libguestfs_jar_DATA = libguestfs-${VERSION}.jar
- libguestfs_jar_class_files = $(java_sources:.java=.class)
- $(libguestfs_jar_class_files): %.class: %.java
-- $(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath @srcdir@:$(builddir) -sourcepath @srcdir@:$(builddir) $<
-+ $(JAVAC) $(JAVAC_FLAGS) -d @builddir@ -classpath @srcdir@:@builddir@ @srcdir@/$<
-
- libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
- $(JAR) cf $@ $^
diff --git a/debian/patches/0010-autoreconf.patch b/debian/patches/0008-autoreconf.patch
similarity index 96%
rename from debian/patches/0010-autoreconf.patch
rename to debian/patches/0008-autoreconf.patch
index 7767686..5fffc93 100644
--- a/debian/patches/0010-autoreconf.patch
+++ b/debian/patches/0008-autoreconf.patch
@@ -4,17 +4,15 @@ Subject: autoreconf
---
Makefile.in | 5 +-
- aclocal.m4 | 14 ++--
- appliance/Makefile.in | 2 +-
+ aclocal.m4 | 14 +--
build-aux/config.guess | 222 ++++++++++++++++++++++++++----------------------
- build-aux/config.sub | 159 +++++++++++++++++++++++-----------
- configure | 54 ++++++++-----
+ build-aux/config.sub | 159 ++++++++++++++++++++++------------
+ configure | 54 +++++++-----
daemon/Makefile.in | 4 +-
- java/Makefile.in | 2 +-
perl/Makefile.in | 1 +
po/POTFILES.in | 6 --
- ruby/Makefile.in | 12 ++--
- 11 files changed, 280 insertions(+), 201 deletions(-)
+ ruby/Makefile.in | 12 +--
+ 9 files changed, 278 insertions(+), 199 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 05f34ce..aeb2b32 100644
@@ -100,19 +98,6 @@ index 48e6b4c..3997cbb 100644
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-diff --git a/appliance/Makefile.in b/appliance/Makefile.in
-index ee571dc..7c927b0 100644
---- a/appliance/Makefile.in
-+++ b/appliance/Makefile.in
-@@ -1562,7 +1562,7 @@ supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions
- rm -rf tmp
- mkdir -p tmp$(DAEMON_SUPERMIN_DIR) tmp/etc
- ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd
-- ln guestfsd.suppressions tmp/etc/guestfsd.suppressions
-+ ln @srcdir@/guestfsd.suppressions tmp/etc/guestfsd.suppressions
- ( cd tmp && find | cpio --quiet -o -H newc ) > $@-t
- rm -rf tmp
- mv $@-t $@
diff --git a/build-aux/config.guess b/build-aux/config.guess
index dc84c68..40eaed4 100755
--- a/build-aux/config.guess
@@ -983,7 +968,7 @@ index 2a55a50..30fdca8 100755
;;
*-wec)
diff --git a/configure b/configure
-index fe903fa..e122acc 100755
+index fc8c4a3..8a64f91 100755
--- a/configure
+++ b/configure
@@ -45934,6 +45934,7 @@ fi
@@ -1234,7 +1219,7 @@ index fe903fa..e122acc 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
-@@ -52244,7 +52259,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -52246,7 +52261,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -1243,7 +1228,7 @@ index fe903fa..e122acc 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -53472,7 +53487,6 @@ do
+@@ -53474,7 +53489,6 @@ do
"clone/Makefile") CONFIG_FILES="$CONFIG_FILES clone/Makefile" ;;
"csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
"daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
@@ -1268,19 +1253,6 @@ index dc7b15d..1099422 100644
rm -f $@
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
-diff --git a/java/Makefile.in b/java/Makefile.in
-index d9d6854..633ead1 100644
---- a/java/Makefile.in
-+++ b/java/Makefile.in
-@@ -1861,7 +1861,7 @@ appliance: force
- # Old RHEL 5 autoconf doesn't have builddir.
- builddir ?= $(top_builddir)/java
- @HAVE_JAVA_TRUE@$(libguestfs_jar_class_files): %.class: %.java
-- at HAVE_JAVA_TRUE@ $(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath @srcdir@:$(builddir) -sourcepath @srcdir@:$(builddir) $<
-+ at HAVE_JAVA_TRUE@ $(JAVAC) $(JAVAC_FLAGS) -d @builddir@ -classpath @srcdir@:@builddir@ @srcdir@/$<
-
- @HAVE_JAVA_TRUE at libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
- @HAVE_JAVA_TRUE@ $(JAR) cf $@ $^
diff --git a/perl/Makefile.in b/perl/Makefile.in
index 8bcea62..b54b6db 100644
--- a/perl/Makefile.in
diff --git a/debian/patches/0009-Fix-for-building-appliance-out-of-tree.patch b/debian/patches/0009-Fix-for-building-appliance-out-of-tree.patch
deleted file mode 100644
index 9730489..0000000
--- a/debian/patches/0009-Fix-for-building-appliance-out-of-tree.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 27 Mar 2012 19:36:54 +0200
-Subject: Fix for building appliance out-of-tree
-
----
- appliance/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 5114275..6d256c4 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -71,7 +71,7 @@ supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions
- rm -rf tmp
- mkdir -p tmp$(DAEMON_SUPERMIN_DIR) tmp/etc
- ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd
-- ln guestfsd.suppressions tmp/etc/guestfsd.suppressions
-+ ln @srcdir@/guestfsd.suppressions tmp/etc/guestfsd.suppressions
- ( cd tmp && find | cpio --quiet -o -H newc ) > $@-t
- rm -rf tmp
- mv $@-t $@
diff --git a/debian/patches/series b/debian/patches/series
index 20863ef..ca2e2b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,4 @@
0005-out-of-tree-build-fix-building-Perl-bindings.patch
0006-out-of-tree-build-daemon.patch
0007-ruby-install-to-vendor_ruby.patch
-0008-Fix-out-of-tree-build-for-Java-bindings.patch
-0009-Fix-for-building-appliance-out-of-tree.patch
-0010-autoreconf.patch
+0008-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list