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

Iain Lane laney at debian.org
Sun Jun 26 19:15:50 UTC 2011


The following commit has been merged in the master branch:
commit 883656bda4f66a3c3a75bc5efbebb888f3dac901
Author: Iain Lane <laney at debian.org>
Date:   Sun Jun 26 14:28:34 2011 +0100

    Use new configure variable to set Debian default compiler and drop patch
    
    We can now set the variable purely using upstream's autofoo

diff --git a/debian/patches/01_use_mono-csc b/debian/patches/01_use_mono-csc
deleted file mode 100644
index 5d7d264..0000000
--- a/debian/patches/01_use_mono-csc
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: longomatch.git/configure.ac
-===================================================================
---- longomatch.git.orig/configure.ac	2010-04-08 17:10:13.592991898 +0200
-+++ longomatch.git/configure.ac	2010-04-08 17:10:46.776989524 +0200
-@@ -38,22 +38,11 @@
- 
- 
- dnl Check for C# compiler
--AC_PATH_PROG(CSC, csc, no)
-+AC_PATH_PROG(CSC, mono-csc, no)
- if test "x$CSC" = "xno"; then
--	AC_PATH_PROG(MCS, gmcs, no)
--	if test "x$MCS" = "xno"; then
--       		AC_PATH_PROG(MCS2, gmcs2,no)
--		if test "x$MCS2" = "xno"; then
--			AC_MSG_ERROR([You need to install a C-sharp compiler])
--		else 
--			AC_SUBST(CSC,[gmcs2])	
--		fi
--	
--	else 
--		AC_SUBST(CSC,[gmcs])
--	fi
--else 
--	AC_SUBST(CSC,[csc])
-+	AC_MSG_ERROR([You need to install a C-sharp compiler])
-+else
-+	AC_SUBST(CSC,[mono-csc])
- fi
- 
- dnl Check for gettext utils
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c8c66e0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_use_mono-csc
diff --git a/debian/rules b/debian/rules
index fc96ada..36cbdce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,7 @@ get-orig-source:
 		--rename
 
 override_dh_auto_configure:
-	autoreconf -f -i -s -I .
-	dh_auto_configure -- CSC=/usr/bin/mono-csc
+	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
 override_dh_auto_install:
 	dh_auto_install

-- 
longomatch



More information about the Pkg-cli-apps-commits mailing list