The following commit has been merged in the master branch: commit 56d7fb940435ee1ef02b9acc07abf280b69749e2 Author: Stephane Glondu <st...@glondu.net> Date: Sun Mar 8 14:31:44 2009 +0100
Refresh patches and switch patch system to quilt diff --git a/debian/patches/0001-Add-xml-light-include-flag.patch b/debian/patches/0001-Add-xml-light-include-flag.patch new file mode 100644 index 0000000..0dec7fe --- /dev/null +++ b/debian/patches/0001-Add-xml-light-include-flag.patch @@ -0,0 +1,24 @@ +From 0ece468aea129516697f0b1615ce446b4d42d81f Mon Sep 17 00:00:00 2001 +From: Sylvain Le Gall <gil...@debian.org> +Date: Sun, 8 Mar 2009 12:58:39 +0100 +Subject: [PATCH] Add xml-light include flag + +--- + src/Makefile | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 130bf5b..0fd7d02 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -28,6 +28,7 @@ include ../master.Makefile + SYSTEM_INCLUDES= \ + -I +threads \ + -I +ocamldoc \ ++ -I +xml-light \ + -I ocaml/parsing \ + -I ocaml/typing \ + $(OCAML_DRIVER_INCLUDES) \ +-- +1.6.1.3 + diff --git a/debian/patches/ocamldoc_best.dpatch b/debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch old mode 100755 new mode 100644 similarity index 57% rename from debian/patches/ocamldoc_best.dpatch rename to debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch index 4d2e4ea..8e14c77 --- a/debian/patches/ocamldoc_best.dpatch +++ b/debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch @@ -1,24 +1,30 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ocamldoc_best.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From 2b77e00617103356f0ab6fe0aa2f58487805b3cb Mon Sep 17 00:00:00 2001 +From: Sylvain Le Gall <gil...@debian.org> +Date: Sun, 8 Mar 2009 13:02:03 +0100 +Subject: [PATCH] Use ocamldoc if ocamldoc.opt is not available -...@dpatch@ -diff -urNad cameleon-1.9.18.20070910svn~/doc/Makefile cameleon-1.9.18.20070910svn/doc/Makefile ---- cameleon-1.9.18.20070910svn~/doc/Makefile 2007-09-10 23:13:11.000000000 +0200 -+++ cameleon-1.9.18.20070910svn/doc/Makefile 2007-09-10 23:13:18.881716557 +0200 -@@ -53,4 +53,4 @@ +--- + doc/Makefile | 2 +- + master.Makefile.in | 5 +++++ + src/Makefile | 12 ++++++------ + 3 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index e4a329d..fa9084b 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -53,4 +53,4 @@ install: clean: $(RM) *.odoc distclean: clean -dummy: \ No newline at end of file +dummy: -diff -urNad cameleon-1.9.18.20070910svn~/master.Makefile.in cameleon-1.9.18.20070910svn/master.Makefile.in ---- cameleon-1.9.18.20070910svn~/master.Makefile.in 2007-09-10 23:13:11.000000000 +0200 -+++ cameleon-1.9.18.20070910svn/master.Makefile.in 2007-09-10 23:13:18.881716557 +0200 -@@ -42,6 +42,11 @@ +diff --git a/master.Makefile.in b/master.Makefile.in +index eeb51ac..78fbdf6 100644 +--- a/master.Makefile.in ++++ b/master.Makefile.in +@@ -42,6 +42,11 @@ OCAMLFIND= @OCAMLFIND@ EXTRAC_CRC = $(OCAMLLIB)/extract_crc OCAMLDOC= @OCAMLDOC@ OCAMLDOCOPT= @OCAMLDOC_OPT@ @@ -30,20 +36,21 @@ diff -urNad cameleon-1.9.18.20070910svn~/master.Makefile.in cameleon-1.9.18.2007 OCAMLPP= LATEX=TEXINPUTS=$(ROOT)/doc: latex HEVEA=hevea -fix -francais -I $(ROOT)/doc -exec xxdate.exe -diff -urNad cameleon-1.9.18.20070910svn~/src/Makefile cameleon-1.9.18.20070910svn/src/Makefile ---- cameleon-1.9.18.20070910svn~/src/Makefile 2007-09-10 23:13:18.805719758 +0200 -+++ cameleon-1.9.18.20070910svn/src/Makefile 2007-09-10 23:14:50.085875358 +0200 -@@ -1045,7 +1045,7 @@ - odot/*.ml odot/*.mli \ - editor/*.ml editor/*.mli \ +diff --git a/src/Makefile b/src/Makefile +index 0fd7d02..ae727e9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1120,7 +1120,7 @@ dump.odoc: cameleon/*.ml cameleon/*.mli \ + custop/*.ml custop/*.mli \ + multiclip/*.ml multiclip/*.mli \ $(GTKSV_UTILS_CMO:.cmo=.ml) $(GTKSV_UTILS_CMO:.cmo=.mli) - $(OCAMLDOCOPT) \ + $(OCAMLDOCBEST) \ $(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $@ \ `ls $^ | grep -v example.ml | grep -v example2.ml | grep -v test | grep -v cam_rss` -@@ -1066,7 +1066,7 @@ - odot/*.ml odot/*.mli \ +@@ -1143,7 +1143,7 @@ $(ROOT)/doc/cameleon.odoc:cameleon/*.ml cameleon/*.mli \ + multiclip/*.ml multiclip/*.mli \ editor/*.ml editor/*.mli \ $(GTKSV_UTILS_CMO:.cmo=.ml) $(GTKSV_UTILS_CMO:.cmo=.mli) - $(OCAMLDOCOPT) \ @@ -51,10 +58,10 @@ diff -urNad cameleon-1.9.18.20070910svn~/src/Makefile cameleon-1.9.18.20070910sv $(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $@ \ ocamlcvs/ocamlcvs.mli \ odot/odot.mli odot/odot_view.mli \ -@@ -1092,12 +1092,12 @@ +@@ -1171,12 +1171,12 @@ $(ROOT)/doc/cameleon.odoc:cameleon/*.ml cameleon/*.mli \ dumps.odoc: for i in editor cameleon utils config_file gtksv-utils okey \ - configwin report dbforge odiff odot ocamlcvs; do \ + configwin report dbforge odiff odot ocamlcvs custop multiclip; do \ - $(OCAMLDOCOPT) $(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $$i/dump.odoc \ + $(OCAMLDOCBEST) $(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $$i/dump.odoc \ $$i/*.ml $$i/*.mli; done @@ -66,7 +73,7 @@ diff -urNad cameleon-1.9.18.20070910svn~/src/Makefile cameleon-1.9.18.20070910sv -html \ -load dump.odoc \ -intro $(ROOT)/doc/reference_doc_intro.text \ -@@ -1106,7 +1106,7 @@ +@@ -1185,7 +1185,7 @@ doc: all dump.odoc websitedoc: $(ROOT)/doc/cameleon.odoc $(MKDIR) $(ROOT)/../website/refdoc $(MKDIR) $(ROOT)/../website/snippets @@ -75,7 +82,7 @@ diff -urNad cameleon-1.9.18.20070910svn~/src/Makefile cameleon-1.9.18.20070910sv -html \ -load $< \ -intro $(ROOT)/doc/web_reference_doc_intro.text \ -@@ -1132,7 +1132,7 @@ +@@ -1227,7 +1227,7 @@ todo: dump.odoc dot: dep.dot dep.dot: dump.odoc @@ -84,3 +91,6 @@ diff -urNad cameleon-1.9.18.20070910svn~/src/Makefile cameleon-1.9.18.20070910sv dep.ps:dep.dot dot -Tps -o $@ $< +-- +1.6.1.3 + diff --git a/debian/patches/0003-Fix-typo-in-LANGUAGESSPECSDIR.patch b/debian/patches/0003-Fix-typo-in-LANGUAGESSPECSDIR.patch new file mode 100644 index 0000000..f2c8bc5 --- /dev/null +++ b/debian/patches/0003-Fix-typo-in-LANGUAGESSPECSDIR.patch @@ -0,0 +1,25 @@ +From 6c82a908ee28ba68444e7cd656368690305ebabe Mon Sep 17 00:00:00 2001 +From: Sylvain Le Gall <gil...@debian.org> +Date: Sun, 8 Mar 2009 13:03:12 +0100 +Subject: [PATCH] Fix typo in LANGUAGESSPECSDIR + +--- + master.Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/master.Makefile.in b/master.Makefile.in +index 78fbdf6..58f12fc 100644 +--- a/master.Makefile.in ++++ b/master.Makefile.in +@@ -86,7 +86,7 @@ PLUGINSDIR=$(DESTDIR)@PLUGINSDIR@ + PIXMAPSDIR=$(DESTDIR)@PIXMAPSDIR@ + GLADEDIR=$(DESTDIR)@GLADEDIR@ + DTDDIR=$(DESTDIR)@DTDDIR@ +-LANGUAGESSPECSDIR=$(DEST_DIR)@LANGUAGESSPECSDIR@ ++LANGUAGESSPECSDIR=$(DESTDIR)@LANGUAGESSPECSDIR@ + + camele...@cameleon@ + cameleon_by...@cameleon_byte@ +-- +1.6.1.3 + diff --git a/debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch b/debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch new file mode 100644 index 0000000..20811ba --- /dev/null +++ b/debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch @@ -0,0 +1,25 @@ +From 860c3d53f246ba069a09433de0c330997d9fb77b Mon Sep 17 00:00:00 2001 +From: Sylvain Le Gall <gil...@debian.org> +Date: Sun, 8 Mar 2009 13:37:44 +0100 +Subject: [PATCH] Don't try to extract documentation from internal header files + +--- + doc/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index fa9084b..552d7ad 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -33,7 +33,7 @@ STDLIB_DOC=stdlib.odoc + doc_stdlib:dummy + $(OCAMLDOC) -I +threads \ + -dump $(STDLIB_DOC) \ +- `ls $(OCAMLLIB)/*.mli | grep -v outcometree` ++ `ls $(OCAMLLIB)/*.mli | grep -v -E "(outcometree|genprintval|topdirs|toploop|trace)"` + + CAMELEON_DOC=cameleon.odoc + doc_cameleon:dummy +-- +1.6.1.3 + diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index c2d4ccf..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,4 +0,0 @@ -xml_light -ocamldoc_best -languagesspecsdir -no_internal_mli diff --git a/debian/patches/languagesspecsdir.dpatch b/debian/patches/languagesspecsdir.dpatch deleted file mode 100755 index 2837fc5..0000000 --- a/debian/patches/languagesspecsdir.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## languagesspecsdir.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad cameleon-1.9.18.20070918svn~/master.Makefile.in cameleon-1.9.18.20070918svn/master.Makefile.in ---- cameleon-1.9.18.20070918svn~/master.Makefile.in 2007-09-19 01:55:54.650623381 +0200 -+++ cameleon-1.9.18.20070918svn/master.Makefile.in 2007-09-19 01:56:16.293680669 +0200 -@@ -81,7 +81,7 @@ - PIXMAPSDIR=$(DESTDIR)@PIXMAPSDIR@ - GLADEDIR=$(DESTDIR)@GLADEDIR@ - DTDDIR=$(DESTDIR)@DTDDIR@ --LANGUAGESSPECSDIR=$(DEST_DIR)@LANGUAGESSPECSDIR@ -+LANGUAGESSPECSDIR=$(DESTDIR)@LANGUAGESSPECSDIR@ - - camele...@cameleon@ - cameleon_by...@cameleon_byte@ diff --git a/debian/patches/no_internal_mli.dpatch b/debian/patches/no_internal_mli.dpatch deleted file mode 100755 index be81b23..0000000 --- a/debian/patches/no_internal_mli.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## no_internal_mli.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't try to extract documentation from internal header files. - -...@dpatch@ -diff -urNad trunk~/doc/Makefile trunk/doc/Makefile ---- trunk~/doc/Makefile 2008-05-24 13:04:41.000000000 +0200 -+++ trunk/doc/Makefile 2008-05-24 13:05:03.000000000 +0200 -@@ -33,7 +33,7 @@ - doc_stdlib:dummy - $(OCAMLDOC) -I +threads \ - -dump $(STDLIB_DOC) \ -- `ls $(OCAMLLIB)/*.mli | grep -v outcometree` -+ `ls $(OCAMLLIB)/*.mli | grep -v -E "(outcometree|genprintval|topdirs|toploop|trace)"` - - CAMELEON_DOC=cameleon.odoc - doc_cameleon:dummy diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6393f63 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +0001-Add-xml-light-include-flag.patch +0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch +0003-Fix-typo-in-LANGUAGESSPECSDIR.patch +0004-Don-t-try-to-extract-documentation-from-internal-hea.patch diff --git a/debian/patches/xml_light.dpatch b/debian/patches/xml_light.dpatch deleted file mode 100755 index 8ddf078..0000000 --- a/debian/patches/xml_light.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## xml_light.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad trunk~/src/Makefile trunk/src/Makefile ---- trunk~/src/Makefile 2005-11-02 05:01:43.000000000 +0100 -+++ trunk/src/Makefile 2005-11-03 12:30:41.441781488 +0100 -@@ -27,6 +27,7 @@ - - INCLUDES=-I +lablgtk2 \ - -I +ocamldoc \ -+ -I +xml-light \ - -I ocaml/parsing \ - -I ocaml/typing \ - -I ocaml/driver \ diff --git a/debian/rules b/debian/rules index 2d12d89..d90a00c 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ # fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/ocaml.mk include $(CURDIR)/debian/mk/docbook-manpage.mk @@ -138,3 +138,7 @@ install/cameleon:: binary-install/cameleon:: dh_desktop -pcameleon +redo-patches:: + rm -f debian/patches/* + git format-patch -N -o debian/patches master...patch-queue | \ + sed -e 's%debian/patches/%%' > debian/patches/series -- cameleon packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits