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

Hilko Bengen bengen at debian.org
Thu Nov 24 22:12:07 UTC 2011 

The following commit has been merged in the master branch:
commit f3f7c4e4b470bd3586a19d500c066ab00e244d0a
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Nov 23 08:53:15 2011 +0100

    Rebased patch queue

diff --git a/debian/patches/0010-Fix-en-dis-able-install-daemon.patch b/debian/patches/0009-Fix-en-dis-able-install-daemon.patch
similarity index 96%
rename from debian/patches/0010-Fix-en-dis-able-install-daemon.patch
rename to debian/patches/0009-Fix-en-dis-able-install-daemon.patch
index eaa7760..875b674 100644
--- a/debian/patches/0010-Fix-en-dis-able-install-daemon.patch
+++ b/debian/patches/0009-Fix-en-dis-able-install-daemon.patch
@@ -7,7 +7,7 @@ Subject: Fix --{en,dis}able-install-daemon
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a179e3f..5562df4 100644
+index bd99db9..ceee22b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -250,9 +250,9 @@ if test "x$enable_daemon" = "xyes"; then
diff --git a/debian/patches/0009-out-of-tree-build-erlang.patch b/debian/patches/0009-out-of-tree-build-erlang.patch
deleted file mode 100644
index 74355f2..0000000
--- a/debian/patches/0009-out-of-tree-build-erlang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 10 Nov 2011 21:58:23 +0100
-Subject: out of tree build: erlang
-
----
- erlang/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/erlang/Makefile.am b/erlang/Makefile.am
-index f336375..2c9e359 100644
---- a/erlang/Makefile.am
-+++ b/erlang/Makefile.am
-@@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
- erlang_bin_DATA = guestfs.beam
- 
- guestfs.beam: guestfs.erl
--	$(ERLC) +debug_info guestfs.erl
-+	$(ERLC) +debug_info $^
- 
- bin_PROGRAMS = erl-guestfs
- 
--- 
diff --git a/debian/patches/0011-Fix-include.patch b/debian/patches/0010-Fix-include.patch
similarity index 100%
rename from debian/patches/0011-Fix-include.patch
rename to debian/patches/0010-Fix-include.patch
diff --git a/debian/patches/0013-Install-Java-bindings-to-jni-subdirectory.patch b/debian/patches/0011-Install-Java-bindings-to-jni-subdirectory.patch
similarity index 100%
rename from debian/patches/0013-Install-Java-bindings-to-jni-subdirectory.patch
rename to debian/patches/0011-Install-Java-bindings-to-jni-subdirectory.patch
diff --git a/debian/patches/0012-Java-build-fixes.patch b/debian/patches/0012-Java-build-fixes.patch
deleted file mode 100644
index dee5387..0000000
--- a/debian/patches/0012-Java-build-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 12 Nov 2011 21:11:26 +0100
-Subject: Java build fixes
-
-- enable out-of-tree build
-- disable building of static version of libguestfs_jni
----
- java/Makefile.am |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/java/Makefile.am b/java/Makefile.am
-index 31b793f..ef78773 100644
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -73,7 +73,7 @@ libguestfs_jni_la_SOURCES = \
- 	com_redhat_et_libguestfs_GuestFS.c
- 
- libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
--libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-+libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared
- libguestfs_jni_la_CFLAGS = \
-   $(WARN_CFLAGS) $(WERROR_CFLAGS) \
-   -I$(top_srcdir)/src -I$(top_builddir)/src \
-@@ -116,10 +116,11 @@ TESTS_ENVIRONMENT = \
- noinst_DATA = Bindtests.class $(java_tests:.java=.class)
- 
- t/%.class: t/%.java
--	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
-+	mkdir -p t
-+	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir)/t $<
- 
- Bindtests.class: Bindtests.java
--	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
-+	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir) $<
- 
- endif
- 
--- 
diff --git a/debian/patches/0014-autoreconf.patch b/debian/patches/0012-autoreconf.patch
similarity index 94%
rename from debian/patches/0014-autoreconf.patch
rename to debian/patches/0012-autoreconf.patch
index 7a8ccb9..dd7bbd6 100644
--- a/debian/patches/0014-autoreconf.patch
+++ b/debian/patches/0012-autoreconf.patch
@@ -11,20 +11,19 @@ Subject: autoreconf
  daemon/Makefile.in   |    4 +-
  df/Makefile.in       |    2 +-
  edit/Makefile.in     |    2 +-
- erlang/Makefile.in   |    2 +-
  fuse/Makefile.in     |    2 +-
  images/Makefile.in   |    2 +-
- java/Makefile.in     |   12 ++++---
+ java/Makefile.in     |    5 ++-
  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, 124 insertions(+), 106 deletions(-)
+ 17 files changed, 119 insertions(+), 102 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 8729a23..e7fc02a 100644
+index c3fa95f..d7fae02 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -116,7 +115,7 @@ index 8729a23..e7fc02a 100644
  EXTRA_DIST = \
  	$(generator_built) \
  	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1472,8 +1472,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1473,8 +1473,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 +205,7 @@ index 28fcec7..fb84fce 100644
  
  .SUFFIXES:
 diff --git a/configure b/configure
-index aed418b..a97a6a8 100755
+index 7a43c2e..d7d7390 100755
 --- a/configure
 +++ b/configure
 @@ -46473,7 +46473,10 @@ else
@@ -553,19 +552,6 @@ index 16ff4c3..6784b21 100644
  all: all-am
  
  .SUFFIXES:
-diff --git a/erlang/Makefile.in b/erlang/Makefile.in
-index 99e450e..45f4f63 100644
---- a/erlang/Makefile.in
-+++ b/erlang/Makefile.in
-@@ -1674,7 +1674,7 @@ appliance: force
- 	$(MAKE) -C $(top_builddir)/appliance
- 
- @HAVE_ERLANG_TRUE at guestfs.beam: guestfs.erl
-- at HAVE_ERLANG_TRUE@	$(ERLC) +debug_info guestfs.erl
-+ at HAVE_ERLANG_TRUE@	$(ERLC) +debug_info $^
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 diff --git a/fuse/Makefile.in b/fuse/Makefile.in
 index 08a38a8..ab092bf 100644
 --- a/fuse/Makefile.in
@@ -593,7 +579,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..2b141f4 100644
+index ea9a6bf..2b141f4 100644
 --- a/java/Makefile.in
 +++ b/java/Makefile.in
 @@ -92,6 +92,7 @@ build_triplet = @build@
@@ -613,15 +599,6 @@ index b900c4b..2b141f4 100644
  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
- 
- @HAVE_JAVA_TRUE at libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
-- at HAVE_JAVA_TRUE@libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-+ at HAVE_JAVA_TRUE@libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared
- @HAVE_JAVA_TRUE at libguestfs_jni_la_CFLAGS = \
- @HAVE_JAVA_TRUE@  $(WARN_CFLAGS) $(WERROR_CFLAGS) \
- @HAVE_JAVA_TRUE@  -I$(top_srcdir)/src -I$(top_builddir)/src \
 @@ -1347,7 +1348,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
  @HAVE_JAVA_TRUE at noinst_SCRIPTS = doc-stamp
  
@@ -631,20 +608,6 @@ index b900c4b..2b141f4 100644
  @HAVE_JAVA_TRUE at TESTS_ENVIRONMENT = \
  @HAVE_JAVA_TRUE@	JAVA=$(JAVA) \
  @HAVE_JAVA_TRUE@	CLASSPATH=.:t:libguestfs-$(VERSION).jar \
-@@ -1840,10 +1841,11 @@ builddir ?= $(top_builddir)/java
- @HAVE_JAVA_TRUE@	cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
- 
- @HAVE_JAVA_TRUE at t/%.class: t/%.java
-- at HAVE_JAVA_TRUE@	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
-+ at HAVE_JAVA_TRUE@	mkdir -p t
-+ at HAVE_JAVA_TRUE@	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir)/t $<
- 
- @HAVE_JAVA_TRUE at Bindtests.class: Bindtests.java
-- at HAVE_JAVA_TRUE@	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
-+ at HAVE_JAVA_TRUE@	$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir) $<
- 
- # Tell version 3.79 and up of GNU make to not build goals in this
- # directory in parallel.
 diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
 index 060d7a2..52f4ab9 100644
 --- a/ocaml/Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index 00a51c5..fa74a7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,9 +6,7 @@
 0006-Fix-for-systemd-based-Debian-systems.patch
 0007-out-of-tree-build-fix-building-Perl-bindings.patch
 0008-out-of-tree-build-daemon.patch
-0009-out-of-tree-build-erlang.patch
-0010-Fix-en-dis-able-install-daemon.patch
-0011-Fix-include.patch
-0012-Java-build-fixes.patch
-0013-Install-Java-bindings-to-jni-subdirectory.patch
-0014-autoreconf.patch
+0009-Fix-en-dis-able-install-daemon.patch
+0010-Fix-include.patch
+0011-Install-Java-bindings-to-jni-subdirectory.patch
+0012-autoreconf.patch

-- 
Libguestfs Debian packaging

More information about the Pkg-libvirt-commits mailing list