[Pkg-libvirt-commits] [libguestfs] 60/61: Added patch for fixing build

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.28.2-1
in repository libguestfs.

commit 89eb4d79414cc8136adad49ace06a43f7cba9102
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Oct 31 19:34:12 2014 +0100

    Added patch for fixing build
---
 ...f-tree-build-install-for-bash-completions.patch | 99 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 100 insertions(+)

diff --git a/debian/patches/0004-Fix-out-of-tree-build-install-for-bash-completions.patch b/debian/patches/0004-Fix-out-of-tree-build-install-for-bash-completions.patch
new file mode 100644
index 0000000..5620906
--- /dev/null
+++ b/debian/patches/0004-Fix-out-of-tree-build-install-for-bash-completions.patch
@@ -0,0 +1,99 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 31 Oct 2014 19:33:19 +0100
+Subject: Fix out-of-tree build/install for bash completions
+
+---
+ bash/Makefile.am | 54 +++++++++++++++---------------------------------------
+ 1 file changed, 15 insertions(+), 39 deletions(-)
+
+diff --git a/bash/Makefile.am b/bash/Makefile.am
+index 10f0861..780da64 100644
+--- a/bash/Makefile.am
++++ b/bash/Makefile.am
+@@ -21,6 +21,10 @@ scripts = \
+ 	guestfish \
+ 	guestmount \
+ 	virt-alignment-scan \
++	virt-rescue \
++	virt-resize
++
++symlinks = \
+ 	virt-builder \
+ 	virt-cat \
+ 	virt-df \
+@@ -30,53 +34,21 @@ scripts = \
+ 	virt-inspector \
+ 	virt-log \
+ 	virt-ls \
+-	virt-rescue \
+-	virt-resize \
+ 	virt-sparsify \
+ 	virt-sysprep
+ 
+ # Note: Don't distribute the symbolic links, only the real files.
+ EXTRA_DIST = \
+ 	README \
+-	guestfish \
+-	guestmount \
+-	virt-alignment-scan \
+-	virt-rescue \
+-	virt-resize
++	$(scripts)
+ 
+ # Some of the scripts are simply symbolic links.
+-virt-cat:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-df:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-edit:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-filesystems:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-format:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-inspector:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-log:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-ls:
+-	rm -f $@
+-	$(LN_S) virt-alignment-scan $@
+-virt-sysprep:
++virt-cat virt-df virt-edit virt-filesystems virt-format virt-inspector \
++virt-log virt-ls virt-sysprep:
+ 	rm -f $@
+ 	$(LN_S) virt-alignment-scan $@
+ 
+-virt-builder:
+-	rm -f $@
+-	$(LN_S) virt-resize $@
+-virt-sparsify:
++virt-builder virt-sparsify:
+ 	rm -f $@
+ 	$(LN_S) virt-resize $@
+ 
+@@ -87,10 +59,14 @@ if HAVE_BASH_COMPLETION
+ bashcompletiondir = $(BASH_COMPLETIONS_DIR)
+ #bashcompletion_DATA = $(scripts)
+ 
+-all-local: $(scripts)
++all-local: $(scripts) $(symlinks)
++	test $(srcdir) != $(builddir) && cd $(srcdir) && cp $(scripts) $(abs_builddir)/
+ 
+-install-data-local: $(scripts)
++install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(bashcompletiondir)
+-	cp -d $(scripts) $(DESTDIR)$(bashcompletiondir)
++	cp -d $(scripts) $(symlinks) $(DESTDIR)$(bashcompletiondir)
++
++clean-local:
++	test $(srcdir) != $(builddir) && rm -f $(symlinks) $(scripts)
+ 
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index cf66984..0eb66a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
 0003-Do-not-use-DTB-for-armel.patch
+0004-Fix-out-of-tree-build-install-for-bash-completions.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git