[Pkg-libvirt-commits] [libguestfs] 71/156: Dropped half a patch that has been integrated upstream

Hilko Bengen bengen at moszumanska.debian.org
Sat Aug 30 08:25:59 UTC 2014


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

bengen pushed a commit to branch master
in repository libguestfs.

commit 6119b28cd7be217fad8b655ef229418d276e1eaf
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Jul 5 13:52:28 2014 +0200

    Dropped half a patch that has been integrated upstream
---
 .../patches/0002-golang-Fix-for-out-of-tree-builds.patch | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
index bb9a8f1..c6aadce 100644
--- a/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0002-golang-Fix-for-out-of-tree-builds.patch
@@ -3,23 +3,9 @@ Date: Thu, 12 Dec 2013 21:06:22 +0100
 Subject: golang: Fix for out-of-tree builds
 
 ---
- configure.ac       | 2 +-
  golang/Makefile.am | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+)
 
-diff --git a/configure.ac b/configure.ac
-index 86cf440..fe92c16 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1442,7 +1442,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])
--        AS_IF([$GOLANG run golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
-+        AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
-             AC_MSG_RESULT([yes])
- 
-             # Substitute some golang environment.
 diff --git a/golang/Makefile.am b/golang/Makefile.am
 index 58cafc6..ba13691 100644
 --- a/golang/Makefile.am

-- 
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