[Pkg-libvirt-commits] [libguestfs] 16/37: Rebased patch queue
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.15.10-1
in repository libguestfs.
commit d86b53f17d48d5666131f65180dafedea86983de
Author: Hilko Bengen <bengen at debian.org>
Date: Thu Nov 17 20:23:30 2011 +0100
Rebased patch queue
---
...h => 0009-Fix-en-dis-able-install-daemon.patch} | 2 +-
debian/patches/0009-out-of-tree-build-erlang.patch | 22 ------
...11-Fix-include.patch => 0010-Fix-include.patch} | 0
...Install-Java-bindings-to-jni-subdirectory.patch | 22 ++++++
debian/patches/0012-Java-build-fixes.patch | 51 ------------
...0014-autoreconf.patch => 0012-autoreconf.patch} | 92 +++-------------------
.../patches/0013-out-of-tree-build-haskell.patch | 43 ----------
debian/patches/series | 10 +--
8 files changed, 38 insertions(+), 204 deletions(-)
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..e964d8a 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 f69adc6..e132b45 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/0011-Install-Java-bindings-to-jni-subdirectory.patch b/debian/patches/0011-Install-Java-bindings-to-jni-subdirectory.patch
new file mode 100644
index 0000000..1b6cff8
--- /dev/null
+++ b/debian/patches/0011-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/0012-Java-build-fixes.patch b/debian/patches/0012-Java-build-fixes.patch
deleted file mode 100644
index 474a2b1..0000000
--- a/debian/patches/0012-Java-build-fixes.patch
+++ /dev/null
@@ -1,51 +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
-- install to /usr/lib/jni
----
- java/Makefile.am | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/java/Makefile.am b/java/Makefile.am
-index 31b793f..b318a95 100644
---- a/java/Makefile.am
-+++ b/java/Makefile.am
-@@ -17,9 +17,10 @@
-
- include $(top_srcdir)/subdir-rules.mk
-
-+libdir = ${prefix}/lib/jni
-+
- # Old RHEL 5 autoconf doesn't have builddir.
- builddir ?= $(top_builddir)/java
--
- # XXX: Need to fix generator.ml dependencies
- #
- # Files generated by generator.ml:
-@@ -73,7 +74,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 +117,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 90%
rename from debian/patches/0014-autoreconf.patch
rename to debian/patches/0012-autoreconf.patch
index a853b75..356dfa7 100644
--- a/debian/patches/0014-autoreconf.patch
+++ b/debian/patches/0012-autoreconf.patch
@@ -11,18 +11,17 @@ Subject: autoreconf
daemon/Makefile.in | 4 +-
df/Makefile.in | 2 +-
edit/Makefile.in | 2 +-
- erlang/Makefile.in | 2 +-
fuse/Makefile.in | 2 +-
- haskell/Makefile.in | 15 ++++----
+ haskell/Makefile.in | 3 +-
images/Makefile.in | 2 +-
- java/Makefile.in | 13 ++++---
+ 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 ++--
- 19 files changed, 132 insertions(+), 114 deletions(-)
+ 18 files changed, 121 insertions(+), 103 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index b554b95..5080d5a 100644
@@ -207,7 +206,7 @@ index 28fcec7..fb84fce 100644
.SUFFIXES:
diff --git a/configure b/configure
-index 44f310a..a224259 100755
+index 2a353ef..8a565ae 100755
--- a/configure
+++ b/configure
@@ -46473,7 +46473,10 @@ else
@@ -512,10 +511,10 @@ index 44f310a..a224259 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 55e1335..5fef579 100644
+index 9cbc493..33450fe 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -3106,10 +3106,10 @@ $(top_builddir)/daemon/guestfsd: force
+@@ -3125,10 +3125,10 @@ $(top_builddir)/daemon/guestfsd: force
appliance: force
$(MAKE) -C $(top_builddir)/appliance
@@ -554,19 +553,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
@@ -581,7 +567,7 @@ index 08a38a8..ab092bf 100644
@HAVE_FUSE_TRUE@ top_builddir=..
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
-index 8e9f043..d35945a 100644
+index 8cc73df..d35945a 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -68,6 +68,7 @@ build_triplet = @build@
@@ -592,40 +578,15 @@ index 8e9f043..d35945a 100644
subdir = haskell
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1205,9 +1206,9 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
+@@ -1205,7 +1206,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
@HAVE_HASKELL_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_HASKELL_TRUE@ $(VG)
- at HAVE_HASKELL_TRUE@TESTS = run-bindtests Guestfs005Load Guestfs010Basic
+ at HAVE_HASKELL_TRUE@TESTS = run-bindtests $(am__append_1)
@HAVE_HASKELL_TRUE at check_DATA = Bindtests
-- at HAVE_HASKELL_TRUE@GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
-+ at HAVE_HASKELL_TRUE@GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
+ @HAVE_HASKELL_TRUE at GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
@HAVE_HASKELL_TRUE at all_targets = Bindtests Guestfs005Load Guestfs010Basic
- @HAVE_HASKELL_TRUE at CLEANFILES = $(all_targets) *~ *.hi *.o
- all: all-am
-@@ -1516,16 +1517,16 @@ appliance: force
-
- @HAVE_HASKELL_TRUE at all: $(all_targets)
-
-- at HAVE_HASKELL_TRUE@Guestfs.o: Guestfs.hs
-- at HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -c $<
-+ at HAVE_HASKELL_TRUE@Guestfs.o: $(srcdir)/Guestfs.hs
-+ at HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -c $< -o $@
-
-- at HAVE_HASKELL_TRUE@Bindtests: Bindtests.hs Guestfs.o
-+ at HAVE_HASKELL_TRUE@Bindtests: $(srcdir)/Bindtests.hs Guestfs.o
- @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
-- at HAVE_HASKELL_TRUE@Guestfs005Load: Guestfs005Load.hs Guestfs.o
-+ at HAVE_HASKELL_TRUE@Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o
- @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
-- at HAVE_HASKELL_TRUE@Guestfs010Basic: Guestfs010Basic.hs Guestfs.o
-+ at HAVE_HASKELL_TRUE@Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o
- @HAVE_HASKELL_TRUE@ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/images/Makefile.in b/images/Makefile.in
index f2e3f4e..4a51f55 100644
--- a/images/Makefile.in
@@ -640,7 +601,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..613aa6d 100644
+index ea9a6bf..2b141f4 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -92,6 +92,7 @@ build_triplet = @build@
@@ -660,24 +621,7 @@ index b900c4b..613aa6d 100644
libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
-@@ -1278,7 +1279,6 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--
- # XXX: Need to fix generator.ml dependencies
- #
- # Files generated by generator.ml:
-@@ -1335,7 +1335,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 +1347,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
+@@ -1347,7 +1348,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
@HAVE_JAVA_TRUE at noinst_SCRIPTS = doc-stamp
# Tests (not comprehensive).
@@ -686,20 +630,6 @@ index b900c4b..613aa6d 100644
@HAVE_JAVA_TRUE at TESTS_ENVIRONMENT = \
@HAVE_JAVA_TRUE@ JAVA=$(JAVA) \
@HAVE_JAVA_TRUE@ CLASSPATH=.:t:libguestfs-$(VERSION).jar \
-@@ -1840,10 +1840,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/0013-out-of-tree-build-haskell.patch b/debian/patches/0013-out-of-tree-build-haskell.patch
deleted file mode 100644
index 425fd8d..0000000
--- a/debian/patches/0013-out-of-tree-build-haskell.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Mon, 14 Nov 2011 00:32:44 +0100
-Subject: out of tree build: haskell
-
----
- haskell/Makefile.am | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/haskell/Makefile.am b/haskell/Makefile.am
-index 2cc88fd..4a95cc4 100644
---- a/haskell/Makefile.am
-+++ b/haskell/Makefile.am
-@@ -40,23 +40,23 @@ endif ENABLE_APPLIANCE
-
- check_DATA = Bindtests
-
--GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
-+GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
-
- all_targets = Bindtests Guestfs005Load Guestfs010Basic
- $(all_targets): $(top_builddir)/src/libguestfs.la
-
- all: $(all_targets)
-
--Guestfs.o: Guestfs.hs
-- $(GHC) $(GHCFLAGS) -c $<
-+Guestfs.o: $(srcdir)/Guestfs.hs
-+ $(GHC) $(GHCFLAGS) -c $< -o $@
-
--Bindtests: Bindtests.hs Guestfs.o
-+Bindtests: $(srcdir)/Bindtests.hs Guestfs.o
- $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
--Guestfs005Load: Guestfs005Load.hs Guestfs.o
-+Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o
- $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
--Guestfs010Basic: Guestfs010Basic.hs Guestfs.o
-+Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o
- $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
- CLEANFILES = $(all_targets) *~ *.hi *.o
---
diff --git a/debian/patches/series b/debian/patches/series
index eee86eb..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-out-of-tree-build-haskell.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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list