[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.14.2-4

[Hilko Bengen]

The following commit has been merged in the master branch:
commit f9c46d563b904f620c5f3324568133121a6c9c71
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Nov 20 23:39:17 2011 +0100

    Added patch to install Java bindings to /usr/lib/jni. This eliminates a file conflict between libguestfs-java and libguestfs-dev

diff --git a/debian/patches/0013-Install-Java-bindings-to-jni-subdirectory.patch b/debian/patches/0013-Install-Java-bindings-to-jni-subdirectory.patch
new file mode 100644
index 0000000..1b6cff8
--- /dev/null
+++ b/debian/patches/0013-Install-Java-bindings-to-jni-subdirectory.patch
@@ -0,0 +1,22 @@
+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 ef78773..b76e65c 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/0013-autoreconf.patch b/debian/patches/0014-autoreconf.patch
similarity index 98%
rename from debian/patches/0013-autoreconf.patch
rename to debian/patches/0014-autoreconf.patch
index 37d3683..7a8ccb9 100644
--- a/debian/patches/0013-autoreconf.patch
+++ b/debian/patches/0014-autoreconf.patch
@@ -14,17 +14,17 @@ Subject: autoreconf
  erlang/Makefile.in   |    2 +-
  fuse/Makefile.in     |    2 +-
  images/Makefile.in   |    2 +-
- java/Makefile.in     |   10 +++--
+ java/Makefile.in     |   12 ++++---
  ocaml/Makefile.in    |   19 +++++-----
  perl/Makefile.in     |    8 +++-
  python/Makefile.in   |    3 +-
  resize/Makefile.in   |    7 ++--
  sparsify/Makefile.in |    8 ++--
  tools/Makefile.in    |    6 ++--
- 18 files changed, 123 insertions(+), 105 deletions(-)
+ 18 files changed, 124 insertions(+), 106 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index b554b95..5080d5a 100644
+index 8729a23..e7fc02a 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -116,7 +116,7 @@ index b554b95..5080d5a 100644
  EXTRA_DIST = \
  	$(generator_built) \
  	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1488,8 +1488,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1472,8 +1472,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 $@
@@ -206,7 +206,7 @@ index 28fcec7..fb84fce 100644
  
  .SUFFIXES:
 diff --git a/configure b/configure
-index 44f310a..a224259 100755
+index aed418b..a97a6a8 100755
 --- a/configure
 +++ b/configure
 @@ -46473,7 +46473,10 @@ else
@@ -593,7 +593,7 @@ index f2e3f4e..4a51f55 100644
  	test.iso test.sqsh \
  	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
 diff --git a/java/Makefile.in b/java/Makefile.in
-index b900c4b..f732d5e 100644
+index b900c4b..2b141f4 100644
 --- a/java/Makefile.in
 +++ b/java/Makefile.in
 @@ -92,6 +92,7 @@ build_triplet = @build@
@@ -604,6 +604,15 @@ index b900c4b..f732d5e 100644
  subdir = java
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+@@ -1258,7 +1259,7 @@ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = ${prefix}/lib/jni
+ libexecdir = @libexecdir@
+ lispdir = @lispdir@
+ localedir = @localedir@
 @@ -1335,7 +1336,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
  @HAVE_JAVA_TRUE@	com_redhat_et_libguestfs_GuestFS.c
  
diff --git a/debian/patches/series b/debian/patches/series
index 06709f4..00a51c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@
 0010-Fix-en-dis-able-install-daemon.patch
 0011-Fix-include.patch
 0012-Java-build-fixes.patch
-0013-autoreconf.patch
+0013-Install-Java-bindings-to-jni-subdirectory.patch
+0014-autoreconf.patch

-- 
Libguestfs Debian packaging