[Pkg-mono-svn-commits] rev 3619 - in mono-tools/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Mon Apr 7 08:30:59 UTC 2008
Author: slomo
Date: 2008-04-07 08:30:59 +0000 (Mon, 07 Apr 2008)
New Revision: 3619
Added:
mono-tools/trunk/debian/patches/04_cecil.dpatch
Removed:
mono-tools/trunk/debian/patches/04_gnome-sharp.patch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/patches/00list
mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
Log:
* TODO: get newer cecil, package gendarme & gui-compare
* New upstream release:
+ debian/patches/04_gnome-sharp.patch:
- Dropped, merged upstream.
+ debian/control:
- Build depend on Cecil.
+ debian/patches/03_mozilla-home.dpatch:
- Updated to apply cleanly again.
+ debian/patches/04_cecil.dpatch:
- Use correct pkg-config filename for cecil.
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2008-04-07 08:15:17 UTC (rev 3618)
+++ mono-tools/trunk/debian/changelog 2008-04-07 08:30:59 UTC (rev 3619)
@@ -1,3 +1,18 @@
+mono-tools (1.9-1) UNRELEASED; urgency=high
+
+ * TODO: get newer cecil, package gendarme & gui-compare
+ * New upstream release:
+ + debian/patches/04_gnome-sharp.patch:
+ - Dropped, merged upstream.
+ + debian/control:
+ - Build depend on Cecil.
+ + debian/patches/03_mozilla-home.dpatch:
+ - Updated to apply cleanly again.
+ + debian/patches/04_cecil.dpatch:
+ - Use correct pkg-config filename for cecil.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 07 Apr 2008 10:19:44 +0200
+
mono-tools (1.2.6-4) unstable; urgency=low
* debian/control,
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2008-04-07 08:15:17 UTC (rev 3618)
+++ mono-tools/trunk/debian/control 2008-04-07 08:30:59 UTC (rev 3619)
@@ -4,7 +4,7 @@
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2.6-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), libgnome2.0-cil (>= 2.0), libgtkhtml3.16-cil, monodoc-base (>= 1.1.9), libxul-dev
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), mono-1.0-devel, libnunit2.2.6-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), libgnome2.0-cil (>= 2.0), libgtkhtml3.16-cil, monodoc-base (>= 1.1.9), libxul-dev, libmono-cecil0.5-cil
Standards-Version: 3.7.3
Package: monodoc-browser
Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list 2008-04-07 08:15:17 UTC (rev 3618)
+++ mono-tools/trunk/debian/patches/00list 2008-04-07 08:30:59 UTC (rev 3619)
@@ -1,4 +1,4 @@
01_use_real_nunit
02_startup_mono_path
03_mozilla-home.dpatch
-04_gnome-sharp.patch
+04_cecil.dpatch
Modified: mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/03_mozilla-home.dpatch 2008-04-07 08:15:17 UTC (rev 3618)
+++ mono-tools/trunk/debian/patches/03_mozilla-home.dpatch 2008-04-07 08:30:59 UTC (rev 3619)
@@ -47,33 +47,3 @@
fi
if [ -n $LD_LIBRARY_PATH ]; then
---- mono-tools-1.2.4/docbrowser/monodoc.in.old 2007-12-14 11:03:43.000000000 +0100
-+++ mono-tools-1.2.4/docbrowser/monodoc.in 2007-12-14 11:04:51.000000000 +0100
-@@ -77,16 +77,20 @@
- elif test x at MOZILLA_HOME@ != x; then
- if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
- elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
- MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then
- MOZILLA_FIVE_HOME=`getdirectory xulrunner`
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
- elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2)
-+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
- fi
-
- if [ -n $LD_LIBRARY_PATH ]; then
-@@ -98,5 +102,4 @@
- export MOZILLA_HOME
- export LD_LIBRARY_PATH
-
--# force '--no-gecko' because xulrunner is crashing on some browsers (bug #341815)
--exec @RUNTIME@ $monodocdir/browser.exe --no-gecko $OPTIONS "$@" $REST
-+exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST
Added: mono-tools/trunk/debian/patches/04_cecil.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_cecil.dpatch (rev 0)
+++ mono-tools/trunk/debian/patches/04_cecil.dpatch 2008-04-07 08:30:59 UTC (rev 3619)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools-1.9/configure.in.old 2008-04-07 10:23:25.000000000 +0200
++++ mono-tools-1.9/configure.in 2008-04-07 10:23:43.000000000 +0200
+@@ -71,13 +71,13 @@
+ dnl
+ dnl I hate PKG_CONFIG_MODULES, that is for the weak
+ dnl
+-if pkg-config --modversion cecil>/dev/null; then
+-AC_MSG_RESULT("Found cecil.pc")
++if pkg-config --modversion mono-cecil>/dev/null; then
++AC_MSG_RESULT("Found mono-cecil.pc")
+ else
+-AC_MSG_ERROR([You are missing Cecil (cecil.pc for packageconfig) required for gui-compare])
++AC_MSG_ERROR([You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare])
+ fi
+
+-CECIL_ASM=`pkg-config --variable=Libraries cecil`
++CECIL_ASM=`pkg-config --variable=Libraries mono-cecil`
+ AC_SUBST(CECIL_ASM)
+
+ dnl Intl
+--- mono-tools-1.9/configure.old 2008-04-07 10:27:53.000000000 +0200
++++ mono-tools-1.9/configure 2008-04-07 10:28:26.000000000 +0200
+@@ -3511,16 +3511,16 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-if pkg-config --modversion cecil>/dev/null; then
+-{ echo "$as_me:$LINENO: result: \"Found cecil.pc\"" >&5
+-echo "${ECHO_T}\"Found cecil.pc\"" >&6; }
++if pkg-config --modversion mono-cecil>/dev/null; then
++{ echo "$as_me:$LINENO: result: \"Found mono-cecil.pc\"" >&5
++echo "${ECHO_T}\"Found mono-cecil.pc\"" >&6; }
+ else
+-{ { echo "$as_me:$LINENO: error: You are missing Cecil (cecil.pc for packageconfig) required for gui-compare" >&5
+-echo "$as_me: error: You are missing Cecil (cecil.pc for packageconfig) required for gui-compare" >&2;}
++{ { echo "$as_me:$LINENO: error: You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare" >&5
++echo "$as_me: error: You are missing Cecil (mono-cecil.pc for packageconfig) required for gui-compare" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+-CECIL_ASM=`pkg-config --variable=Libraries cecil`
++CECIL_ASM=`pkg-config --variable=Libraries mono-cecil`
+
+
+ GETTEXT_PACKAGE=mono-tools
Deleted: mono-tools/trunk/debian/patches/04_gnome-sharp.patch
===================================================================
--- mono-tools/trunk/debian/patches/04_gnome-sharp.patch 2008-04-07 08:15:17 UTC (rev 3618)
+++ mono-tools/trunk/debian/patches/04_gnome-sharp.patch 2008-04-07 08:30:59 UTC (rev 3619)
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono-tools/configure.in.old 2008-03-20 15:59:48.000000000 +0100
-+++ mono-tools/configure.in 2008-03-20 15:59:58.000000000 +0100
-@@ -37,7 +37,7 @@
- AC_SUBST(MONODOC_LIBS)
-
-
--PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0)
-+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0)
- #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
- AC_SUBST(GTK_SHARP_LIBS)
-
---- mono-tools/configure.old 2008-03-20 15:59:51.000000000 +0100
-+++ mono-tools/configure 2008-03-20 16:00:35.000000000 +0100
-@@ -3062,12 +3062,12 @@
- pkg_cv_GTK_SHARP_CFLAGS="$GTK_SHARP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
-+ pkg_cv_GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3080,12 +3080,12 @@
- pkg_cv_GTK_SHARP_LIBS="$GTK_SHARP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" 2>/dev/null`
-+ pkg_cv_GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -3104,14 +3104,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
-+ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0"`
- else
-- GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
-+ GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTK_SHARP_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0) were not met:
-
- $GTK_SHARP_PKG_ERRORS
-
-@@ -3122,7 +3122,7 @@
- and GTK_SHARP_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) were not met:
-+echo "$as_me: error: Package requirements (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 gnome-sharp-2.0) were not met:
-
- $GTK_SHARP_PKG_ERRORS
-
More information about the Pkg-mono-svn-commits
mailing list