[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:41 UTC 2012
The following commit has been merged in the master branch:
commit 8b63b645e328c26a0b35af32771794bd7e573b72
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Mar 27 13:39:39 2012 +0200
Rebased patch queue, added out-of-tree build fix for Java and appliance
diff --git a/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch b/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch
deleted file mode 100644
index e1c3ab2..0000000
--- a/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 12 Nov 2011 21:11:26 +0100
-Subject: Install Java bindings to jni subdirectory
-
----
- java/Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/java/Makefile.am b/java/Makefile.am
-index d9db6f4..a13ffa9 100644
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -17,6 +17,8 @@
-
- include $(top_srcdir)/subdir-rules.mk
-
-+libdir = ${prefix}/lib/jni
-+
- # Old RHEL 5 autoconf doesn't have builddir.
- builddir ?= $(top_builddir)/java
-
diff --git a/debian/patches/0008-ruby-install-to-vendor_ruby.patch b/debian/patches/0007-ruby-install-to-vendor_ruby.patch
similarity index 100%
rename from debian/patches/0008-ruby-install-to-vendor_ruby.patch
rename to debian/patches/0007-ruby-install-to-vendor_ruby.patch
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
new file mode 100644
index 0000000..11aea86
--- /dev/null
+++ b/debian/patches/0008-Fix-out-of-tree-build-for-Java-bindings.patch
@@ -0,0 +1,21 @@
+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/0009-Fix-for-building-appliance-out-of-tree.patch b/debian/patches/0009-Fix-for-building-appliance-out-of-tree.patch
new file mode 100644
index 0000000..9730489
--- /dev/null
+++ b/debian/patches/0009-Fix-for-building-appliance-out-of-tree.patch
@@ -0,0 +1,21 @@
+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/0009-autoreconf.patch b/debian/patches/0010-autoreconf.patch
similarity index 93%
rename from debian/patches/0009-autoreconf.patch
rename to debian/patches/0010-autoreconf.patch
index 5befcb7..7767686 100644
--- a/debian/patches/0009-autoreconf.patch
+++ b/debian/patches/0010-autoreconf.patch
@@ -5,6 +5,7 @@ Subject: autoreconf
---
Makefile.in | 5 +-
aclocal.m4 | 14 ++--
+ appliance/Makefile.in | 2 +-
build-aux/config.guess | 222 ++++++++++++++++++++++++++----------------------
build-aux/config.sub | 159 +++++++++++++++++++++++-----------
configure | 54 ++++++++-----
@@ -13,10 +14,10 @@ Subject: autoreconf
perl/Makefile.in | 1 +
po/POTFILES.in | 6 --
ruby/Makefile.in | 12 ++--
- 10 files changed, 279 insertions(+), 200 deletions(-)
+ 11 files changed, 280 insertions(+), 201 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 67ccba1..8bba69c 100644
+index 05f34ce..aeb2b32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -36,7 +37,7 @@ index 67ccba1..8bba69c 100644
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-@@ -1543,8 +1542,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1548,8 +1547,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
run: $(top_builddir)/config.status $(srcdir)/run.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -99,6 +100,19 @@ 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
@@ -969,10 +983,10 @@ index 2a55a50..30fdca8 100755
;;
*-wec)
diff --git a/configure b/configure
-index 39e091c..e620fdb 100755
+index fe903fa..e122acc 100755
--- a/configure
+++ b/configure
-@@ -45929,6 +45929,7 @@ fi
+@@ -45934,6 +45934,7 @@ fi
@@ -980,7 +994,7 @@ index 39e091c..e620fdb 100755
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -46057,6 +46058,7 @@ if test -n "$AUGEAS_CFLAGS"; then
+@@ -46062,6 +46063,7 @@ if test -n "$AUGEAS_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AUGEAS_CFLAGS=`$PKG_CONFIG --cflags "augeas" 2>/dev/null`
@@ -988,7 +1002,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -46073,6 +46075,7 @@ if test -n "$AUGEAS_LIBS"; then
+@@ -46078,6 +46080,7 @@ if test -n "$AUGEAS_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_AUGEAS_LIBS=`$PKG_CONFIG --libs "augeas" 2>/dev/null`
@@ -996,7 +1010,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -46092,9 +46095,9 @@ else
+@@ -46097,9 +46100,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1008,7 +1022,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$AUGEAS_PKG_ERRORS" >&5
-@@ -48766,6 +48769,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -49023,6 +49026,7 @@ if test -n "$PCRE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`
@@ -1016,7 +1030,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -48782,6 +48786,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -49039,6 +49043,7 @@ if test -n "$PCRE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_LIBS=`$PKG_CONFIG --libs "libpcre" 2>/dev/null`
@@ -1024,7 +1038,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -48801,9 +48806,9 @@ else
+@@ -49058,9 +49063,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1036,7 +1050,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -48818,7 +48823,6 @@ installed software in a non-standard prefix.
+@@ -49075,7 +49080,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables PCRE_CFLAGS
and PCRE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -1044,7 +1058,7 @@ index 39e091c..e620fdb 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -48834,7 +48838,6 @@ See the pkg-config man page for more details.
+@@ -49091,7 +49095,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
@@ -1052,7 +1066,7 @@ index 39e091c..e620fdb 100755
else
PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -48913,6 +48916,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -49170,6 +49173,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
@@ -1060,7 +1074,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -48929,6 +48933,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -49186,6 +49190,7 @@ if test -n "$LIBVIRT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
@@ -1068,7 +1082,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -48948,9 +48953,9 @@ else
+@@ -49205,9 +49210,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1080,7 +1094,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -48998,6 +49003,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -49255,6 +49260,7 @@ if test -n "$LIBXML2_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
@@ -1088,7 +1102,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49014,6 +49020,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -49271,6 +49277,7 @@ if test -n "$LIBXML2_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
@@ -1096,7 +1110,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49033,9 +49040,9 @@ else
+@@ -49290,9 +49297,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1108,7 +1122,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -49083,6 +49090,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -49340,6 +49347,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_CFLAGS=`$PKG_CONFIG --cflags "libconfig" 2>/dev/null`
@@ -1116,7 +1130,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49099,6 +49107,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -49356,6 +49364,7 @@ if test -n "$LIBCONFIG_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_LIBS=`$PKG_CONFIG --libs "libconfig" 2>/dev/null`
@@ -1124,7 +1138,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49118,9 +49127,9 @@ else
+@@ -49375,9 +49384,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1136,7 +1150,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -49168,6 +49177,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -49425,6 +49434,7 @@ if test -n "$HIVEX_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_CFLAGS=`$PKG_CONFIG --cflags "hivex" 2>/dev/null`
@@ -1144,7 +1158,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49184,6 +49194,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -49441,6 +49451,7 @@ if test -n "$HIVEX_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_LIBS=`$PKG_CONFIG --libs "hivex" 2>/dev/null`
@@ -1152,7 +1166,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49203,9 +49214,9 @@ else
+@@ -49460,9 +49471,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1164,7 +1178,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -49261,6 +49272,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -49518,6 +49529,7 @@ if test -n "$FUSE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
@@ -1172,7 +1186,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49277,6 +49289,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -49534,6 +49546,7 @@ if test -n "$FUSE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
@@ -1180,7 +1194,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -49296,9 +49309,9 @@ else
+@@ -49553,9 +49566,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1192,7 +1206,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -51750,6 +51763,7 @@ if test -n "$GOBJECT_CFLAGS"; then
+@@ -52007,6 +52020,7 @@ if test -n "$GOBJECT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -1200,7 +1214,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -51766,6 +51780,7 @@ if test -n "$GOBJECT_LIBS"; then
+@@ -52023,6 +52037,7 @@ if test -n "$GOBJECT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -1208,7 +1222,7 @@ index 39e091c..e620fdb 100755
else
pkg_failed=yes
fi
-@@ -51785,9 +51800,9 @@ else
+@@ -52042,9 +52057,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1220,7 +1234,7 @@ index 39e091c..e620fdb 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
-@@ -51987,7 +52002,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -52244,7 +52259,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -1229,7 +1243,7 @@ index 39e091c..e620fdb 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -53215,7 +53230,6 @@ do
+@@ -53472,7 +53487,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" ;;
@@ -1238,10 +1252,10 @@ index 39e091c..e620fdb 100755
"edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
"erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index 81737b1..2f84f4b 100644
+index dc7b15d..1099422 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -3016,10 +3016,10 @@ $(top_builddir)/daemon/guestfsd: force
+@@ -3021,10 +3021,10 @@ $(top_builddir)/daemon/guestfsd: force
appliance: force
$(MAKE) -C $(top_builddir)/appliance
@@ -1255,23 +1269,23 @@ index 81737b1..2f84f4b 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/java/Makefile.in b/java/Makefile.in
-index 028c908..3d6f109 100644
+index d9d6854..633ead1 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
-@@ -1295,7 +1295,7 @@ htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
--libdir = @libdir@
-+libdir = ${prefix}/lib/jni
- libexecdir = @libexecdir@
- lispdir = @lispdir@
- localedir = @localedir@
+@@ -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 ae5a28a..a517ed6 100644
+index 8bcea62..b54b6db 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
-@@ -1575,6 +1575,7 @@ appliance: force
+@@ -1580,6 +1580,7 @@ appliance: force
@HAVE_PERL_TRUE@ $(MAKE) -f Makefile-pl
@HAVE_PERL_TRUE at Makefile-pl: Makefile.PL
@@ -1301,10 +1315,10 @@ index 3a43d17..aff8e8d 100644
-tools/virt-tar.pl
-tools/virt-win-reg.pl
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
-index 97073ff..c4ac6b4 100644
+index 36923e9..fa6275b 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
-@@ -1251,8 +1251,8 @@ CLEANFILES = \
+@@ -1256,8 +1256,8 @@ CLEANFILES = \
@HAVE_RUBY_TRUE@ RUBY=$(RUBY) \
@HAVE_RUBY_TRUE@ $(top_builddir)/run
@@ -1315,7 +1329,7 @@ index 97073ff..c4ac6b4 100644
all: all-am
.SUFFIXES:
-@@ -1569,10 +1569,10 @@ appliance: force
+@@ -1574,10 +1574,10 @@ appliance: force
@HAVE_RUBY_TRUE@ $(RAKE) rdoc
@HAVE_RUBY_TRUE at install:
diff --git a/debian/patches/series b/debian/patches/series
index a5e6e25..20863ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
0004-Fix-for-systemd-based-Debian-systems.patch
0005-out-of-tree-build-fix-building-Perl-bindings.patch
0006-out-of-tree-build-daemon.patch
-0007-Install-Java-bindings-to-jni-subdirectory.patch
-0008-ruby-install-to-vendor_ruby.patch
-0009-autoreconf.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
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list