[Pkg-mono-svn-commits] rev 3823 - in monodoc/trunk/debian: . patches

[David Paleino]

Author: hanska-guest
Date: 2008-11-25 21:18:04 +0000 (Tue, 25 Nov 2008)
New Revision: 3823

Modified:
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/control
   monodoc/trunk/debian/patches/00-fix_build_system.patch
   monodoc/trunk/debian/rules
Log:
  + 00-fix_build_system.patch added
  + Build-Depends-Indep updated

Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2008-11-25 20:29:13 UTC (rev 3822)
+++ monodoc/trunk/debian/changelog	2008-11-25 21:18:04 UTC (rev 3823)
@@ -23,6 +23,7 @@
   * debian/rules updated
   * Patch system switched to quilt
   * debian/patches:
+    + 00-fix_build_system.patch added
     + 05-backport_2.2_nodes_handling.patch added, implements new way of
       handling monodoc.xml and documentation nodes
     + 06-fix_mdassembler.1.patch added
@@ -37,10 +38,11 @@
     + added myself to Uploaders
     + DM-Upload-Allowed set
     + typo fixed in description
+    + Build-Depends-Indep updated
   * Group Policy:
     + implement get-orig-source target in debian/rules
 
- -- David Paleino <d.paleino at gmail.com>  Sun, 23 Nov 2008 21:15:44 +0100
+ -- David Paleino <d.paleino at gmail.com>  Tue, 25 Nov 2008 22:14:31 +0100
 
 monodoc (1.9-2) unstable; urgency=low
 

Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control	2008-11-25 20:29:13 UTC (rev 3822)
+++ monodoc/trunk/debian/control	2008-11-25 21:18:04 UTC (rev 3823)
@@ -12,14 +12,10 @@
  autotools-dev,
  autoconf,
  automake,
- libmono-dev (>= 1.2.5), 
- mono-gac (>= 1.0), 
+ mono-devel,
  mono-xsp-base (>= 1.1.9), 
- mono-gmcs (>= 1.2.5), 
- mono-mcs (>= 1.2.5), 
  libmono2.0-cil, 
- libmono1.0-cil, 
- libmono-relaxng1.0-cil, 
+ libmono-relaxng2.0-cil, 
  libmono-sharpzip0.84-cil, 
 Standards-Version: 3.8.0
 DM-Upload-Allowed: yes

Modified: monodoc/trunk/debian/patches/00-fix_build_system.patch
===================================================================
--- monodoc/trunk/debian/patches/00-fix_build_system.patch	2008-11-25 20:29:13 UTC (rev 3822)
+++ monodoc/trunk/debian/patches/00-fix_build_system.patch	2008-11-25 21:18:04 UTC (rev 3823)
@@ -1,3 +1,5 @@
+Author: David Paleino <d.paleino at gmail.com>
+Reason: Use the 2.0 CLR only
 --- monodoc-2.0.orig/configure.in
 +++ monodoc-2.0/configure.in
 @@ -12,8 +12,7 @@
@@ -10,3 +12,38 @@
  
  # Check for mcs repo
  AC_CHECK_FILE($srcdir/../mcs, build_cserrors=yes, build_cserrors=no)
+--- monodoc-2.0.orig/tools/Makefile.am
++++ monodoc-2.0/tools/Makefile.am
+@@ -1,7 +1,6 @@
+ monodoc_DATA = \
+ 	mdoc.exe \
+ 	monodocer.exe \
+-	monodocer1.exe \
+ 	monodocs2html.exe \
+ 	monodocs2slashdoc.exe \
+ 	NDesk.Options.dll
+@@ -87,9 +86,6 @@
+ monodocer.exe: $(monodocer_sources)
+ 	$(CSC) -debug $(monodocer_sources) -out:$@ -r:Mono.GetOptions
+ 
+-monodocer1.exe: $(monodocer_sources)
+-	mcs -debug -d:NET_1_0 $(srcdir)/monodocer.cs -out:$@ -r:Mono.GetOptions
+-
+ monodocs2html.exe: $(monodocs2html_sources) $(monodocs2html_resources)
+ 	$(CSC) -debug -out:$@ -r:Mono.GetOptions \
+ 		$(monodocs2html_sources) \
+--- monodoc-2.0.orig/class/Makefile.am
++++ monodoc-2.0/class/Makefile.am
+@@ -121,11 +121,7 @@
+ 	nunit.util,nunit,1.0
+ 
+ UPDATE_COMMAND = \
+-	if echo $(3) | grep 1.0 > /dev/null ; then                               \
+-		__md__=monodocer1.exe ;                                                \
+-	else                                                                     \
+-		__md__=monodocer.exe ;                                                 \
+-	fi ;                                                                     \
++	__md__=monodocer.exe ;                                                 \
+ 	echo mono --debug ../tools/$$__md__ -show_exceptions -pretty -overrides  \
+ 		-assembly:@prefix@/lib/mono/$(3)/$(1).dll -path:./$(2)/en $(MD_EXTRA); \
+ 	mono --debug ../tools/$$__md__ -show_exceptions -pretty -overrides       \

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2008-11-25 20:29:13 UTC (rev 3822)
+++ monodoc/trunk/debian/rules	2008-11-25 21:18:04 UTC (rev 3823)
@@ -29,15 +29,14 @@
 	dh_testdir
 	dh_testroot
 	rm -f engine/mono.pub engine/monodoc.dll.mdb engine/assembler.exe.mdb
-	rm -f tools/monodocer.exe.mdb tools/monodocer1.exe \
-	    tools/monodocer1.exe.mdb tools/monodocs2html.exe \
+	rm -f tools/monodocer.exe.mdb tools/monodocs2html.exe \
 	    tools/monodocs2html.exe.mdb tools/monodocs2slashdoc.exe \
 	    tools/monodocs2slashdoc.exe.mdb
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf $$MONO_SHARED_DIR/.wapi autom4te.cache/
 	find . -name "Makefile.in" | xargs rm -rf
 	find . -name "*.dll" -o -name "*.mdb" | xargs rm -rf
-	dh_clean configure config.sub config.guess aclocal.m4 missing
+	dh_clean configure config.sub config.guess aclocal.m4 missing config-stamp
 
 install: build
 	dh_testdir