[Pkg-libvirt-commits] [libguestfs] 202/233: Rebased patch queue

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 6af9928c1311ad18b560466aa13e65123cf2a3ab
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Feb 13 08:18:46 2014 +0100

    Rebased patch queue
---
 .../0006-golang-Fix-for-out-of-tree-builds.patch    | 14 +++++++-------
 ...module-init-tools-which-has-been-a-metapac.patch | 21 ---------------------
 debian/patches/series                               |  1 -
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
index f7a2032..c71b8ec 100644
--- a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
@@ -8,10 +8,10 @@ Subject: golang: Fix for out-of-tree builds
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 8320295..8bf1436 100644
+index 874f3ad..e367eff 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1530,7 +1530,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
+@@ -1541,7 +1541,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
      AC_CHECK_PROG([GOLANG],[go],[go],[no])
      AS_IF([test "x$GOLANG" != "xno"],[
          AC_MSG_CHECKING([if $GOLANG is usable])
@@ -21,20 +21,20 @@ index 8320295..8bf1436 100644
  
              # Substitute some golang environment.
 diff --git a/golang/Makefile.am b/golang/Makefile.am
-index a7dd1b2..a60c9ba 100644
+index 58cafc6..ba13691 100644
 --- a/golang/Makefile.am
 +++ b/golang/Makefile.am
-@@ -44,6 +44,7 @@ golangpkg_DATA = \
+@@ -49,6 +49,7 @@ golangpkg_DATA = \
  	pkg/$(GOOS)_$(GOARCH)/$(pkg).a
  
  pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
-+	-[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/src $(builddir)/src
++	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src
  	$(top_builddir)/run $(GOLANG) install $(pkg)
  
  golangsrc_DATA = $(source_files)
-@@ -57,4 +58,5 @@ endif
+@@ -62,4 +63,5 @@ endif
  CLEANFILES = *~ src/$(pkg)/*~
  
  clean-local:
-+	-[ $(srcdir) != $(builddir) ] && rm -rf $(builddir)/src
++	-[ $(srcdir) != $(builddir) ] && rm -f $(builddir)/src
  	rm -rf pkg
diff --git a/debian/patches/0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch b/debian/patches/0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
deleted file mode 100644
index af47bc1..0000000
--- a/debian/patches/0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 7 Jan 2014 00:20:40 +0100
-Subject: Don't use module-init-tools which has been a metapackage since March
- 2012
-
----
- appliance/packagelist.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index cb62a08..fe6741a 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -136,7 +136,6 @@ lsscsi
- lvm2
- lzop
- mdadm
--module-init-tools
- /*
- Enabling this pulls out 140 extra packages
- into the appliance:
diff --git a/debian/patches/series b/debian/patches/series
index ebde46e..bf8e6cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0005-Disable-gnulib-tests-by-default.patch
 0006-golang-Fix-for-out-of-tree-builds.patch
-0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch

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