[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.5.0-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 3552666ca7a2965628a51ed096be8dd747ccfc31
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Dec 21 22:43:37 2011 +0100

    Remove GNUmakefile links
    
    since it breaks the out of tree build.

diff --git a/debian/patches/Remove-GNUmakefile-links.patch b/debian/patches/Remove-GNUmakefile-links.patch
new file mode 100644
index 0000000..4be3441
--- /dev/null
+++ b/debian/patches/Remove-GNUmakefile-links.patch
@@ -0,0 +1,54 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 21 Dec 2011 22:43:13 +0100
+Subject: Remove GNUmakefile links
+
+since it breaks the out of tree build
+---
+ configure    |   11 -----------
+ configure.ac |   11 -----------
+ 2 files changed, 0 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index 5a16507..ceb1bfc 100755
+--- a/configure
++++ b/configure
+@@ -11858,17 +11858,6 @@ cat >>confdefs.h <<_ACEOF
+ #define VERSION_MICRO $VERSION_MICRO
+ _ACEOF
+ 
+-
+-# Autoconf 2.61a.99 and earlier don't support linking a file only
+-# in VPATH builds.  But since GNUmakefile is for maintainer use
+-# only, it does not matter if we skip the link with older autoconf.
+-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+-# builds, so use a shell variable to bypass this.
+-GNUmakefile=GNUmakefile
+-ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
+-
+-
+-
+    case $ac_cv_prog_cc_stdc in #(
+   no) :
+     ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
+diff --git a/configure.ac b/configure.ac
+index 8eebe41..9ef1dc7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,17 +58,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
+ AC_DEFINE_UNQUOTED([VERSION_MINOR], [$VERSION_MINOR], [Minor version number of package])
+ AC_DEFINE_UNQUOTED([VERSION_MICRO], [$VERSION_MICRO], [Micro version number of package])
+ 
+-# Autoconf 2.61a.99 and earlier don't support linking a file only
+-# in VPATH builds.  But since GNUmakefile is for maintainer use
+-# only, it does not matter if we skip the link with older autoconf.
+-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+-# builds, so use a shell variable to bypass this.
+-GNUmakefile=GNUmakefile
+-m4_if(m4_version_compare([2.61a.100],
+-        m4_defn([m4_PACKAGE_VERSION])), [1], [],
+-      [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+-        [GNUmakefile=$GNUmakefile])])
+-
+ dnl *******************************************************************************
+ dnl Setup core compilers / build helpers
+ dnl *******************************************************************************
diff --git a/debian/patches/series b/debian/patches/series
index 1676d8d..252c851 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-build-with-xulrunner-1.9.1.patch
 Look-for-generated-enums-in-srcdir.patch
 Use-C99-int-types-instead-of-NSPR-ones.patch
 Fix-build-with-xulrunner-8.0.patch
+Remove-GNUmakefile-links.patch

-- 
libgtk-vnc Debian packaging