[Pkg-cli-apps-commits] [SCM] longomatch branch, master, updated. upstream/0.14.1-12-g128f3e8

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 128f3e8b307716b34caab67ace76f7355c773dc2
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Thu Jul 30 15:52:31 2009 +0200

    Finally use csc instead of gmcs

diff --git a/debian/patches/02_use_csc b/debian/patches/02_use_csc
index 8ace01e..13dc115 100644
--- a/debian/patches/02_use_csc
+++ b/debian/patches/02_use_csc
@@ -1,60 +1,8 @@
-Index: longomatch/CesarPlayer/Makefile.in
-===================================================================
---- longomatch.orig/CesarPlayer/Makefile.in	2009-07-25 11:43:27.504187088 +0200
-+++ longomatch/CesarPlayer/Makefile.in	2009-07-25 11:56:14.748186905 +0200
-@@ -93,7 +93,7 @@
- FGREP = @FGREP@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @CSC@
- GREP = @GREP@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
-Index: longomatch/LongoMatch/Makefile.in
-===================================================================
---- longomatch.orig/LongoMatch/Makefile.in	2009-07-25 11:43:27.552618106 +0200
-+++ longomatch/LongoMatch/Makefile.in	2009-07-25 11:56:14.748186905 +0200
-@@ -93,7 +93,7 @@
- FGREP = @FGREP@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @CSC@
- GREP = @GREP@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
-Index: longomatch/Makefile.in
-===================================================================
---- longomatch.orig/Makefile.in	2009-07-25 11:43:27.565186928 +0200
-+++ longomatch/Makefile.in	2009-07-25 11:56:14.752186714 +0200
-@@ -99,7 +99,7 @@
- FGREP = @FGREP@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @CSC@
- GREP = @GREP@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
-Index: longomatch/libcesarplayer/Makefile.in
-===================================================================
---- longomatch.orig/libcesarplayer/Makefile.in	2009-07-25 11:43:27.573194291 +0200
-+++ longomatch/libcesarplayer/Makefile.in	2009-07-25 11:56:14.752186714 +0200
-@@ -85,7 +85,7 @@
- FGREP = @FGREP@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @CSC@
- GREP = @GREP@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
 Index: longomatch/configure.ac
 ===================================================================
---- longomatch.orig/configure.ac	2009-07-25 11:56:47.329206488 +0200
-+++ longomatch/configure.ac	2009-07-25 11:58:43.728187046 +0200
-@@ -29,18 +29,20 @@
+--- longomatch.orig/configure.ac	2009-07-30 10:16:40.880034981 +0200
++++ longomatch/configure.ac	2009-07-30 10:17:44.788058583 +0200
+@@ -29,17 +29,11 @@
  AC_PROG_INSTALL
  
  
@@ -69,21 +17,11 @@ Index: longomatch/configure.ac
 -	
 -else 
 -	AC_SUBST(GMCS,[gmcs])
--fi
-+AC_DEFUN([SHAMROCK_FIND_PROGRAM],
-+[
-+        AC_PATH_PROG(GMCS, gmcs, gmcs)
-+        AC_SUBST($1)
-+])
-+
-+AC_DEFUN([SHAMROCK_FIND_PROGRAM_OR_BAIL],
-+[
-+        SHAMROCK_FIND_PROGRAM(GMCS, gmcs, no)
-+        if test "x$1" = "xno"; then
-+                AC_MSG_ERROR([You need to install '$2'])
-+        fi
-+
-+])
++AC_PATH_PROG(CSC, gmcs, no)
++if test "x$CSC" = "xno"; then
++        AC_MSG_ERROR([gmcs Not found])
++else
++	AC_SUBST(GMCS,[csc])
+ fi
  
  
- AC_ARG_ENABLE(debug,

-- 
longomatch