[Pkg-mono-svn-commits] rev 2795 - in mono-tools/tags: . 1.1.11-5 1.1.11-5/debian 1.1.11-5/debian/patches

Sebastian Dröge slomo-guest at costa.debian.org
Tue Oct 17 18:46:54 UTC 2006


Author: slomo-guest
Date: 2006-10-17 18:46:53 +0000 (Tue, 17 Oct 2006)
New Revision: 2795

Added:
   mono-tools/tags/1.1.11-5/
   mono-tools/tags/1.1.11-5/debian/
   mono-tools/tags/1.1.11-5/debian/changelog
   mono-tools/tags/1.1.11-5/debian/compat
   mono-tools/tags/1.1.11-5/debian/control
   mono-tools/tags/1.1.11-5/debian/copyright
   mono-tools/tags/1.1.11-5/debian/gnunit.install
   mono-tools/tags/1.1.11-5/debian/gnunit2.install
   mono-tools/tags/1.1.11-5/debian/mono-tools-locales.install
   mono-tools/tags/1.1.11-5/debian/monodoc-browser.docs
   mono-tools/tags/1.1.11-5/debian/monodoc-browser.install
   mono-tools/tags/1.1.11-5/debian/monodoc-browser.menu
   mono-tools/tags/1.1.11-5/debian/monodoc-browser.postinst
   mono-tools/tags/1.1.11-5/debian/monodoc-browser.postrm
   mono-tools/tags/1.1.11-5/debian/patches/
   mono-tools/tags/1.1.11-5/debian/patches/00list
   mono-tools/tags/1.1.11-5/debian/patches/01_use_real_nunit.dpatch
   mono-tools/tags/1.1.11-5/debian/patches/02_startup_mono_path.dpatch
   mono-tools/tags/1.1.11-5/debian/patches/03_gtk-sharp2.dpatch
   mono-tools/tags/1.1.11-5/debian/patches/04_glade-callbacks.dpatch
   mono-tools/tags/1.1.11-5/debian/patches/05_empty-search.dpatch
   mono-tools/tags/1.1.11-5/debian/rules
   mono-tools/tags/1.1.11-5/debian/watch
Log:
* tag mono-tools 1.1.11-5


Added: mono-tools/tags/1.1.11-5/debian/changelog
===================================================================
--- mono-tools/tags/1.1.11-5/debian/changelog	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/changelog	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,121 @@
+mono-tools (1.1.11-5) unstable; urgency=low
+
+  * Sebastian 'slomo' Dröge:
+    + debian/patches/04_glade-callbacks.dpatch:
+      - Fix the signatures of the glade callback handlers.
+        Fixes various crashes in monodoc-browser.
+        Patch from upstream SVN (r63562)
+    + debian/patches/05_empty-search.dpatch:
+      - Don't crash when searching with an empty string.
+        Patch from upstream SVN (r61357)
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Tue,  3 Oct 2006 13:00:10 +0200
+
+mono-tools (1.1.11-4) unstable; urgency=low
+
+  * Sebastian 'slomo' Dröge
+    + Acknowledge NMU (Closes: #363586)
+    + debian/control:
+      - Add myself to Uploaders
+      - Build-Depend on the Gtk#2 variants of everything
+      - remove the versioned Depends of monodoc-browser on libgnome-cil as
+        this is not necessary anymore with libgnome2.0-cil
+      - bump Standards-Version to 3.7.2
+      - move dpatch from Build-Depends-Indep to Build-Depends
+    + debian/patches/02_fix_buildsystem.dpatch:
+      - dropped as it wasn't used anymore since ages
+    + debian/patches/03_gtk-sharp2.dpatch:
+      - build everything against Gtk#2
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun,  9 Jul 2006 02:56:21 +0200
+
+mono-tools (1.1.11-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Let monodoc-browser depend on libgnome-cil (>= 1:1.0.10-5), so we are
+    sure we get a version that pulls in a non-segfaulting libgtkhtml3.8-15.
+    (Closes: #363586)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sun, 11 Jun 2006 13:46:25 +0200
+
+mono-tools (1.1.11-3) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + Rebuild against libnunit2.2-cil 2.2.0-3
+    + Updated cli-common build-dep to cli-common-dev >= 0.4.0
+    + Moved debhelper build-dep-indep to build-dep.
+    + Updated FSF's snail-mail address in debian/copyright.
+    + Added binary-arch target to debian/rules.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 30 Apr 2006 00:58:32 +0200
+
+mono-tools (1.1.11-2) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + Rebuild against Mono 1.1.13.6-3
+    + debian/control:
+      - Updated build-deps for Mono 1.1.13.6-2 split. (Closes: #363651, #351651)
+    + debian/patches/01_use_real_nunit.dpatch:
+      - Updated to use nunit-2.2 instead of nunit.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 23 Apr 2006 13:21:01 +0200
+
+mono-tools (1.1.11-1) unstable; urgency=low
+
+  * New upstream release
+    + monodoc.desktop contains now proper Exec line (Closes: #341287)
+  * Mirco 'meebey' Bauer
+    + Split gnunit2 into own package because of Mono class library 2.0
+      dependency.
+    + debian/control:
+      - Bumped debhelper build-dep to >= 5.0.0
+      - Changed Build-Depends to Build-Depends-Indep
+    + debian/compat:
+      - Changed to 5.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 15 Jan 2006 14:28:43 +0100
+
+mono-tools (1.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer
+    + debian/control:
+      - Added "Replaces: monodoc-base (<< 1.1.9)" to monodoc-browser for smooth
+        upgrades from 1.0.x versions.
+    + debian/monodoc-browser.install:
+      - Added GtkHtmlHtmlRender.dll, new renderer for MonoDoc Browser.
+      - Removed GeckoHtmlRender.dll, it's less stable than GtkHTML.
+    + Removed 02_fix_buildsystem.dpatch, already applied upstream.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Tue, 15 Nov 2005 15:54:49 +0100
+
+mono-tools (1.1.9-3) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + debian/control:
+      - Added mono-mcs and mono-gmcs to build-depends.
+    + debian/rules:
+      - Clean target tries to be more clean now, "make clean" isn't.
+      - Added clean-patched target.
+    + debian/patches/02_fix_buildsystem.dpatch:
+      - Fixes "make distclean"
+        (thanks to Ingo Saitz <ingo at debian.org> for the patch)
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 12 Oct 2005 10:55:29 +0200
+
+mono-tools (1.1.9-2) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + debian/control:
+      - Added dpatch to build-depends. (Closes: #331610)
+    + debian/patches/01_use_real_nunit.dpatch:
+      - Updated to use nunit.pc instead of nunit-core.pc
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Wed, 5 Oct 2005 10:25:47 +0200
+
+mono-tools (1.1.9-1) unstable; urgency=low
+
+  * Mirco 'meebey' Bauer
+    + Initial Release.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 25 Sep 2005 19:40:02 +0200

Added: mono-tools/tags/1.1.11-5/debian/compat
===================================================================
--- mono-tools/tags/1.1.11-5/debian/compat	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/compat	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1 @@
+5

Added: mono-tools/tags/1.1.11-5/debian/control
===================================================================
--- mono-tools/tags/1.1.11-5/debian/control	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/control	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,45 @@
+Source: mono-tools
+Section: devel
+Priority: optional
+Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
+Uploaders: Mirco Bauer <meebey at meebey.net>, Sebastian Dröge <slomo at ubuntu.com>
+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)
+Standards-Version: 3.7.2
+
+Package: monodoc-browser
+Provides: monodoc-viewer
+Replaces: monodoc-base (<< 1.1.9)
+Architecture: all
+Recommends: lynx
+Depends: ${cli:Depends}, monodoc-manual
+Description: MonoDoc GTK+ based viewer
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
+ This package contains the GTK+ based viewer of the Mono documentation.
+
+Package: gnunit
+Architecture: all
+Depends: ${cli:Depends}
+Description: frontend for running NUnit 2 test suites
+ gnunit (formerly known as nunit-gtk) is a frontend for NUnit which uses
+ the Mono class library version 1.0.
+ .
+ NUnit is a unit testing framework for all .NET languages. It serves the
+ same purpose as JUnit does in the Java world. It supports test
+ categories, testing for exceptions and writing test results in plain
+ text or XML.
+
+Package: gnunit2
+Architecture: all
+Depends: ${cli:Depends}
+Description: frontend for running NUnit 2 test suites
+ gnunit2 (formerly known as nunit-gtk) is a frontend for NUnit which uses
+ the Mono class library version 2.0.
+ .
+ NUnit is a unit testing framework for all .NET languages. It serves the
+ same purpose as JUnit does in the Java world. It supports test
+ categories, testing for exceptions and writing test results in plain
+ text or XML.

Added: mono-tools/tags/1.1.11-5/debian/copyright
===================================================================
--- mono-tools/tags/1.1.11-5/debian/copyright	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/copyright	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,27 @@
+This package was debianized by Mirco Bauer <meebey at meebey.net>
+
+It was downloaded from http://go-mono.com/sources/
+
+Authors:
+Jonathan Pryor <jonpryor at vt.edu>
+Martin Baulig <martin at ximian.com>
+Miguel de Icaza <miguel at ximian.com>
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.

Added: mono-tools/tags/1.1.11-5/debian/gnunit.install
===================================================================
--- mono-tools/tags/1.1.11-5/debian/gnunit.install	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/gnunit.install	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/gnunit
+debian/tmp/usr/bin/gasnview
+debian/tmp/usr/lib/mono/1.0/gasnview.exe
+debian/tmp/usr/lib/mono/1.0/gnunit.exe

Added: mono-tools/tags/1.1.11-5/debian/gnunit2.install
===================================================================
--- mono-tools/tags/1.1.11-5/debian/gnunit2.install	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/gnunit2.install	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/gnunit2
+debian/tmp/usr/lib/mono/2.0/gnunit2.exe

Added: mono-tools/tags/1.1.11-5/debian/mono-tools-locales.install
===================================================================
--- mono-tools/tags/1.1.11-5/debian/mono-tools-locales.install	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/mono-tools-locales.install	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1 @@
+debian/tmp/usr/share/locale/

Added: mono-tools/tags/1.1.11-5/debian/monodoc-browser.docs
===================================================================
--- mono-tools/tags/1.1.11-5/debian/monodoc-browser.docs	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/monodoc-browser.docs	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1 @@
+docbrowser/ChangeLog

Added: mono-tools/tags/1.1.11-5/debian/monodoc-browser.install
===================================================================
--- mono-tools/tags/1.1.11-5/debian/monodoc-browser.install	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/monodoc-browser.install	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/monodoc
+debian/tmp/usr/lib/monodoc/browser.exe
+debian/tmp/usr/lib/monodoc/GtkHtmlHtmlRender.dll
+debian/tmp/usr/share/pixmaps/monodoc.png
+debian/tmp/usr/share/applications/monodoc.desktop

Added: mono-tools/tags/1.1.11-5/debian/monodoc-browser.menu
===================================================================
--- mono-tools/tags/1.1.11-5/debian/monodoc-browser.menu	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/monodoc-browser.menu	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,3 @@
+?package(monodoc-browser):needs="X11" section="Apps/Programming"\
+  title="Monodoc" command="/usr/bin/monodoc"\
+  icon="/usr/share/pixmaps/monodoc.png"

Added: mono-tools/tags/1.1.11-5/debian/monodoc-browser.postinst
===================================================================
--- mono-tools/tags/1.1.11-5/debian/monodoc-browser.postinst	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/monodoc-browser.postinst	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+echo "generating monodoc index..."
+monodoc --make-index > /dev/null
+echo "generating monodoc search index... (this can take a while)"
+monodoc --make-search-index > /dev/null
+
+#DEBHELPER#

Added: mono-tools/tags/1.1.11-5/debian/monodoc-browser.postrm
===================================================================
--- mono-tools/tags/1.1.11-5/debian/monodoc-browser.postrm	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/monodoc-browser.postrm	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+if [ -f /usr/lib/monodoc/monodoc.index ]; then
+	rm /usr/lib/monodoc/monodoc.index
+	rmdir /usr/lib/monodoc 2> /dev/null || true
+fi
+
+if [ -d /usr/lib/monodoc/search_index ]; then
+	rm -r /usr/lib/monodoc/search_index
+	rmdir /usr/lib/monodoc 2> /dev/null || true
+fi
+
+#DEBHELPER#
+
+exit 0

Added: mono-tools/tags/1.1.11-5/debian/patches/00list
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/00list	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/00list	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,5 @@
+01_use_real_nunit
+02_startup_mono_path
+03_gtk-sharp2
+04_glade-callbacks.dpatch
+05_empty-search.dpatch

Added: mono-tools/tags/1.1.11-5/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/01_use_real_nunit.dpatch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/01_use_real_nunit.dpatch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,72 @@
+#! /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.
+
+ at 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
+@@ -30,7 +30,7 @@
+ AC_SUBST(RUNTIME)
+ AC_SUBST(RESGEN)
+ 
+-PKG_CHECK_MODULES(NUNIT, mono-nunit)
++PKG_CHECK_MODULES(NUNIT, nunit-2.2)
+ 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
+ 
+-        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: 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
+ 
+             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
+ 
+@@ -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
+ 

Added: mono-tools/tags/1.1.11-5/debian/patches/02_startup_mono_path.dpatch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/02_startup_mono_path.dpatch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/02_startup_mono_path.dpatch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## startup_mono_path.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-tools-1.1.9~/gnunit/src/script.in mono-tools-1.1.9/gnunit/src/script.in
+--- mono-tools-1.1.9~/gnunit/src/script.in	2005-05-09 01:27:19.000000000 +0200
++++ mono-tools-1.1.9/gnunit/src/script.in	2005-09-25 21:42:06.000000000 +0200
+@@ -1,2 +1,3 @@
+ #!/bin/sh
++export MONO_PATH=/usr/lib/nunit:$MONO_PATH
+ exec @RUNTIME@ @mono_one_instdir@/@exe_file@ "$@"
+diff -urNad mono-tools-1.1.9~/gnunit/src/script2.in mono-tools-1.1.9/gnunit/src/script2.in
+--- mono-tools-1.1.9~/gnunit/src/script2.in	2005-05-09 01:27:19.000000000 +0200
++++ mono-tools-1.1.9/gnunit/src/script2.in	2005-09-25 21:42:10.000000000 +0200
+@@ -1,2 +1,3 @@
+ #!/bin/sh
++export MONO_PATH=/usr/lib/nunit:$MONO_PATH
+ exec @RUNTIME@ @mono_two_instdir@/@exe_file@ "$@"

Added: mono-tools/tags/1.1.11-5/debian/patches/03_gtk-sharp2.dpatch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/03_gtk-sharp2.dpatch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/03_gtk-sharp2.dpatch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,168 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/configure.in.old	2006-02-23 20:31:16.598094984 +0100
++++ mono-tools/configure.in	2006-02-23 20:35:53.522996000 +0100
+@@ -38,22 +38,22 @@
+ 
+ 
+ #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0)
+-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
++PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0)
+ AC_SUBST(GTK_SHARP_LIBS)
+ 
+ 
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp, enable_gtkhtml=yes, enable_gtkhtml=no)
++PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
+ AC_SUBST(GTKHTML_SHARP_LIBS)
+ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
+ 
+ 
+-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp = 0.6, enable_gecko=yes, enable_gecko=no)
++PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= 0.6, enable_gecko=yes, enable_gecko=no)
+ AC_SUBST(GECKO_SHARP_LIBS)
+ AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
+ 
+ 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 firefox-gtkmozembed`"
+    AC_SUBST(MOZILLA_HOME)
+ fi
+ 
+--- mono-tools/configure.old	2006-02-23 20:31:19.705622568 +0100
++++ mono-tools/configure	2006-02-23 20:35:59.262123520 +0100
+@@ -2366,23 +2366,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 gtk-sharp glade-sharp gconf-sharp" >&5
+-echo $ECHO_N "checking for gtk-sharp glade-sharp gconf-sharp... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" >&5
++echo $ECHO_N "checking for gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "gtk-sharp glade-sharp gconf-sharp" ; then
++        if $PKG_CONFIG --exists "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking GTK_SHARP_CFLAGS" >&5
+ echo $ECHO_N "checking GTK_SHARP_CFLAGS... $ECHO_C" >&6
+-            GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp glade-sharp gconf-sharp"`
++            GTK_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
+             echo "$as_me:$LINENO: result: $GTK_SHARP_CFLAGS" >&5
+ echo "${ECHO_T}$GTK_SHARP_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking GTK_SHARP_LIBS" >&5
+ echo $ECHO_N "checking GTK_SHARP_LIBS... $ECHO_C" >&6
+-            GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp glade-sharp gconf-sharp"`
++            GTK_SHARP_LIBS=`$PKG_CONFIG --libs "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
+             echo "$as_me:$LINENO: result: $GTK_SHARP_LIBS" >&5
+ echo "${ECHO_T}$GTK_SHARP_LIBS" >&6
+         else
+@@ -2390,7 +2390,7 @@
+             GTK_SHARP_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp glade-sharp gconf-sharp"`
++            GTK_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0"`
+             echo $GTK_SHARP_PKG_ERRORS
+         fi
+ 
+@@ -2405,8 +2405,8 @@
+   if test $succeeded = yes; then
+      :
+   else
+-     { { echo "$as_me:$LINENO: error: Library requirements (gtk-sharp glade-sharp gconf-sharp) 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 (gtk-sharp glade-sharp gconf-sharp) 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 (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) 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 (gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) 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
+ 
+@@ -2467,23 +2467,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 gtkhtml-sharp" >&5
++        echo "$as_me:$LINENO: checking for gtkhtml-sharp-2.0" >&5
+ echo $ECHO_N "checking for gtkhtml-sharp... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "gtkhtml-sharp" ; then
++        if $PKG_CONFIG --exists "gtkhtml-sharp-2.0" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking GTKHTML_SHARP_CFLAGS" >&5
+ echo $ECHO_N "checking GTKHTML_SHARP_CFLAGS... $ECHO_C" >&6
+-            GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-sharp"`
++            GTKHTML_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gtkhtml-sharp-2.0"`
+             echo "$as_me:$LINENO: result: $GTKHTML_SHARP_CFLAGS" >&5
+ echo "${ECHO_T}$GTKHTML_SHARP_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking GTKHTML_SHARP_LIBS" >&5
+ echo $ECHO_N "checking GTKHTML_SHARP_LIBS... $ECHO_C" >&6
+-            GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "gtkhtml-sharp"`
++            GTKHTML_SHARP_LIBS=`$PKG_CONFIG --libs "gtkhtml-sharp-2.0"`
+             echo "$as_me:$LINENO: result: $GTKHTML_SHARP_LIBS" >&5
+ echo "${ECHO_T}$GTKHTML_SHARP_LIBS" >&6
+         else
+@@ -2491,7 +2491,7 @@
+             GTKHTML_SHARP_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkhtml-sharp"`
++            GTKHTML_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkhtml-sharp-2.0"`
+ 
+         fi
+ 
+@@ -2576,23 +2576,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 gecko-sharp = 0.6" >&5
+-echo $ECHO_N "checking for gecko-sharp = 0.6... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for gecko-sharp-2.0 >= 0.6" >&5
++echo $ECHO_N "checking for gecko-sharp-2.0 >= 0.6... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "gecko-sharp = 0.6" ; then
++        if $PKG_CONFIG --exists "gecko-sharp-2.0 >= 0.6" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking GECKO_SHARP_CFLAGS" >&5
+ echo $ECHO_N "checking GECKO_SHARP_CFLAGS... $ECHO_C" >&6
+-            GECKO_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gecko-sharp = 0.6"`
++            GECKO_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gecko-sharp-2.0 >= 0.6"`
+             echo "$as_me:$LINENO: result: $GECKO_SHARP_CFLAGS" >&5
+ echo "${ECHO_T}$GECKO_SHARP_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking GECKO_SHARP_LIBS" >&5
+ echo $ECHO_N "checking GECKO_SHARP_LIBS... $ECHO_C" >&6
+-            GECKO_SHARP_LIBS=`$PKG_CONFIG --libs "gecko-sharp = 0.6"`
++            GECKO_SHARP_LIBS=`$PKG_CONFIG --libs "gecko-sharp-2.0 >= 0.6"`
+             echo "$as_me:$LINENO: result: $GECKO_SHARP_LIBS" >&5
+ echo "${ECHO_T}$GECKO_SHARP_LIBS" >&6
+         else
+@@ -2600,7 +2600,7 @@
+             GECKO_SHARP_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            GECKO_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gecko-sharp = 0.6"`
++            GECKO_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gecko-sharp-2.0 >= 0.6"`
+ 
+         fi
+ 
+@@ -2632,7 +2632,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 firefox-gtkmozembed`"
+ 
+ fi
+ 

Added: mono-tools/tags/1.1.11-5/debian/patches/04_glade-callbacks.dpatch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/04_glade-callbacks.dpatch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/04_glade-callbacks.dpatch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/docbrowser/browser.cs	2006/06/01 07:01:16	61357
++++ mono-tools/docbrowser/browser.cs	2006/08/09 20:35:33	63562
+@@ -944,7 +944,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+                         AboutBox = null;
+ 		}
+@@ -1204,7 +1204,7 @@
+ 		//
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+ 			config_wizard = null;
+ 		}
+@@ -1361,7 +1361,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+                         NewCommentBox = null;
+ 		}
+@@ -1406,7 +1406,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete(object sender, EventArgs a)
++		void OnDelete(object sender, DeleteEventArgs a)
+ 		{
+                         LookupBox = null;
+ 		}
+
+--- mono-tools/docbrowser/GtkHtmlHtmlRender.cs	2005/10/27 16:17:18	52292
++++ mono-tools/docbrowser/GtkHtmlHtmlRender.cs	2006/08/09 20:35:33	63562
+@@ -108,13 +108,13 @@
+ 
+ 		string Caption = "Monodoc Printing";
+ 
+-		PrintJob pj = new PrintJob (PrintConfig.Default ());
++		Gnome.PrintJob pj = new Gnome.PrintJob (PrintConfig.Default ());
+ 		PrintDialog dialog = new PrintDialog (pj, Caption, 0);
+ 
+ 		Gtk.HTML gtk_html = new Gtk.HTML (Html);
+ 		gtk_html.PrintSetMaster (pj);
+ 			
+-		PrintContext ctx = pj.Context;
++		Gnome.PrintContext ctx = pj.Context;
+ 		gtk_html.Print (ctx);
+ 
+ 		pj.Close ();
+
+
+--- mono-tools/docbrowser/GeckoHtmlRender.cs	2005/10/27 18:53:57	52296
++++ mono-tools/docbrowser/GeckoHtmlRender.cs	2006/08/09 20:35:33	63562
+@@ -193,13 +193,13 @@
+ #else
+ 		string Caption = "Monodoc Printing";
+ 
+-		PrintJob pj = new PrintJob (PrintConfig.Default ());
++		Gnome.PrintJob pj = new Gnome.PrintJob (PrintConfig.Default ());
+ 		PrintDialog dialog = new PrintDialog (pj, Caption, 0);
+ 
+ 		Gtk.HTML gtk_html = new Gtk.HTML (Html);
+ 		gtk_html.PrintSetMaster (pj);
+ 			
+-		PrintContext ctx = pj.Context;
++		Gnome.PrintContext ctx = pj.Context;
+ 		gtk_html.Print (ctx);
+ 
+ 		pj.Close ();
+

Added: mono-tools/tags/1.1.11-5/debian/patches/05_empty-search.dpatch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/patches/05_empty-search.dpatch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/patches/05_empty-search.dpatch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/docbrowser/browser.cs	2005/11/20 08:13:04	53285
++++ mono-tools/docbrowser/browser.cs	2006/06/01 07:01:16	61357
+@@ -399,9 +399,11 @@
+ 	// 
+ 	void OnSearchActivated (object sender, EventArgs a)
+ 	{
++		string term = search_term.Text;
++		if (term == "")
++			return; //Search cannot handle empty string
+ 		search_tree.Model = null;
+ 		search_term.Editable = false;
+-		string term = search_term.Text;
+ 		//search in the index
+ 		Result r = search_index.Search (term);
+ 		if (r == null)
+

Added: mono-tools/tags/1.1.11-5/debian/rules
===================================================================
--- mono-tools/tags/1.1.11-5/debian/rules	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/rules	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,57 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+export MONO_SHARED_DIR=$(CURDIR)
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+build-stamp: patch
+	dh_testdir
+	./configure --prefix=/usr
+	$(MAKE)
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	-$(MAKE) clean
+	# make clean is everything but clean
+	#find -name "*.exe*" -or -name "*.dll*" | xargs rm -f
+	# using 02_fix_buildsystem.dpatch now for this task
+	rm -rf $$MONO_SHARED_DIR/.wapi
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs chmod -x
+	cd debian && find -type f -name "*.exe" | xargs chmod +x
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_movefiles
+	dh_link
+	dh_install
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installmenu
+	dh_installman
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_clideps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch:
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install


Property changes on: mono-tools/tags/1.1.11-5/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: mono-tools/tags/1.1.11-5/debian/watch
===================================================================
--- mono-tools/tags/1.1.11-5/debian/watch	                        (rev 0)
+++ mono-tools/tags/1.1.11-5/debian/watch	2006-10-17 18:46:53 UTC (rev 2795)
@@ -0,0 +1,2 @@
+version=2
+http://go-mono.com/sources/ .+/mono-tools-([\d+\.]+)\.tar\.gz




More information about the Pkg-mono-svn-commits mailing list