[Pkg-cli-apps-commits] [SCM] longomatch branch, master, updated. debian/0.16.5-1-16-gc09b098

[Iain Lane]

The following commit has been merged in the master branch:
commit 922d870cded3417a4b6fc9136918d6fcae6673bf
Author: Iain Lane <laney at debian.org>
Date:   Sun Jun 26 18:20:01 2011 +0100

    Add new patch to allow manually set 2.0 compiler to work
    
    Upstream's autofoo checked against the 4.0 profile if MCS was set. This
    meant that we wouldn't be able to upload to unstable while 2.6.7 was
    still the version there. Add a new patch to instead use the installed
    mono version.

diff --git a/debian/autogen.sh b/debian/autogen.sh
new file mode 100755
index 0000000..787a550
--- /dev/null
+++ b/debian/autogen.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+PROJECT=LongoMatch
+FILE=
+CONFIGURE=configure.ac
+
+: ${AUTOCONF=autoconf}
+: ${AUTOHEADER=autoheader}
+: ${AUTOMAKE=automake}
+: ${LIBTOOLIZE=libtoolize}
+: ${INTLTOOLIZE=intltoolize}
+: ${ACLOCAL=aclocal}
+: ${LIBTOOL=libtool}
+
+aclocalinclude="-I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS"
+
+case $CC in
+*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
+esac
+
+(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
+    echo "Running $LIBTOOLIZE ..."
+    $LIBTOOLIZE --force --copy --automake
+}
+
+(grep "^IT_PROG_INTLTOOL" $CONFIGURE >/dev/null) && {
+    echo "Running $INTLTOOLIZE ..."
+    $INTLTOOLIZE --force --copy --automake
+}
+
+echo "Running $ACLOCAL $aclocalinclude ..."
+$ACLOCAL $aclocalinclude
+
+echo "Running $AUTOMAKE --gnu $am_opt ..."
+$AUTOMAKE --add-missing --gnu $am_opt
+
+echo "Running $AUTOCONF ..."
+$AUTOCONF
diff --git a/debian/control b/debian/control
index d256c56..1753abe 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: autoconf,
                automake,
                cli-common-dev (>= 0.7),
                debhelper (>= 7.0.50),
+               dh-autoreconf,
                imagemagick,
                intltool,
                libdb4o-cil-dev,
diff --git a/debian/patches/0002-Allow-manually-set-compiler-to-support-2.0-or-4.0.patch b/debian/patches/0002-Allow-manually-set-compiler-to-support-2.0-or-4.0.patch
new file mode 100644
index 0000000..a29bfa0
--- /dev/null
+++ b/debian/patches/0002-Allow-manually-set-compiler-to-support-2.0-or-4.0.patch
@@ -0,0 +1,51 @@
+From a1245fa5e3f84efd9f12fd073a428ab3d503b0af Mon Sep 17 00:00:00 2001
+From: Iain Lane <laney at debian.org>
+Date: Sun, 26 Jun 2011 18:04:10 +0100
+Subject: [PATCH 2/2] Allow manually set compiler to support 2.0 or 4.0
+
+Previously the 4.0 profile was forced when MCS was explicitly set.
+Instead infer the profile to use from the system.
+---
+ configure.ac |   20 +++++++++-----------
+ 1 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19c5432..f521d22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,23 +50,21 @@ AM_GLIB_GNU_GETTEXT
+ dnl Mono and C# compiler
+ dnl Check first for a 4.0 compiler or than fallback to 2.0
+ SHAMROCK_CHECK_MONO_MODULE(2.4.0)
+-AC_PATH_PROG(MCS, dmcs, no)
+-	if test "x$MCS" = "xno"; then
+-		unset ac_cv_path_MCS
+-		SHAMROCK_FIND_MONO_2_0_COMPILER
+-		SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
++PKG_CHECK_EXISTS([mono >= 2.8],
++		[SHAMROCK_FIND_MONO_4_0_COMPILER
++		SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([	
+ 			System.Data
+ 			Mono.Cairo
+ 			Mono.Posix
+-		])
+-	else
+-		AC_SUBST(MCS, ["$MCS"])
+-		SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([	
++		])]
++,
++		[SHAMROCK_FIND_MONO_2_0_COMPILER
++		SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
+ 			System.Data
+ 			Mono.Cairo
+ 			Mono.Posix
+-		])
+-	fi
++		])])
++AC_SUBST(MCS, ["$MCS"])
+ SHAMROCK_FIND_MONO_RUNTIME
+ 
+ dnl NUnit (optional)
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index acd69f0..eb65eae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-CS1012-by-using-unicode-escape-sequences-instead.patch
+0002-Allow-manually-set-compiler-to-support-2.0-or-4.0.patch
diff --git a/debian/rules b/debian/rules
index f610991..7d3acba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,11 @@ override_dh_auto_install:
 	rm -f $(CURDIR)/debian/longomatch/usr/lib/longomatch/libcesarplayer.la
 	rm -f $(CURDIR)/debian/longomatch/usr/lib/longomatch/libcesarplayer.a
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed $(CURDIR)/debian/autogen.sh
+
 %:
-	dh $@
+	dh --with autoreconf $@
 
 
 .PHONY: get-orig-source

-- 
longomatch