[Pkg-ocaml-maint-commits] r2816 - in /trunk/packages/cameleon/trunk/debian: TODO changelog control control.in patches/00list patches/ocamldoc_best.dpatch rules watch

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Jun 7 22:42:31 UTC 2006 

Author: gildor
Date: Wed Jun  7 22:42:29 2006
New Revision: 2816

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2816
Log:
* Prepare cameleon release 
-- SLG

Modified:
    trunk/packages/cameleon/trunk/debian/TODO
    trunk/packages/cameleon/trunk/debian/changelog
    trunk/packages/cameleon/trunk/debian/control
    trunk/packages/cameleon/trunk/debian/control.in
    trunk/packages/cameleon/trunk/debian/patches/00list
    trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch
    trunk/packages/cameleon/trunk/debian/rules
    trunk/packages/cameleon/trunk/debian/watch

Modified: trunk/packages/cameleon/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/TODO?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/TODO (original)
+++ trunk/packages/cameleon/trunk/debian/TODO Wed Jun  7 22:42:29 2006
@@ -1,2 +1,4 @@
 * Check version sed for META file
 * List some commands that can be launched from command line in the manpage of cameleon2.
+* Move the documentation *.odoc to /usr/share/cameleon/odoc
+* Remove the topcameleon icon and command 

Modified: trunk/packages/cameleon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/changelog?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/changelog (original)
+++ trunk/packages/cameleon/trunk/debian/changelog Wed Jun  7 22:42:29 2006
@@ -1,3 +1,18 @@
+cameleon (1.9.13-1) unstable; urgency=high
+
+  * New upstream version,
+  * Rework the patch ocamldoc_best,
+  * Remove the patch make_3_81, which is applied upstream
+  * Upgrade OCaml ABI to 3.09.2,
+  * Use gildor at debian.org as maintainer field in control,
+  * Define debian/control target as PHONY,
+  * Upgrade Standards-Version to 3.7.2.0 (no change),
+  * Add ocaml-findlib in the Build-Dependency,
+  * Remove all generated file during the clean,
+  * Set urgency to high, in order not to block ocaml transition to 3.09.2
+
+ -- Sylvain Le Gall <gildor at debian.org>  Wed,  7 Jun 2006 22:24:56 +0200
+
 cameleon (1.9.9.cvs20051129-3) unstable; urgency=low
 
   * Rebuild for OCaml 3.09.1

Modified: trunk/packages/cameleon/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/control?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control (original)
+++ trunk/packages/cameleon/trunk/debian/control Wed Jun  7 22:42:29 2006
@@ -1,10 +1,10 @@
 Source: cameleon
 Section: devel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Maintainer: Sylvain Le Gall <gildor at debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= 3.09.1), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick
-Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= 3.09.2), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick, ocaml-findlib
+Standards-Version: 3.7.2.0
 
 Package: cameleon
 Architecture: any

Modified: trunk/packages/cameleon/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/control.in?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control.in (original)
+++ trunk/packages/cameleon/trunk/debian/control.in Wed Jun  7 22:42:29 2006
@@ -1,10 +1,10 @@
 Source: cameleon
 Section: devel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Maintainer: Sylvain Le Gall <gildor at debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= #OCamlABI#), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick
-Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= #OCamlABI#), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick, ocaml-findlib
+Standards-Version: 3.7.2.0
 
 Package: cameleon
 Architecture: any

Modified: trunk/packages/cameleon/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/00list?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list (original)
+++ trunk/packages/cameleon/trunk/debian/patches/00list Wed Jun  7 22:42:29 2006
@@ -1,4 +1,3 @@
 xml_light
 ocamldoc_best
-make_3_81
 byte_compilation

Modified: trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch (original)
+++ trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch Wed Jun  7 22:42:29 2006
@@ -5,23 +5,23 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad trunk~/doc/Makefile trunk/doc/Makefile
---- trunk~/doc/Makefile	2005-06-09 12:03:33.000000000 +0200
-+++ trunk/doc/Makefile	2005-11-15 00:10:01.000000000 +0100
+diff -urNad cameleon-1.9.13~/doc/Makefile cameleon-1.9.13/doc/Makefile
+--- cameleon-1.9.13~/doc/Makefile	2006-05-10 11:15:35.000000000 +0200
++++ cameleon-1.9.13/doc/Makefile	2006-06-07 22:37:33.000000000 +0200
 @@ -52,4 +52,4 @@
          fi; done
  clean:
  distclean: clean
 -dummy:
-\ Pas de fin de ligne à la fin du fichier.
+\ No newline at end of file
 +dummy:
-diff -urNad trunk~/master.Makefile.in trunk/master.Makefile.in
---- trunk~/master.Makefile.in	2005-11-14 08:55:12.000000000 +0100
-+++ trunk/master.Makefile.in	2005-11-15 00:10:01.000000000 +0100
+diff -urNad cameleon-1.9.13~/master.Makefile.in cameleon-1.9.13/master.Makefile.in
+--- cameleon-1.9.13~/master.Makefile.in	2006-05-10 11:15:35.000000000 +0200
++++ cameleon-1.9.13/master.Makefile.in	2006-06-07 22:39:21.000000000 +0200
 @@ -42,6 +42,11 @@
  EXTRAC_CRC = $(OCAMLLIB)/extract_crc
  OCAMLDOC= @OCAMLDOC@
- OCAMLDOCOPT= @OCAMLDOCOPT@
+ OCAMLDOCOPT= @OCAMLDOC_OPT@
 +ifneq ($(OCAMLDOCOPT),no)
 +OCAMLDOCBEST= $(OCAMLDOCOPT)
 +else
@@ -30,31 +30,31 @@
  OCAMLPP=
  LATEX=TEXINPUTS=$(ROOT)/doc: latex
  HEVEA=hevea -fix -francais -I $(ROOT)/doc -exec xxdate.exe
-diff -urNad trunk~/src/Makefile trunk/src/Makefile
---- trunk~/src/Makefile	2005-11-15 00:10:01.000000000 +0100
-+++ trunk/src/Makefile	2005-11-15 00:10:49.000000000 +0100
-@@ -538,7 +538,7 @@
- 	report/*.ml report/*.mli \
- 	dbforge/*.ml dbforge/*.mli \
- 	ocamlcvs/*.ml ocamlcvs/*.mli
+diff -urNad cameleon-1.9.13~/src/Makefile cameleon-1.9.13/src/Makefile
+--- cameleon-1.9.13~/src/Makefile	2006-06-07 22:37:33.000000000 +0200
++++ cameleon-1.9.13/src/Makefile	2006-06-07 22:46:03.000000000 +0200
+@@ -643,7 +643,7 @@
+ 	dbforge/dbf_lib/dbf_sql_misc.ml dbforge/dbf_lib/dbf_sql_driver.ml \
+ 	ocamlcvs/*.ml ocamlcvs/*.mli \
+ 	odot/*.ml odot/*.mli
 -	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
 +	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
- 	`ls $^ | grep -v "/example.ml"`
+ 	`ls $^ | grep -v example.ml | grep -v example2.ml`
  
  $(ROOT)/doc/cameleon.odoc:cameleon/*.ml cameleon/*.mli \
-@@ -550,7 +550,7 @@
- 	report/*.ml report/*.mli \
- 	dbforge/*.ml dbforge/*.mli \
- 	ocamlcvs/*.ml ocamlcvs/*.mli
+@@ -659,7 +659,7 @@
+ 	dbforge/dbf_lib/dbf_sql_misc.ml dbforge/dbf_lib/dbf_sql_driver.ml \
+ 	ocamlcvs/*.ml ocamlcvs/*.mli \
+ 	odot/*.ml odot/*.mli
 -	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
 +	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
  	ocamlcvs/ocamlcvs.mli \
- 	okey/okey.mli\
- 	configwin/configwin.mli\
-@@ -566,12 +566,12 @@
+ 	odot/odot.mli odot/odot_view.mli \
+ 	okey/okey.mli \
+@@ -678,12 +678,12 @@
  dumps.odoc:
  	for i in cameleon utils config_file okey \
- 	configwin report dbforge ocamlcvs; do\
+ 	configwin report dbforge odiff odot ocamlcvs; do \
 -	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $$i/dump.odoc \
 +	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $$i/dump.odoc \
  	$$i/*.ml $$i/*.mli; done
@@ -66,7 +66,7 @@
  	-html \
  	-load dump.odoc \
  	-intro $(ROOT)/doc/reference_doc_intro.text \
-@@ -579,7 +579,7 @@
+@@ -691,7 +691,7 @@
  
  websitedoc: $(ROOT)/doc/cameleon.odoc
  	$(MKDIR) $(ROOT)/web/site/refdoc
@@ -74,8 +74,8 @@
 +	$(OCAMLDOCBEST) $(OCAMLPP) $(COMPFLAGS) \
  	-html \
  	-load $< \
- 	-intro $(ROOT)/doc/reference_doc_intro.text \
-@@ -593,7 +593,7 @@
+ 	-intro $(ROOT)/doc/web_reference_doc_intro.text \
+@@ -705,7 +705,7 @@
  
  dot: dep.dot
  dep.dot: dump.odoc
@@ -84,10 +84,10 @@
  dep.ps:dep.dot
  	dot -Tps -o $@ $<
  
-@@ -748,4 +748,4 @@
- ocamlcvs/odiff_parser.cmo: ocamlcvs/odiff_parser.cmi
- ocamlcvs/odiff_parser.cmx: ocamlcvs/odiff_parser.cmi
- ocamlcvs/odiff_lexer.cmi: ocamlcvs/odiff_parser.cmi
--ocamlcvs/odiff_lexer.cmo: ocamlcvs/odiff_parser.cmo
-\ Pas de fin de ligne à la fin du fichier.
-+ocamlcvs/odiff_lexer.cmo: ocamlcvs/odiff_parser.cmo
+@@ -885,4 +885,4 @@
+ $(ODIFF_LIB_GUI_CMOFILES) $(ODIFF_LIB_GUI_CMIFILES): $(LIBODIFF_CMI) $(LIBODIFF_BYTE)
+ $(ODIFF_LIB_GUI_CMXFILES) $(ODIFF_LIB_GUI_CMIFILES): $(LIBODIFF_CMI) $(LIBODIFF)
+ 
+-ocamlcvs/ocvs_list.cmx: odiff/odiff_gui.cmxa
+\ No newline at end of file
++ocamlcvs/ocvs_list.cmx: odiff/odiff_gui.cmxa

Modified: trunk/packages/cameleon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/rules?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/rules (original)
+++ trunk/packages/cameleon/trunk/debian/rules Wed Jun  7 22:42:29 2006
@@ -55,8 +55,29 @@
 	dh_testroot
 	-$(MAKE) distclean
 	-$(MAKE) -C debian/xml-man clean
-	-$(RM) src/dump.odoc doc/stdlib.odoc doc/cameleon.odoc
 	-$(RM) build-stamp depend-stamp configure-stamp
+	-$(RM) src/dump.odoc 
+	-$(RM) doc/stdlib.odoc 
+	-$(RM) doc/cameleon.odoc
+	-$(RM) src/cameleon/cam_config.ml
+	-$(RM) src/cameleon/cam_gui_base.ml
+	-$(RM) src/camtop/cam-mktop
+	-$(RM) src/camtop/camtop_installation.ml
+	-$(RM) src/camtop/camtop_installation.ml
+	-$(RM) src/odiff/odiff_parser.output
+	-$(RM) src/odot/.depend
+	-$(RM) src/odot/config.log
+	-$(RM) src/odot/config.status
+	-$(RM) src/odot/odot_lexer.ml
+	-$(RM) src/odot/master.Makefile
+	-$(RM) src/odot/odot_version.ml
+	-$(RM) src/dbforge/dbf_installation.ml
+	-$(RM) src/dbforge/dbf_sql_gen.ml
+	-$(RM) src/dbforge/dbf_sql_vgen.ml
+	-$(RM) src/dbforge/dbf_sql_qgen.ml
+	-$(RM) src/report/rep_installation.ml
+	-$(RM) src/.depend
+	-$(RM) images/topcameleon.xpm
 	dh_clean
 
 install: build-stamp 
@@ -122,4 +143,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install pre-install
+.PHONY: build clean binary-indep binary-arch binary install pre-install debian/control

Modified: trunk/packages/cameleon/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/watch?rev=2816&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/watch (original)
+++ trunk/packages/cameleon/trunk/debian/watch Wed Jun  7 22:42:29 2006
@@ -1,2 +1,2 @@
 version=2
-http://download.gna.org/cameleon/cameleon_([0-9\.]*)\.tar\.gz
+http://download.gna.org/cameleon/cameleon_([0-9]*\.[0-9\.]*)\.tar\.gz

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