[Pkg-mono-svn-commits] rev 2071 - in mono-tools/trunk/debian: . patches

Mirco Bauer meebey-guest at costa.debian.org
Wed Oct 12 13:41:26 UTC 2005 

Author: meebey-guest
Date: 2005-10-12 13:41:25 +0000 (Wed, 12 Oct 2005)
New Revision: 2071

Added:
   mono-tools/trunk/debian/patches/02_fix_buildsystem.dpatch
Modified:
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/patches/00list
   mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
   mono-tools/trunk/debian/rules
Log:
- 1.1.9-3 release



Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2005-10-10 12:40:46 UTC (rev 2070)
+++ mono-tools/trunk/debian/changelog	2005-10-12 13:41:25 UTC (rev 2071)
@@ -5,8 +5,12 @@
       - 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>  Mon, 10 Oct 2005 10:04:27 +0200
+ -- 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
 

Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list	2005-10-10 12:40:46 UTC (rev 2070)
+++ mono-tools/trunk/debian/patches/00list	2005-10-12 13:41:25 UTC (rev 2071)
@@ -1,2 +1,3 @@
 01_use_real_nunit
+02_fix_buildsystem
 startup_mono_path

Modified: mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch	2005-10-10 12:40:46 UTC (rev 2070)
+++ mono-tools/trunk/debian/patches/01_use_real_nunit.dpatch	2005-10-12 13:41:25 UTC (rev 2071)
@@ -5,9 +5,22 @@
 ## DP: No description.
 
 @DPATCH@
+diff -urNad mono-tools-1.1.9~/configure.in mono-tools-1.1.9/configure.in
+--- mono-tools-1.1.9~/configure.in	2005-09-08 21:30:49.000000000 +0200
++++ mono-tools-1.1.9/configure.in	2005-10-12 11:20:14.000000000 +0200
+@@ -30,7 +30,7 @@
+ AC_SUBST(RUNTIME)
+ AC_SUBST(RESGEN)
+ 
+-PKG_CHECK_MODULES(NUNIT, mono-nunit)
++PKG_CHECK_MODULES(NUNIT, nunit)
+ AC_SUBST(NUNIT_LIBS)
+ 
+ #PKG_CHECK_MODULES(GTK_SHARP, glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0 gtkhtml-sharp-2.0, enable_gtks=yes, enable_gtks=no)
+
 diff -urNad mono-tools-1.1.9~/configure mono-tools-1.1.9/configure
 --- mono-tools-1.1.9~/configure	2005-09-09 04:13:34.000000000 +0200
-+++ mono-tools-1.1.9/configure	2005-10-05 10:24:21.000000000 +0200
++++ mono-tools-1.1.9/configure	2005-10-12 11:19:35.000000000 +0200
 @@ -2164,23 +2164,23 @@
    else
       PKG_CONFIG_MIN_VERSION=0.9.0
@@ -57,3 +70,4 @@
     { (exit 1); exit 1; }; }
    fi
  
+ 
\ No newline at end of file

Added: mono-tools/trunk/debian/patches/02_fix_buildsystem.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/02_fix_buildsystem.dpatch	2005-10-10 12:40:46 UTC (rev 2070)
+++ mono-tools/trunk/debian/patches/02_fix_buildsystem.dpatch	2005-10-12 13:41:25 UTC (rev 2071)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_buildsystem.dpatch by Ingo Saitz <ingo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-tools-1.1.9~/docbrowser/Makefile.am mono-tools-1.1.9/docbrowser/Makefile.am
+--- mono-tools-1.1.9~/docbrowser/Makefile.am	2005-09-08 21:30:49.000000000 +0200
++++ mono-tools-1.1.9/docbrowser/Makefile.am	2005-10-12 12:05:16.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ 
+ if ENABLE_GECKO
+-CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb GeckoHtmlRender.dll 
++CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb GeckoHtmlRender.dll GeckoHtmlRender.dll.mdb 
+ monodoc_DATA = browser.exe GeckoHtmlRender.dll 
+ else
+ CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb 
+@@ -11,7 +11,7 @@
+ endif
+ 
+ 
+-DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc.in
++DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop
+ 
+ bin_SCRIPTS = monodoc
+ 
+diff -urNad mono-tools-1.1.9~/docbrowser/Makefile.in mono-tools-1.1.9/docbrowser/Makefile.in
+--- mono-tools-1.1.9~/docbrowser/Makefile.in	2005-09-09 04:13:32.000000000 +0200
++++ mono-tools-1.1.9/docbrowser/Makefile.in	2005-10-12 12:05:34.000000000 +0200
+@@ -182,10 +182,10 @@
+ monodocdir = $(prefix)/lib/monodoc
+ noinst_DATA = admin.exe
+ @ENABLE_GECKO_FALSE at CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb 
+- at ENABLE_GECKO_TRUE@CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb GeckoHtmlRender.dll 
++ at ENABLE_GECKO_TRUE@CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb GeckoHtmlRender.dll GeckoHtmlRender.dll.mdb 
+ @ENABLE_GECKO_FALSE at monodoc_DATA = browser.exe 
+ @ENABLE_GECKO_TRUE at monodoc_DATA = browser.exe GeckoHtmlRender.dll 
+-DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc.in
++DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop
+ bin_SCRIPTS = monodoc
+ browser_sources = \
+ 	$(srcdir)/browser.cs		\


Property changes on: mono-tools/trunk/debian/patches/02_fix_buildsystem.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules	2005-10-10 12:40:46 UTC (rev 2070)
+++ mono-tools/trunk/debian/rules	2005-10-12 13:41:25 UTC (rev 2071)
@@ -11,15 +11,17 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) clean
+	-$(MAKE) distclean
 	# make clean is everything but clean
-	find -name "*.exe*" -or -name "*.dll*" | xargs rm -f
+	#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 
+	dh_clean
 
 install: build
 	dh_testdir

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