[Pkg-mono-svn-commits] rev 3800 - in monodoc/trunk/debian: . patches
David Paleino
hanska-guest at alioth.debian.org
Sun Nov 23 17:09:07 UTC 2008
Author: hanska-guest
Date: 2008-11-23 17:09:07 +0000 (Sun, 23 Nov 2008)
New Revision: 3800
Added:
monodoc/trunk/debian/patches/00-fix_build_system.patch
monodoc/trunk/debian/patches/01-fix_bashisms.patch
monodoc/trunk/debian/patches/02-keep_cs-errors.patch
monodoc/trunk/debian/patches/03-build_sqlite_docs.patch
monodoc/trunk/debian/patches/04-fix_Novell_docs.patch
monodoc/trunk/debian/patches/series
Removed:
monodoc/trunk/debian/patches/00list
monodoc/trunk/debian/patches/01_fix_bashisms.dpatch
monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch
monodoc/trunk/debian/patches/03_build_sqlite_docs.dpatch
monodoc/trunk/debian/patches/04_fix_Novell_docs.dpatch
Modified:
monodoc/trunk/debian/changelog
monodoc/trunk/debian/control
monodoc/trunk/debian/rules
Log:
Patch system switched to quilt
Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/changelog 2008-11-23 17:09:07 UTC (rev 3800)
@@ -21,10 +21,11 @@
[ David Paleino ]
* debian/monodoc-base.dirs added
* debian/rules updated
+ * Patch system switched to quilt
* Group Policy:
- implement get-orig-source target in debian/rules
- -- David Paleino <d.paleino at gmail.com> Sun, 23 Nov 2008 14:30:28 +0100
+ -- David Paleino <d.paleino at gmail.com> Sun, 23 Nov 2008 17:45:03 +0100
monodoc (1.9-2) unstable; urgency=low
Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/control 2008-11-23 17:09:07 UTC (rev 3800)
@@ -3,7 +3,7 @@
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>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: cli-common-dev (>= 0.4.0),
pkg-config,
autotools-dev,
Added: monodoc/trunk/debian/patches/00-fix_build_system.patch
===================================================================
--- monodoc/trunk/debian/patches/00-fix_build_system.patch (rev 0)
+++ monodoc/trunk/debian/patches/00-fix_build_system.patch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,12 @@
+--- monodoc-2.0.orig/configure.in
++++ monodoc-2.0/configure.in
+@@ -12,8 +12,7 @@
+
+ AC_PATH_PROG(GACUTIL, gacutil, no)
+ AC_PATH_PROG(RUNTIME, mono, no)
+-AC_PATH_PROG(CSC, mcs, no)
+-AC_PATH_PROG(CSC2, gmcs, no)
++AC_PATH_PROG(CSC, csc, no)
+
+ # Check for mcs repo
+ AC_CHECK_FILE($srcdir/../mcs, build_cserrors=yes, build_cserrors=no)
Deleted: monodoc/trunk/debian/patches/00list
===================================================================
--- monodoc/trunk/debian/patches/00list 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/patches/00list 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,4 +0,0 @@
-01_fix_bashisms
-02_keep_cs-errors
-03_build_sqlite_docs
-04_fix_Novell_docs
Added: monodoc/trunk/debian/patches/01-fix_bashisms.patch
===================================================================
--- monodoc/trunk/debian/patches/01-fix_bashisms.patch (rev 0)
+++ monodoc/trunk/debian/patches/01-fix_bashisms.patch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,13 @@
+Author: Jo Shields <directhex at apebox.org>
+Reason: Remove bash-only assumptions in build scripts
+--- monodoc-2.0.orig/scripts/mod.in
++++ monodoc-2.0/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-$$
Deleted: monodoc/trunk/debian/patches/01_fix_bashisms.dpatch
===================================================================
--- monodoc/trunk/debian/patches/01_fix_bashisms.dpatch 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/patches/01_fix_bashisms.dpatch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,19 +0,0 @@
-#! /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.patch
===================================================================
--- monodoc/trunk/debian/patches/02-keep_cs-errors.patch (rev 0)
+++ monodoc/trunk/debian/patches/02-keep_cs-errors.patch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,12 @@
+Author: Jo Shields <directhex at apebox.org>
+Reason: Don't remove cs-errors files on clean, causes failed rebuild
+--- monodoc-2.0.orig/class/Makefile.am
++++ monodoc-2.0/class/Makefile.am
+@@ -77,7 +77,6 @@
+ ecma334.tree ecma334.zip \
+ netdocs.tree netdocs.zip \
+ nunit-docs.tree nunit-docs.zip \
+- cs-errors.tree cs-errors.zip \
+ mono-tools.tree mono-tools.zip \
+ Mono.tree Mono.zip \
+ Novell.tree Novell.zip \
Deleted: monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch
===================================================================
--- monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/patches/02_keep_cs-errors.dpatch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,17 +0,0 @@
-#! /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@
---- monodoc-2.0/class/Makefile.am.orig 2008-10-17 11:20:16.000000000 +0100
-+++ monodoc-2.0/class/Makefile.am 2008-10-17 11:20:27.000000000 +0100
-@@ -77,7 +77,6 @@
- ecma334.tree ecma334.zip \
- netdocs.tree netdocs.zip \
- nunit-docs.tree nunit-docs.zip \
-- cs-errors.tree cs-errors.zip \
- mono-tools.tree mono-tools.zip \
- Mono.tree Mono.zip \
- Novell.tree Novell.zip \
Added: monodoc/trunk/debian/patches/03-build_sqlite_docs.patch
===================================================================
--- monodoc/trunk/debian/patches/03-build_sqlite_docs.patch (rev 0)
+++ monodoc/trunk/debian/patches/03-build_sqlite_docs.patch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,15 @@
+Author: Mirco Bauer <meebey at debian.org>
+Reason: Build Mono.Data.SqliteClient documentation.
+--- monodoc-2.0.orig/class/Makefile.am
++++ monodoc-2.0/class/Makefile.am
+@@ -40,8 +40,8 @@
+ #
+ # All the Mono.* namespaces go into a single package
+ #
+-Mono.tree Mono.zip: $(srcdir)/Mono.Cairo/en/*/*.xml $(srcdir)/Mono.GetOptions/en/*/*.xml $(srcdir)/Mono.Posix/en/*/*.xml $(srcdir)/Mono.Security/en/*/*.xml $(srcdir)/Mono.Security.Win32/en/*/*.xml $(srcdir)/Commons.Xml.Relaxng/en/*/*.xml $(srcdir)/Mono.Addins/en/*/*.xml
+- mono --debug $(ASSEMBLER) --ecma $(srcdir)/Mono.Cairo/en --ecma $(srcdir)/Mono.GetOptions/en --ecma $(srcdir)/Mono.Posix/en --ecma $(srcdir)/Mono.Security.Win32/en/ --ecma $(srcdir)/Mono.Security/en/ --ecma $(srcdir)/Commons.Xml.Relaxng/en/ --ecma $(srcdir)/Mono.Addins/en/ -o Mono
++Mono.tree Mono.zip: $(srcdir)/Mono.Cairo/en/*/*.xml $(srcdir)/Mono.GetOptions/en/*/*.xml $(srcdir)/Mono.Posix/en/*/*.xml $(srcdir)/Mono.Security/en/*/*.xml $(srcdir)/Mono.Security.Win32/en/*/*.xml $(srcdir)/Commons.Xml.Relaxng/en/*/*.xml $(srcdir)/Mono.Addins/en/*/*.xml $(srcdir)/Mono.Data.SqliteClient/*/*.xml
++ mono --debug $(ASSEMBLER) --ecma $(srcdir)/Mono.Cairo/en --ecma $(srcdir)/Mono.GetOptions/en --ecma $(srcdir)/Mono.Posix/en --ecma $(srcdir)/Mono.Security.Win32/en/ --ecma $(srcdir)/Mono.Security/en/ --ecma $(srcdir)/Commons.Xml.Relaxng/en/ --ecma $(srcdir)/Mono.Addins/en/ --ecma $(srcdir)/Mono.Data.SqliteClient/ -o Mono
+
+ #
+ # All the Novell namespaces we handle go into a single file (one for now).
Deleted: monodoc/trunk/debian/patches/03_build_sqlite_docs.dpatch
===================================================================
--- monodoc/trunk/debian/patches/03_build_sqlite_docs.dpatch 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/patches/03_build_sqlite_docs.dpatch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_build_sqlite_docs.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad monodoc-1.9~/class/Makefile.am monodoc-1.9/class/Makefile.am
---- monodoc-1.9~/class/Makefile.am 2008-08-22 19:27:38.000000000 +0200
-+++ monodoc-1.9/class/Makefile.am 2008-08-22 19:30:19.000000000 +0200
-@@ -38,8 +38,8 @@
- #
- # All the Mono.* namespaces go into a single package
- #
--Mono.tree Mono.zip: $(srcdir)/Mono.Cairo/en/*/*.xml $(srcdir)/Mono.GetOptions/en/*/*.xml $(srcdir)/Mono.Posix/en/*/*.xml $(srcdir)/Mono.Security/en/*/*.xml $(srcdir)/Mono.Security.Win32/en/*/*.xml $(srcdir)/Commons.Xml.Relaxng/en/*/*.xml $(srcdir)/Mono.Addins/en/*/*.xml
-- mono --debug $(ASSEMBLER) --ecma $(srcdir)/Mono.Cairo/en --ecma $(srcdir)/Mono.GetOptions/en --ecma $(srcdir)/Mono.Posix/en --ecma $(srcdir)/Mono.Security.Win32/en/ --ecma $(srcdir)/Mono.Security/en/ --ecma $(srcdir)/Commons.Xml.Relaxng/en/ --ecma $(srcdir)/Mono.Addins/en/ -o Mono
-+Mono.tree Mono.zip: $(srcdir)/Mono.Cairo/en/*/*.xml $(srcdir)/Mono.GetOptions/en/*/*.xml $(srcdir)/Mono.Posix/en/*/*.xml $(srcdir)/Mono.Security/en/*/*.xml $(srcdir)/Mono.Security.Win32/en/*/*.xml $(srcdir)/Commons.Xml.Relaxng/en/*/*.xml $(srcdir)/Mono.Addins/en/*/*.xml $(srcdir)/Mono.Data.SqliteClient/*/*.xml
-+ mono --debug $(ASSEMBLER) --ecma $(srcdir)/Mono.Cairo/en --ecma $(srcdir)/Mono.GetOptions/en --ecma $(srcdir)/Mono.Posix/en --ecma $(srcdir)/Mono.Security.Win32/en/ --ecma $(srcdir)/Mono.Security/en/ --ecma $(srcdir)/Commons.Xml.Relaxng/en/ --ecma $(srcdir)/Mono.Addins/en/ --ecma $(srcdir)/Mono.Data.SqliteClient/ -o Mono
-
- #
- # All the Novell namespaces we handle go into a single file (one for now).
Added: monodoc/trunk/debian/patches/04-fix_Novell_docs.patch
===================================================================
--- monodoc/trunk/debian/patches/04-fix_Novell_docs.patch (rev 0)
+++ monodoc/trunk/debian/patches/04-fix_Novell_docs.patch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,20 @@
+Author: Jo Shields <directhex at apebox.org>
+Reason:
+--- monodoc-2.0.orig/class/Makefile.am
++++ monodoc-2.0/class/Makefile.am
+@@ -6,7 +6,7 @@
+ netdocs.tree netdocs.zip netdocs.source \
+ nunit-docs.tree nunit-docs.zip nunit-docs.source \
+ Mono.tree Mono.zip Mono.source \
+- mono-tools.tree mono-tools.zip mono-tools.source
++ mono-tools.tree mono-tools.zip mono-tools.source \
+ Novell.source Novell.zip Novell.tree
+
+ if BUILD_CSERRORS
+--- /dev/null
++++ monodoc-2.0/class/Novell.source
+@@ -0,0 +1,4 @@
++<?xml version="1.0"?>
++<monodoc>
++ <source provider="ecma" basefile="Novell" path="classlib-novell"/>
++</monodoc>
Deleted: monodoc/trunk/debian/patches/04_fix_Novell_docs.dpatch
===================================================================
--- monodoc/trunk/debian/patches/04_fix_Novell_docs.dpatch 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/patches/04_fix_Novell_docs.dpatch 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_Novell_docs.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Re-enable creation of docs for Novell.Directory.Ldap
-
- at DPATCH@
-diff -urNad monodoc-2.0~/class/Makefile.am monodoc-2.0/class/Makefile.am
---- monodoc-2.0~/class/Makefile.am 2008-10-17 12:11:22.000000000 +0100
-+++ monodoc-2.0/class/Makefile.am 2008-10-17 12:12:18.000000000 +0100
-@@ -6,7 +6,7 @@
- netdocs.tree netdocs.zip netdocs.source \
- nunit-docs.tree nunit-docs.zip nunit-docs.source \
- Mono.tree Mono.zip Mono.source \
-- mono-tools.tree mono-tools.zip mono-tools.source
-+ mono-tools.tree mono-tools.zip mono-tools.source \
- Novell.source Novell.zip Novell.tree
-
- if BUILD_CSERRORS
-diff -urNad monodoc-2.0~/class/Novell.source monodoc-2.0/class/Novell.source
---- monodoc-2.0~/class/Novell.source 1970-01-01 01:00:00.000000000 +0100
-+++ monodoc-2.0/class/Novell.source 2008-10-17 12:12:34.000000000 +0100
-@@ -0,0 +1,5 @@
-+<?xml version="1.0"?>
-+<monodoc>
-+ <source provider="ecma" basefile="Novell" path="classlib-novell"/>
-+</monodoc>
-+
Added: monodoc/trunk/debian/patches/series
===================================================================
--- monodoc/trunk/debian/patches/series (rev 0)
+++ monodoc/trunk/debian/patches/series 2008-11-23 17:09:07 UTC (rev 3800)
@@ -0,0 +1,5 @@
+00-fix_build_system.patch
+01-fix_bashisms.patch
+02-keep_cs-errors.patch
+03-build_sqlite_docs.patch
+04-fix_Novell_docs.patch
Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules 2008-11-23 16:41:38 UTC (rev 3799)
+++ monodoc/trunk/debian/rules 2008-11-23 17:09:07 UTC (rev 3800)
@@ -1,30 +1,28 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d'-' -f1)
configure: configure-stamp
-configure-stamp: patch
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
aclocal
autoconf
automake --add-missing --copy
- CSC=/usr/bin/csc ./configure --prefix=/usr
+ ./configure --prefix=/usr
touch $@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
-
$(MAKE)
-
- touch build-stamp
+ touch $@
clean: clean-stamp unpatch
clean-stamp:
@@ -39,7 +37,7 @@
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 build-stamp configure-stamp configure config.sub config.guess aclocal.m4 missing
+ dh_clean configure config.sub config.guess aclocal.m4 missing
install: build
dh_testdir
More information about the Pkg-mono-svn-commits
mailing list