[Pkg-mono-svn-commits] rev 3153 - in mono-tools/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Thu May 17 08:53:39 UTC 2007
Author: slomo
Date: 2007-05-17 08:53:38 +0000 (Thu, 17 May 2007)
New Revision: 3153
Added:
mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
Modified:
mono-tools/trunk/debian/changelog
mono-tools/trunk/debian/control
mono-tools/trunk/debian/mono-tools-gui.install
mono-tools/trunk/debian/patches/00list
mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
Log:
+ debian/patches/03_glade-callbacks-sig.dpatch:
- Dropped, merged upstream.
+ debian/patches/01_use_real_nunit.dpatch:
- Updated.
+ debian/patches/03_mozilla-home.dpatch,
debian/control:
- Use xulrunner instead of Mozilla and GtkHTML.
+ debian/control,
debian/mono-tools-gui.install:
- Add new ilcontrast application.
Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog 2007-05-16 21:51:28 UTC (rev 3152)
+++ mono-tools/trunk/debian/changelog 2007-05-17 08:53:38 UTC (rev 3153)
@@ -2,6 +2,16 @@
* Sebastian 'slomo' Dröge:
+ New upstream release
+ + debian/patches/03_glade-callbacks-sig.dpatch:
+ - Dropped, merged upstream.
+ + debian/patches/01_use_real_nunit.dpatch:
+ - Updated.
+ + debian/patches/03_mozilla-home.dpatch,
+ debian/control:
+ - Use xulrunner instead of Mozilla and GtkHTML.
+ + debian/control,
+ debian/mono-tools-gui.install:
+ - Add new ilcontrast application.
-- Sebastian Dröge <slomo at debian.org> Wed, 16 May 2007 23:50:22 +0200
Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control 2007-05-16 21:51:28 UTC (rev 3152)
+++ mono-tools/trunk/debian/control 2007-05-17 08:53:38 UTC (rev 3153)
@@ -4,7 +4,7 @@
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), libnunit2.2-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgnome2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), monodoc-base (>= 1.1.9)
+Build-Depends-Indep: cli-common-dev (>= 0.4.0), pkg-config, mono-mcs (>= 1.0), mono-gmcs (>= 1.0), libmono-dev (>= 1.0), mono-gac (>= 1.0), libnunit2.2-cil (>= 2.2.0), libgtk2.0-cil (>= 2.0), libgconf2.0-cil (>= 2.0), libglade2.0-cil (>= 2.0), libgecko2.0-cil (>= 0.10), monodoc-base (>= 1.1.9), libxul-dev
Standards-Version: 3.7.2
Package: monodoc-browser
@@ -51,6 +51,7 @@
Description: Various GUI tools for mono
This package contains various GUI tools for use with mono:
- gasnview
+ - ilcontrast
Package: mono-tools-devel
Architecture: all
Modified: mono-tools/trunk/debian/mono-tools-gui.install
===================================================================
--- mono-tools/trunk/debian/mono-tools-gui.install 2007-05-16 21:51:28 UTC (rev 3152)
+++ mono-tools/trunk/debian/mono-tools-gui.install 2007-05-17 08:53:38 UTC (rev 3153)
@@ -1,2 +1,6 @@
debian/tmp/usr/bin/gasnview
debian/tmp/usr/lib/mono/1.0/gasnview.exe
+debian/tmp/usr/bin/ilcontrast
+debian/tmp/usr/lib/ilcontrast
+debian/tmp/usr/share/applications/ilcontrast.desktop
+debian/tmp/usr/share/pixmaps/ilcontrast.png
Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list 2007-05-16 21:51:28 UTC (rev 3152)
+++ mono-tools/trunk/debian/patches/00list 2007-05-17 08:53:38 UTC (rev 3153)
@@ -1,3 +1,3 @@
01_use_real_nunit
02_startup_mono_path
-03_glade-callbacks-sig
+03_mozilla-home.dpatch
Modified: mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch 2007-05-16 21:51:28 UTC (rev 3152)
+++ mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch 2007-05-17 08:53:38 UTC (rev 3153)
@@ -1,13 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_real_nunit.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
@DPATCH@
-diff -urNad mono-tools-1.1.11~/configure.in mono-tools-1.1.11/configure.in
---- mono-tools-1.1.11~/configure.in 2006-04-23 13:24:33.000000000 +0200
-+++ mono-tools-1.1.11/configure.in 2006-04-23 13:25:51.000000000 +0200
+
+--- mono-tools-1.2.4/configure.in.old 2007-05-17 10:39:15.000000000 +0200
++++ mono-tools-1.2.4/configure.in 2007-05-17 10:41:04.000000000 +0200
@@ -30,7 +30,7 @@
AC_SUBST(RUNTIME)
AC_SUBST(RESGEN)
@@ -17,56 +13,64 @@
AC_SUBST(NUNIT_LIBS)
PKG_CHECK_MODULES(MONODOC, monodoc)
-
-diff -urNad mono-tools-1.1.11~/configure mono-tools-1.1.11/configure
---- mono-tools-1.1.11~/configure 2006-04-23 13:24:33.000000000 +0200
-+++ mono-tools-1.1.11/configure 2006-04-23 13:25:44.000000000 +0200
-@@ -2164,23 +2164,23 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for mono-nunit" >&5
--echo $ECHO_N "checking for mono-nunit... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for nunit-2.2" >&5
-+echo $ECHO_N "checking for nunit-2.2... $ECHO_C" >&6
+--- mono-tools-1.2.4/configure.old 2007-05-17 10:39:18.000000000 +0200
++++ mono-tools-1.2.4/configure 2007-05-17 10:41:30.000000000 +0200
+@@ -2795,12 +2795,12 @@
+ pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit-2.2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "nunit-2.2") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit" 2>/dev/null`
++ pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit-2.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -2813,12 +2813,12 @@
+ pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit-2.2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "nunit-2.2") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit" 2>/dev/null`
++ pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit-2.2" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -2837,14 +2837,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono-nunit"`
++ NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nunit-2.2"`
+ else
+- NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit"`
++ NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit-2.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NUNIT_PKG_ERRORS" >&5
-- if $PKG_CONFIG --exists "mono-nunit" ; then
-+ if $PKG_CONFIG --exists "nunit-2.2" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- succeeded=yes
+- { { echo "$as_me:$LINENO: error: Package requirements (mono-nunit) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (nunit-2.2) were not met:
- echo "$as_me:$LINENO: checking NUNIT_CFLAGS" >&5
- echo $ECHO_N "checking NUNIT_CFLAGS... $ECHO_C" >&6
-- NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit"`
-+ NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit-2.2"`
- echo "$as_me:$LINENO: result: $NUNIT_CFLAGS" >&5
- echo "${ECHO_T}$NUNIT_CFLAGS" >&6
+ $NUNIT_PKG_ERRORS
- echo "$as_me:$LINENO: checking NUNIT_LIBS" >&5
- echo $ECHO_N "checking NUNIT_LIBS... $ECHO_C" >&6
-- NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit"`
-+ NUNIT_LIBS=`$PKG_CONFIG --libs "nunit-2.2"`
- echo "$as_me:$LINENO: result: $NUNIT_LIBS" >&5
- echo "${ECHO_T}$NUNIT_LIBS" >&6
- else
-@@ -2188,7 +2188,7 @@
- NUNIT_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
-- NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-nunit"`
-+ NUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nunit-2.2"`
- echo $NUNIT_PKG_ERRORS
- fi
+@@ -2855,7 +2855,7 @@
+ and NUNIT_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 (mono-nunit) were not met:
++echo "$as_me: error: Package requirements (nunit-2.2) were not met:
-@@ -2203,8 +2203,8 @@
- if test $succeeded = yes; then
- :
- else
-- { { echo "$as_me:$LINENO: error: Library requirements (mono-nunit) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (mono-nunit) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+ { { echo "$as_me:$LINENO: error: Library requirements (nunit-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+echo "$as_me: error: Library requirements (nunit-2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
+ $NUNIT_PKG_ERRORS
Added: mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/03_mozilla-home.dpatch (rev 0)
+++ mono-tools/trunk/debian/patches/03_mozilla-home.dpatch 2007-05-17 08:53:38 UTC (rev 3153)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools-1.2.4/configure.in.old 2007-05-17 10:35:26.000000000 +0200
++++ mono-tools-1.2.4/configure.in 2007-05-17 10:35:50.000000000 +0200
+@@ -53,7 +53,7 @@
+
+ if test "x$enable_gecko" = "xyes"; then
+ # get the mozilla home directory
+- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
++ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
+ AC_SUBST(MOZILLA_HOME)
+ fi
+
+--- mono-tools-1.2.4/configure.old 2007-05-17 10:35:31.000000000 +0200
++++ mono-tools-1.2.4/configure 2007-05-17 10:36:47.000000000 +0200
+@@ -3292,7 +3292,7 @@
+
+ if test "x$enable_gecko" = "xyes"; then
+ # get the mozilla home directory
+- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
++ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
+
+ fi
+
Property changes on: mono-tools/trunk/debian/patches/03_mozilla-home.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mono-svn-commits
mailing list