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

Jo Shields directhex-guest at alioth.debian.org
Wed Aug 20 23:01:34 UTC 2008


Author: directhex-guest
Date: 2008-08-20 23:01:34 +0000 (Wed, 20 Aug 2008)
New Revision: 3696

Added:
   monodoc/trunk/debian/patches/
   monodoc/trunk/debian/patches/00list
   monodoc/trunk/debian/patches/01_fix_bashisms.dpatch
   monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch
Removed:
   monodoc/trunk/debian/monodoc-nunit-manual.install
   monodoc/trunk/debian/monodoc-nunit-manual.postinst
Modified:
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/control
   monodoc/trunk/debian/rules
Log:
* Integrate dpatch, waste hours screaming because clean and unpatch were in the wrong order. Oops.
* Pull in NMU changes, convert to dpatch (rather than hacking diff.gz directly)
* Add myself to uploaders, bump standards


Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2008-08-20 18:28:55 UTC (rev 3695)
+++ monodoc/trunk/debian/changelog	2008-08-20 23:01:34 UTC (rev 3696)
@@ -1,14 +1,40 @@
-monodoc (1.9-2~pre1) unstable; urgency=low
+monodoc (1.9-2) unstable; urgency=low
 
-  * NOT RELEASED YET.
+  [ Mirco Bauer ]
   * debian/control:
     + Using my debian email address now.
     + Cleaned up Uploaders field.
   * debian/rules:
     + Added binary-arch to .PHONY.
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 13 Apr 2008 16:39:27 +0200
+  [ Jo Shields ]
+  * Add dpatch to build-depends.
+  * Add myself to Uploaders.
+  * Include previous NMU changes - adapted for dpatch.
 
+ -- Jo Shields <directhex at apebox.org>  Wed, 20 Aug 2008 23:57:37 +0100
+
+monodoc (1.9-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Made package build twice in a row. While the old bug was already fixed,
+    there was another problem with the deletion of cs-errors.zip and
+    cs-errors.tree. Not removing these files in the clean target solved it.
+    (Closes: #424578)
+  * Do not build monodoc-nunit-manual anymore. This package seems to be build
+    by other sources now.
+  * Do not ignore errors in "make clean".
+
+ -- Michael Meskes <meskes at debian.org>  Mon, 23 Jun 2008 09:38:50 +0200
+
+monodoc (1.9-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix bashism in /usr/bin/mod script (Closes: #472883)
+  * Bump Standards-Version to 3.8.0.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 07 Jun 2008 21:08:41 +0100
+
 monodoc (1.9-1) unstable; urgency=high
 
   * New upstream release.

Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control	2008-08-20 18:28:55 UTC (rev 3695)
+++ monodoc/trunk/debian/control	2008-08-20 23:01:34 UTC (rev 3696)
@@ -2,10 +2,20 @@
 Section: devel
 Priority: optional
 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>
+Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>, Jo Shields <directhex at apebox.org>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), pkg-config, libmono-dev (>= 1.2.5), mono-gac (>= 1.0), mono-xsp-base (>= 1.1.9), mono-gmcs (>= 1.2.5), libmono2.0-cil, libmono1.0-cil, libmono-relaxng1.0-cil, libmono-sharpzip0.84-cil
-Standards-Version: 3.7.3
+Build-Depends-Indep: cli-common-dev (>= 0.4.0), 
+ pkg-config, 
+ libmono-dev (>= 1.2.5), 
+ mono-gac (>= 1.0), 
+ mono-xsp-base (>= 1.1.9), 
+ mono-gmcs (>= 1.2.5), 
+ libmono2.0-cil, 
+ libmono1.0-cil, 
+ libmono-relaxng1.0-cil, 
+ libmono-sharpzip0.84-cil, 
+ dpatch
+Standards-Version: 3.8.0
 
 Package: monodoc
 Architecture: all
@@ -42,18 +52,6 @@
  .
  This packages contains the compiled XML documentation of MonoDoc. 
 
-Package: monodoc-nunit-manual
-Architecture: all
-Section: doc
-Depends: monodoc-manual
-Conflicts: monodoc-manual (<= 1.0.6-1)
-Description: compiled XML documentation for Nunit
- 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 packages contains the compiled XML documentation for Nunit of MonoDoc. 
-
 Package: monodoc-http
 Provides: monodoc-viewer
 Architecture: all

Deleted: monodoc/trunk/debian/monodoc-nunit-manual.install
===================================================================
--- monodoc/trunk/debian/monodoc-nunit-manual.install	2008-08-20 18:28:55 UTC (rev 3695)
+++ monodoc/trunk/debian/monodoc-nunit-manual.install	2008-08-20 23:01:34 UTC (rev 3696)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/monodoc/sources/nunit-docs.*

Deleted: monodoc/trunk/debian/monodoc-nunit-manual.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-nunit-manual.postinst	2008-08-20 18:28:55 UTC (rev 3695)
+++ monodoc/trunk/debian/monodoc-nunit-manual.postinst	2008-08-20 23:01:34 UTC (rev 3696)
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ -x /usr/lib/monodoc/browser.exe ]; then
-        echo "generating monodoc search index..."
-        monodoc --make-index > /dev/null
-fi
-
-#DEBHELPER#

Added: monodoc/trunk/debian/patches/00list
===================================================================
--- monodoc/trunk/debian/patches/00list	                        (rev 0)
+++ monodoc/trunk/debian/patches/00list	2008-08-20 23:01:34 UTC (rev 3696)
@@ -0,0 +1,3 @@
+01_fix_bashisms
+02_keep_cs-errors
+

Added: monodoc/trunk/debian/patches/01_fix_bashisms.dpatch
===================================================================
--- monodoc/trunk/debian/patches/01_fix_bashisms.dpatch	                        (rev 0)
+++ monodoc/trunk/debian/patches/01_fix_bashisms.dpatch	2008-08-20 23:01:34 UTC (rev 3696)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_bashisms.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove bash-only assumptions in build scripts
+
+ at DPATCH@
+--- monodoc-1.9.orig/scripts/mod.in
++++ monodoc-1.9/scripts/mod.in
+@@ -9,7 +9,7 @@
+     exit 1;
+ fi
+
+-if `which lynx >& /dev/null` > /dev/null; then
++if `which lynx >/dev/null 2>&1` > /dev/null; then
+     @RUNTIME@ $monodocdir/mod.exe "$1" | lynx -dump -stdin -force_html | ${PAGER:-more}
+ else
+     tmp=$HOME/.monodoc-tmp-$$
+

Added: monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch
===================================================================
--- monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch	                        (rev 0)
+++ monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch	2008-08-20 23:01:34 UTC (rev 3696)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_keep_cs-errors.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't remove cs-errors files on clean, causes failed rebuild
+
+ at DPATCH@
+diff -urNad monodoc-1.9~/class/Makefile.am monodoc-1.9/class/Makefile.am
+--- monodoc-1.9~/class/Makefile.am	2008-08-20 21:40:03.913484574 +0100
++++ monodoc-1.9/class/Makefile.am	2008-08-20 21:41:07.565099314 +0100
+@@ -69,7 +69,6 @@
+ 	ecma334.tree ecma334.zip 	\
+ 	netdocs.tree netdocs.zip 	\
+ 	nunit-docs.tree nunit-docs.zip 	\
+-	cs-errors.tree cs-errors.zip 	\
+ 	Mono.tree Mono.zip 		\
+ 	Novell.tree Novell.zip		\
+ 	tmp 
+diff -urNad monodoc-1.9~/class/Makefile.in monodoc-1.9/class/Makefile.in
+--- monodoc-1.9~/class/Makefile.in	2008-08-20 21:40:04.163476693 +0100
++++ monodoc-1.9/class/Makefile.in	2008-08-20 21:41:18.913871046 +0100
+@@ -161,7 +161,6 @@
+ 	ecma334.tree ecma334.zip 	\
+ 	netdocs.tree netdocs.zip 	\
+ 	nunit-docs.tree nunit-docs.zip 	\
+-	cs-errors.tree cs-errors.zip 	\
+ 	Mono.tree Mono.zip 		\
+ 	Novell.tree Novell.zip		\
+ 	tmp 

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2008-08-20 18:28:55 UTC (rev 3695)
+++ monodoc/trunk/debian/rules	2008-08-20 23:01:34 UTC (rev 3696)
@@ -1,16 +1,19 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-build: build-stamp
-build-stamp:
+build: patch build-stamp
+build-stamp: 
 	dh_testdir
 	./configure --prefix=/usr
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
 	dh_testdir
 	dh_testroot
 	rm -f engine/mono.pub engine/monodoc.dll.mdb engine/assembler.exe.mdb
@@ -18,8 +21,8 @@
 	    tools/monodocer1.exe.mdb tools/monodocs2html.exe \
 	    tools/monodocs2html.exe.mdb tools/monodocs2slashdoc.exe \
 	    tools/monodocs2slashdoc.exe.mdb
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f build-stamp
-	-$(MAKE) clean
 	rm -rf $$MONO_SHARED_DIR/.wapi
 	dh_clean 
 




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