[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20090302+691-1-26-g301d495

Stephane Glondu steph at glondu.net
Tue Sep 8 20:38:27 UTC 2009 

The following commit has been merged in the master branch:
commit eb9ac59b7eafcdd29687456055dd8a895cd22c8b
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 8 21:25:39 2009 +0200

    New upstream SVN snapshot, refresh patches

diff --git a/debian/changelog b/debian/changelog
index 2e18fb1..98afe56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-cameleon (1.9.18.svn20090302+691-2) UNRELEASED; urgency=low
+cameleon (1.9.18.svn20090908+703-1) UNRELEASED; urgency=low
+
+  [ Stéphane Glondu ]
+  * New upstream SVN snapshot (Closes: #545649):
+    - remove Fix-typo-in-LANGUAGESSPECSDIR.patch (merged upstream)
+    - remove Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch (not
+      needed anymore)
+  * Update my e-mail address and remove DMUA
 
   [ Sylvain Le Gall ]
   * Fix typo and update .pot for manpages
@@ -7,11 +14,7 @@ cameleon (1.9.18.svn20090302+691-2) UNRELEASED; urgency=low
   * Invert CDBS ocaml.mk and debhelper.mk to avoid generating
     *.debhelper.log
 
-  [ Stéphane Glondu ]
-  * Update my e-mail address and remove DMUA
-  * Add 0005-Add-explicit-path-for-source.patch (Closes: #545649)
-
- -- Stéphane Glondu <glondu at debian.org>  Tue, 08 Sep 2009 17:05:59 +0200
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 08 Sep 2009 19:54:54 +0200
 
 cameleon (1.9.18.svn20090302+691-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Add-xml-light-include-flag.patch b/debian/patches/0001-Add-xml-light-include-flag.patch
index 0dec7fe..bea2d05 100644
--- a/debian/patches/0001-Add-xml-light-include-flag.patch
+++ b/debian/patches/0001-Add-xml-light-include-flag.patch
@@ -1,4 +1,3 @@
-From 0ece468aea129516697f0b1615ce446b4d42d81f Mon Sep 17 00:00:00 2001
 From: Sylvain Le Gall <gildor at debian.org>
 Date: Sun, 8 Mar 2009 12:58:39 +0100
 Subject: [PATCH] Add xml-light include flag
@@ -8,7 +7,7 @@ Subject: [PATCH] Add xml-light include flag
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 130bf5b..0fd7d02 100644
+index efaddd2..b0551ad 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -28,6 +28,7 @@ include ../master.Makefile
@@ -20,5 +19,3 @@ index 130bf5b..0fd7d02 100644
  	-I ocaml/typing \
  	$(OCAML_DRIVER_INCLUDES) \
 -- 
-1.6.1.3
-
diff --git a/debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch b/debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
similarity index 84%
rename from debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch
rename to debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
index 20811ba..b4a6e7d 100644
--- a/debian/patches/0004-Don-t-try-to-extract-documentation-from-internal-hea.patch
+++ b/debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
@@ -1,4 +1,3 @@
-From 860c3d53f246ba069a09433de0c330997d9fb77b Mon Sep 17 00:00:00 2001
 From: Sylvain Le Gall <gildor at debian.org>
 Date: Sun, 8 Mar 2009 13:37:44 +0100
 Subject: [PATCH] Don't try to extract documentation from internal header files
@@ -8,7 +7,7 @@ Subject: [PATCH] Don't try to extract documentation from internal header files
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/doc/Makefile b/doc/Makefile
-index fa9084b..552d7ad 100644
+index e4a329d..aa9c0c4 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
 @@ -33,7 +33,7 @@ STDLIB_DOC=stdlib.odoc
@@ -21,5 +20,3 @@ index fa9084b..552d7ad 100644
  CAMELEON_DOC=cameleon.odoc
  doc_cameleon:dummy
 -- 
-1.6.1.3
-
diff --git a/debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch b/debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch
deleted file mode 100644
index 8e14c77..0000000
--- a/debian/patches/0002-Use-ocamldoc-if-ocamldoc.opt-is-not-available.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 2b77e00617103356f0ab6fe0aa2f58487805b3cb Mon Sep 17 00:00:00 2001
-From: Sylvain Le Gall <gildor at debian.org>
-Date: Sun, 8 Mar 2009 13:02:03 +0100
-Subject: [PATCH] Use ocamldoc if ocamldoc.opt is not available
-
----
- 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 --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@
-+ifneq ($(OCAMLDOCOPT),no)
-+OCAMLDOCBEST= $(OCAMLDOCOPT)
-+else
-+OCAMLDOCBEST= $(OCAMLDOC)
-+endif
- OCAMLPP=
- LATEX=TEXINPUTS=$(ROOT)/doc: latex
- HEVEA=hevea -fix -francais -I $(ROOT)/doc -exec xxdate.exe
-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`
- 
-@@ -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) \
-+	$(OCAMLDOCBEST) \
- 	$(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $@ \
- 	ocamlcvs/ocamlcvs.mli \
- 	odot/odot.mli odot/odot_view.mli \
-@@ -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 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
- 
- doc: all dump.odoc
- 	$(MKDIR) ocamldoc
--	$(OCAMLDOCOPT) $(COMPFLAGS) \
-+	$(OCAMLDOCBEST) $(COMPFLAGS) \
- 	-html \
- 	-load dump.odoc \
- 	-intro $(ROOT)/doc/reference_doc_intro.text \
-@@ -1185,7 +1185,7 @@ doc: all dump.odoc
- websitedoc: $(ROOT)/doc/cameleon.odoc
- 	$(MKDIR) $(ROOT)/../website/refdoc
- 	$(MKDIR) $(ROOT)/../website/snippets
--	$(OCAMLDOCOPT) $(COMPFLAGS) \
-+	$(OCAMLDOCBEST) $(COMPFLAGS) \
- 	-html \
- 	-load $< \
- 	-intro $(ROOT)/doc/web_reference_doc_intro.text \
-@@ -1227,7 +1227,7 @@ todo: dump.odoc
- 
- dot: dep.dot
- dep.dot: dump.odoc
--	$(OCAMLDOCOPT) -load $< -o $@ -dot -dot-reduce
-+	$(OCAMLDOCBEST) -load $< -o $@ -dot -dot-reduce
- 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
deleted file mode 100644
index f2c8bc5..0000000
--- a/debian/patches/0003-Fix-typo-in-LANGUAGESSPECSDIR.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c82a908ee28ba68444e7cd656368690305ebabe Mon Sep 17 00:00:00 2001
-From: Sylvain Le Gall <gildor at 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@
- 
- CAMELEON=@CAMELEON@
- CAMELEON_BYTE=@CAMELEON_BYTE@
--- 
-1.6.1.3
-
diff --git a/debian/patches/0005-Add-explicit-path-for-source.patch b/debian/patches/0005-Add-explicit-path-for-source.patch
deleted file mode 100644
index 9e49cbc..0000000
--- a/debian/patches/0005-Add-explicit-path-for-source.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 8 Sep 2009 16:53:04 +0200
-Subject: [PATCH] Add explicit path for source
-
-Bash 3 seemed to look in the current directory for files to source,
-but not Bash 4.
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545649
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index e6ff68f..5d30319 100755
---- a/configure
-+++ b/configure
-@@ -1699,7 +1699,7 @@ ROOT=`pwd`
- # Check for Ocaml compilers
- 
- ocaml unix.cma str.cma utils/checkocaml.ml ocaml_config.sh || exit 1
--. ocaml_config.sh
-+. ./ocaml_config.sh
- 
- echo "ocaml library path is $OCAMLLIB"
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index a6dda31..8fcdd89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 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
-0005-Add-explicit-path-for-source.patch
+0002-Don-t-try-to-extract-documentation-from-internal-hea.patch

-- 
cameleon packaging

More information about the Pkg-ocaml-maint-commits mailing list