[Pkg-cli-libs-commits] [taoframework] 55/91: Build-depend on mono-2.0-devel so that we get resgen2, and patch upstream source so that it looks for it before resgen.
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 08:33:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch master
in repository taoframework.
commit 7cb4b2e4d62a32b97a89f3813d9b60cfb85e1851
Author: Sam Hocevar <sam at zoy.org>
Date: Sat Feb 14 09:23:46 2009 +0000
Build-depend on mono-2.0-devel so that we get resgen2, and patch upstream
source so that it looks for it before resgen.
---
debian/control | 2 +-
debian/patches/100_new_mono_executables.diff | 239 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 241 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index e28d4b0..5d57296 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
Build-Depends: debhelper (>= 5), quilt
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, mono-utils, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 0.svn20080206-8), libavformat-dev (>= 0.svn20080206-8), libnunit2.4-cil, libftgl-dev, libfreetype6-dev, l [...]
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, mono-2.0-devel, mono-utils, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 0.svn20080206-8), libavformat-dev (>= 0.svn20080206-8), libnunit2.4-cil, libftgl-dev, lib [...]
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/taoframework/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk?op=log
diff --git a/debian/patches/100_new_mono_executables.diff b/debian/patches/100_new_mono_executables.diff
new file mode 100644
index 0000000..8c8bb3c
--- /dev/null
+++ b/debian/patches/100_new_mono_executables.diff
@@ -0,0 +1,239 @@
+Index: taoframework-2.1.svn20090213/configure
+===================================================================
+--- taoframework-2.1.svn20090213.orig/configure 2009-02-14 10:13:52.000000000 +0100
++++ taoframework-2.1.svn20090213/configure 2009-02-14 10:13:57.000000000 +0100
+@@ -673,10 +673,12 @@
+ MONO_DEPENDENCY_LIBS
+ RUNTIME
+ CSC
++GMCS
+ LIB_PREFIX
+ LIB_SUFFIX
+ GACUTIL
+ RESGEN
++RESGEN1
+ MONODOC_REQUIRED_VERSION
+ MONODOC_DEPENDENCY_CFLAGS
+ MONODOC_DEPENDENCY_LIBS
+@@ -2681,8 +2683,8 @@
+ fi
+
+
+- # Extract the first word of "gmcs", so it can be a program name with args.
+-set dummy gmcs; ac_word=$2
++ # Extract the first word of "csc", so it can be a program name with args.
++set dummy csc; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_CSC+set}" = set; then
+@@ -2722,6 +2724,50 @@
+ fi
+
+
++ if test "$CSC" = "no"; then
++ # Extract the first word of "gmcs", so it can be a program name with args.
++set dummy gmcs; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_GMCS+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GMCS in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMCS="$GMCS" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GMCS="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_GMCS" && ac_cv_path_GMCS="no"
++ ;;
++esac
++fi
++GMCS=$ac_cv_path_GMCS
++if test -n "$GMCS"; then
++ { echo "$as_me:$LINENO: result: $GMCS" >&5
++echo "${ECHO_T}$GMCS" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ CSC="$GMCS"
++ fi
+ if test `uname -s` = "Darwin"; then
+ LIB_PREFIX=
+ LIB_SUFFIX=.dylib
+@@ -2771,15 +2817,14 @@
+ fi
+
+
+- if test x$CSC = "xno"; then
+- { { echo "$as_me:$LINENO: error: You need to install either mono or .Net" >&5
++ RUNTIME=
++ LIB_PREFIX=
++ LIB_SUFFIX=
++fi
++if test x$CSC = "xno"; then
++ { { echo "$as_me:$LINENO: error: You need to install either mono or .Net" >&5
+ echo "$as_me: error: You need to install either mono or .Net" >&2;}
+ { (exit 1); exit 1; }; }
+- else
+- RUNTIME=
+- LIB_PREFIX=
+- LIB_SUFFIX=
+- fi
+ fi
+
+
+@@ -2834,8 +2879,8 @@
+ fi
+
+
+-# Extract the first word of "resgen", so it can be a program name with args.
+-set dummy resgen; ac_word=$2
++# Extract the first word of "resgen2", so it can be a program name with args.
++set dummy resgen2; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_RESGEN+set}" = set; then
+@@ -2874,7 +2919,51 @@
+ fi
+
+
+-if test "x$RESGEN" = "xno" ; then
++if test "$RESGEN" = "no"; then
++ # Extract the first word of "resgen", so it can be a program name with args.
++set dummy resgen; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_RESGEN1+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $RESGEN1 in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_RESGEN1="$RESGEN1" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_RESGEN1="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_RESGEN1" && ac_cv_path_RESGEN1="no"
++ ;;
++esac
++fi
++RESGEN1=$ac_cv_path_RESGEN1
++if test -n "$RESGEN1"; then
++ { echo "$as_me:$LINENO: result: $RESGEN1" >&5
++echo "${ECHO_T}$RESGEN1" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++ RESGEN="$RESGEN1"
++fi
++if test "$RESGEN" = "no" ; then
+ { { echo "$as_me:$LINENO: error: No resgen tool found" >&5
+ echo "$as_me: error: No resgen tool found" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -3882,10 +3971,12 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++GMCS!$GMCS$ac_delim
+ LIB_PREFIX!$LIB_PREFIX$ac_delim
+ LIB_SUFFIX!$LIB_SUFFIX$ac_delim
+ GACUTIL!$GACUTIL$ac_delim
+ RESGEN!$RESGEN$ac_delim
++RESGEN1!$RESGEN1$ac_delim
+ MONODOC_REQUIRED_VERSION!$MONODOC_REQUIRED_VERSION$ac_delim
+ MONODOC_DEPENDENCY_CFLAGS!$MONODOC_DEPENDENCY_CFLAGS$ac_delim
+ MONODOC_DEPENDENCY_LIBS!$MONODOC_DEPENDENCY_LIBS$ac_delim
+@@ -3898,7 +3989,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+Index: taoframework-2.1.svn20090213/configure.ac
+===================================================================
+--- taoframework-2.1.svn20090213.orig/configure.ac 2009-02-14 10:13:52.000000000 +0100
++++ taoframework-2.1.svn20090213/configure.ac 2009-02-14 10:13:59.000000000 +0100
+@@ -27,7 +27,11 @@
+ has_mono=true, has_mono=false)
+ if test "x$has_mono" = "xtrue"; then
+ AC_PATH_PROG(RUNTIME, mono, no)
+- AC_PATH_PROG(CSC, gmcs, no)
++ AC_PATH_PROG(CSC, csc, no)
++ if test "$CSC" = "no"; then
++ AC_PATH_PROG(GMCS, gmcs, no)
++ CSC="$GMCS"
++ fi
+ if test `uname -s` = "Darwin"; then
+ LIB_PREFIX=
+ LIB_SUFFIX=.dylib
+@@ -37,13 +41,12 @@
+ fi
+ else
+ AC_PATH_PROG(CSC, csc.exe, no)
+- if test x$CSC = "xno"; then
+- AC_MSG_ERROR([You need to install either mono or .Net])
+- else
+- RUNTIME=
+- LIB_PREFIX=
+- LIB_SUFFIX=
+- fi
++ RUNTIME=
++ LIB_PREFIX=
++ LIB_SUFFIX=
++fi
++if test x$CSC = "xno"; then
++ AC_MSG_ERROR([You need to install either mono or .Net])
+ fi
+
+ AC_SUBST(LIB_PREFIX)
+@@ -57,8 +60,12 @@
+ fi
+ AC_SUBST(GACUTIL)
+
+-AC_PATH_PROG(RESGEN, resgen)
+-if test "x$RESGEN" = "xno" ; then
++AC_PATH_PROG(RESGEN, resgen2)
++if test "$RESGEN" = "no"; then
++ AC_PATH_PROG(RESGEN1, resgen, no)
++ RESGEN="$RESGEN1"
++fi
++if test "$RESGEN" = "no" ; then
+ AC_MSG_ERROR([No resgen tool found])
+ fi
+ AC_SUBST(RESGEN)
diff --git a/debian/patches/series b/debian/patches/series
index 55bfdcb..8755f4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+100_new_mono_executables.diff
300_proper_dll_config.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git
More information about the Pkg-cli-libs-commits
mailing list