[Pkg-cli-apps-commits] [SCM] longomatch branch, master, updated. upstream/0.14.1-11-g5ce2642
Stefan Ebner
sebner at ubuntu.com
Sat Jul 25 10:00:54 UTC 2009
The following commit has been merged in the master branch:
commit 5ce26425ffef8e73a3f34b19229e0a06c17c8c5c
Author: Stefan Ebner <sebner at ubuntu.com>
Date: Sat Jul 25 12:00:09 2009 +0200
Fix VCS-Browser adress, Update use_csc patch
diff --git a/debian/control b/debian/control
index b5715ba..a687a7d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~),
Build-Depends-Indep: mono-devel (>= 2.0.1), libgtk2.0-cil
Standards-Version: 3.8.2
Homepage: http://longomatch.ylatuya.es/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/longomatch/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/longomatch/trunk/
+Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/longomatch.git
+Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/longomatch.git
Package: longomatch
Architecture: all
diff --git a/debian/patches/02_use_csc b/debian/patches/02_use_csc
index 2d2d007..8ace01e 100644
--- a/debian/patches/02_use_csc
+++ b/debian/patches/02_use_csc
@@ -1,29 +1,7 @@
-Index: longomatch/CesarPlayer/Makefile.am
-===================================================================
---- longomatch.orig/CesarPlayer/Makefile.am 2009-07-13 19:07:01.676277410 +0200
-+++ longomatch/CesarPlayer/Makefile.am 2009-07-13 19:08:46.992335609 +0200
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
-
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-+ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+ -debug -define:DEBUG
- ASSEMBLY = a.dll
- ASSEMBLY_MDB = $(ASSEMBLY).mdb
-@@ -16,7 +16,7 @@
- endif
-
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-+ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+ -debug -define:DEBUG
- ASSEMBLY = bin/Release/CesarPlayer.dll
- ASSEMBLY_MDB = $(ASSEMBLY).mdb
Index: longomatch/CesarPlayer/Makefile.in
===================================================================
---- longomatch.orig/CesarPlayer/Makefile.in 2009-07-13 19:07:01.760304751 +0200
-+++ longomatch/CesarPlayer/Makefile.in 2009-07-13 19:08:08.131278161 +0200
+--- 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@
@@ -33,43 +11,10 @@ Index: longomatch/CesarPlayer/Makefile.in
GREP = @GREP@
GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
-@@ -192,8 +192,8 @@
- $(DATA_FILES) $(build_culture_res_files)
-
- # Warning: This is an automatically generated file, do not edit!
-- at ENABLE_DEBUG_TRUE@ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-- at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-+ at ENABLE_DEBUG_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
-+ at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
- @ENABLE_DEBUG_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+ -debug -define:DEBUG
- @ENABLE_RELEASE_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -unsafe -warn:4 -optimize+ -debug -define:DEBUG
- @ENABLE_DEBUG_TRUE at ASSEMBLY = a.dll
-Index: longomatch/LongoMatch/Makefile.am
-===================================================================
---- longomatch.orig/LongoMatch/Makefile.am 2009-07-13 19:06:12.588301909 +0200
-+++ longomatch/LongoMatch/Makefile.am 2009-07-13 19:08:28.835278708 +0200
-@@ -4,7 +4,7 @@
- # Warning: This is an automatically generated file, do not edit!
-
- if ENABLE_DEBUG
--ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-+ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-main:LongoMatch.MainClass"
-
- ASSEMBLY = bin/Debug/LongoMatch.exe
-@@ -26,7 +26,7 @@
- endif
-
- if ENABLE_RELEASE
--ASSEMBLY_COMPILER_COMMAND = $(GMCS)
-+ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-main:LongoMatch.MainClass"
-
- ASSEMBLY = bin/Release/LongoMatch.exe
Index: longomatch/LongoMatch/Makefile.in
===================================================================
---- longomatch.orig/LongoMatch/Makefile.in 2009-07-13 19:06:12.640284757 +0200
-+++ longomatch/LongoMatch/Makefile.in 2009-07-13 19:06:43.451278877 +0200
+--- 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@
@@ -81,8 +26,8 @@ Index: longomatch/LongoMatch/Makefile.in
GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
Index: longomatch/Makefile.in
===================================================================
---- longomatch.orig/Makefile.in 2009-07-13 19:05:24.947285179 +0200
-+++ longomatch/Makefile.in 2009-07-13 19:05:40.863279726 +0200
+--- 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@
@@ -94,8 +39,8 @@ Index: longomatch/Makefile.in
GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
Index: longomatch/libcesarplayer/Makefile.in
===================================================================
---- longomatch.orig/libcesarplayer/Makefile.in 2009-07-13 19:09:01.680286354 +0200
-+++ longomatch/libcesarplayer/Makefile.in 2009-07-13 19:09:25.375278589 +0200
+--- 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@
@@ -105,3 +50,40 @@ Index: longomatch/libcesarplayer/Makefile.in
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 @@
+ AC_PROG_INSTALL
+
+
+-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([gmcs Not found])
+- else
+- AC_SUBST(GMCS,[gmcs2])
+- fi
+-
+-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_ARG_ENABLE(debug,
--
longomatch
More information about the Pkg-cli-apps-commits
mailing list