[Pkg-ocaml-maint-commits] r2050 - in trunk/packages/cameleon/trunk/debian: . patches xml-man

Sylvain LE GALL gildor-guest at costa.debian.org
Mon Nov 14 23:47:03 UTC 2005 

Author: gildor-guest
Date: 2005-11-14 23:47:02 +0000 (Mon, 14 Nov 2005)
New Revision: 2050

Added:
   trunk/packages/cameleon/trunk/debian/libcameleon-ocaml-dev.examples
   trunk/packages/cameleon/trunk/debian/ocaml-dbforge.menu
   trunk/packages/cameleon/trunk/debian/ocaml-report.menu
Modified:
   trunk/packages/cameleon/trunk/debian/TODO
   trunk/packages/cameleon/trunk/debian/cameleon-doc.doc-base
   trunk/packages/cameleon/trunk/debian/cameleon.docs
   trunk/packages/cameleon/trunk/debian/cameleon.menu
   trunk/packages/cameleon/trunk/debian/changelog
   trunk/packages/cameleon/trunk/debian/control
   trunk/packages/cameleon/trunk/debian/copyright
   trunk/packages/cameleon/trunk/debian/ocamlcvs.menu
   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
   trunk/packages/cameleon/trunk/debian/xml-man/tmpl_engine.byte.xml
Log:
Update the patch for the new CVS checkout, add menu, generate html doc out of cameleon.odoc,
update watch/copyright to state a new location for cameleon -- SLG


Modified: trunk/packages/cameleon/trunk/debian/TODO
===================================================================
--- trunk/packages/cameleon/trunk/debian/TODO	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/TODO	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,8 +1,3 @@
 * Check dependency for the META file
-* Install the META file
-* Install the html documentation
 * Write manpages (dbforge2, dbforge2.gui, report2, report2.gui ocamlcvs2)
-* Don't use custom bytecode
-* Check dependency against liblablgtk2-ocaml for packages
 * List some commands that can be launched from command line in the manpage of cameleon2.
-* Install an example for tmpl_engine.

Modified: trunk/packages/cameleon/trunk/debian/cameleon-doc.doc-base
===================================================================
--- trunk/packages/cameleon/trunk/debian/cameleon-doc.doc-base	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/cameleon-doc.doc-base	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,15 +1,10 @@
 Document: cameleon-doc
-Title: Cameleon User Manual
+Title: Cameleon API Reference
 Author: Maxence Guesdon, Dimitri Ara
-Abstract: This manual documents Cameleon, an Integrated Development
- Environment for Objective Caml.
-Section: devel
+Abstract: This manual documents all the libraries used in Cameleon, 
+ an Integrated Development Environment for Objective Caml.
+Section: Apps/Programming
 
-Format: postscript
-Files: /usr/share/doc/cameleon/manual.ps.gz
-
 Format: HTML
 Index: /usr/share/doc/cameleon/html/index.html
 Files: /usr/share/doc/cameleon/html/*.html
-
-  

Modified: trunk/packages/cameleon/trunk/debian/cameleon.docs
===================================================================
--- trunk/packages/cameleon/trunk/debian/cameleon.docs	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/cameleon.docs	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,3 +1 @@
-Changes.txt
 README
-Changes.txt

Modified: trunk/packages/cameleon/trunk/debian/cameleon.menu
===================================================================
--- trunk/packages/cameleon/trunk/debian/cameleon.menu	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/cameleon.menu	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,3 +1,8 @@
-?package(cameleon):needs="X11" section="Apps/Programming"\
+?package(cameleon):needs="X11" \
+  section="Apps/Programming"\
   title="Cameleon"\
-  command="/usr/bin/cameleon"
+  command="/usr/bin/cameleon2.byte"
+?package(cameleon):needs="X11" \
+  section="Help"\
+  title="OCaml docbrowser"\
+  command="/usr/bin/docbrowser2.byte"

Modified: trunk/packages/cameleon/trunk/debian/changelog
===================================================================
--- trunk/packages/cameleon/trunk/debian/changelog	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/changelog	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,6 +1,7 @@
-cameleon (1.99.cvs20050909-1) unstable; urgency=low
+cameleon (1.9.9.cvs20051114-1) unstable; urgency=low
 
   * New upstream release
+  * Upgrade to standards version 3.6.2.0 (no change)
 
  -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 10 Oct 2005 22:53:51 +0200
 

Modified: trunk/packages/cameleon/trunk/debian/control
===================================================================
--- trunk/packages/cameleon/trunk/debian/control	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/control	2005-11-14 23:47:02 UTC (rev 2050)
@@ -4,12 +4,15 @@
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.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.08.3, liblablgtk2-ocaml-dev (>= 2.4.0)
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.0
 
 Package: cameleon
-Architecture: all
+Architecture: any
 Depends: ocaml-report (= ${Source-Version}), ocamlcvs (= ${Source-Version}), ocaml-dbforge (= ${Source-Version}), libcameleon-ocaml-dev (= ${Source-Version}), ocaml-base-nox-3.08.3, ${shlibs:Depends}
 Suggests: cameleon-doc
+Provides: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy
+Conflicts: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy
+Replaces: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy
 Description: integrated development environment for OCaml
  Cameleon is a set of tools and libraries put together to create an
  integrated development environment for the OCaml programming language.
@@ -36,7 +39,7 @@
  You can find more information about cameleon at http://home.gna.org/cameleon/
 
 Package: ocaml-report
-Architecture: all
+Architecture: any
 Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: XML report tool for documenting OCaml applications
@@ -48,7 +51,7 @@
  You can find more information about cameleon at http://home.gna.org/cameleon/
 
 Package: ocamlcvs
-Architecture: all
+Architecture: any
 Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: graphical frontend for accessing CVS
@@ -62,7 +65,7 @@
  You can find more information about cameleon at http://home.gna.org/cameleon/
 
 Package: ocaml-dbforge
-Architecture: all
+Architecture: any
 Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: graphical tool for generating OCaml code to access databases
@@ -77,7 +80,9 @@
 Architecture: any
 Depends: ocaml-nox-3.08.3, liblablgtk2-ocaml-dev (>= 2.4.0)
 Suggests: cameleon-doc
-Conflicts: ocaml-configwin
+Provides: libreport-ocaml-dev, libmlchat-ocaml-dev, libocamlcvs-ocaml-dev, libgpattern-ocaml-dev, liboptions-ocaml-dev, libokey-ocaml-dev, libconfigwin-ocaml-dev
+Conflicts: libreport-ocaml-dev, libmlchat-ocaml-dev, libocamlcvs-ocaml-dev, libgpattern-ocaml-dev, liboptions-ocaml-dev, libokey-ocaml-dev, libconfigwin-ocaml-dev
+Replaces: libreport-ocaml-dev, libmlchat-ocaml-dev, libocamlcvs-ocaml-dev, libgpattern-ocaml-dev, liboptions-ocaml-dev, libokey-ocaml-dev, libconfigwin-ocaml-dev
 Description: OCaml library to display LablGTK dialog boxes
  Libraries from cameleon :
   - Config_file, a library to easily create configuration files,

Modified: trunk/packages/cameleon/trunk/debian/copyright
===================================================================
--- trunk/packages/cameleon/trunk/debian/copyright	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/copyright	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,14 +1,24 @@
 This package was debianized by Jerome Marant <jerome at debian.org> on
 Tue, 27 Aug 2002 19:04:28 +0200.
+This packages is maintained by Sylvain Le Gall 
+<sylvain.le-gall at polytechnique.org> since 
+Tue, 03 Aug 2004 00:00:00 +0200.
 
-It was downloaded from http://pauillac.inria.fr/~guesdon/Tools/Tars
+It was downloaded from 
+ http://download.gna.org/cameleon/
 
-Upstream Authors: Maxence Guesdon <maxence.guesdon at inria.fr>
-                  Dimitri Ara <dimitri at nerim.net>
+Upstream Authors: 
+Maxence Guesdon <maxence.guesdon at inria.fr>
+Dimitri Ara <dimitri at nerim.net>
+Pierre-Yves Strub.
+Jean-Baptiste Rouquier.
+Fabrice Le Fessant (original work for config_file).
 
 Copyright:
 
-Cameleon is distributed under the terms of the GPL (GNU Public License).
+Cameleon is distributed under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2.1 of the License,
+or any later version.  
 
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL.

Added: trunk/packages/cameleon/trunk/debian/libcameleon-ocaml-dev.examples
===================================================================
--- trunk/packages/cameleon/trunk/debian/libcameleon-ocaml-dev.examples	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/libcameleon-ocaml-dev.examples	2005-11-14 23:47:02 UTC (rev 2050)
@@ -0,0 +1 @@
+src/dbforge/templates/sql_vtable.tmpl.ml

Added: trunk/packages/cameleon/trunk/debian/ocaml-dbforge.menu
===================================================================
--- trunk/packages/cameleon/trunk/debian/ocaml-dbforge.menu	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/ocaml-dbforge.menu	2005-11-14 23:47:02 UTC (rev 2050)
@@ -0,0 +1,4 @@
+?package(ocaml-dbforge):needs="X11" \
+ section="Apps/Programming"\
+ title="DBForge"\
+ command="/usr/bin/dbforge2.gui.byte"

Added: trunk/packages/cameleon/trunk/debian/ocaml-report.menu
===================================================================
--- trunk/packages/cameleon/trunk/debian/ocaml-report.menu	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/ocaml-report.menu	2005-11-14 23:47:02 UTC (rev 2050)
@@ -0,0 +1,4 @@
+?package(ocaml-report):needs="X11" \
+ section="Apps/Programming"\
+ title="Report"\
+ command="/usr/bin/report2.gui.byte"

Modified: trunk/packages/cameleon/trunk/debian/ocamlcvs.menu
===================================================================
--- trunk/packages/cameleon/trunk/debian/ocamlcvs.menu	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/ocamlcvs.menu	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,3 +1,4 @@
-?package(ocamlcvs):needs="X11" section="Apps/Programming"\
+?package(ocamlcvs):needs="X11" \
+  section="Apps/Programming"\
   title="OCamlCVS"\
-  command="/usr/bin/ocamlcvs"
+  command="/usr/bin/ocamlcvs2.byte"

Modified: trunk/packages/cameleon/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/patches/00list	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,3 +1,2 @@
 xml_light
-tmpl_engine
 ocamldoc_best

Modified: trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch
===================================================================
--- trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch	2005-11-14 23:47:02 UTC (rev 2050)
@@ -7,7 +7,7 @@
 @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-04 17:22:13.000000000 +0100
++++ trunk/doc/Makefile	2005-11-15 00:10:01.000000000 +0100
 @@ -52,4 +52,4 @@
          fi; done
  clean:
@@ -16,8 +16,8 @@
 \ Pas de fin de ligne à la fin du fichier.
 +dummy:
 diff -urNad trunk~/master.Makefile.in trunk/master.Makefile.in
---- trunk~/master.Makefile.in	2005-11-04 17:14:09.000000000 +0100
-+++ trunk/master.Makefile.in	2005-11-04 17:20:42.000000000 +0100
+--- trunk~/master.Makefile.in	2005-11-14 08:55:12.000000000 +0100
++++ trunk/master.Makefile.in	2005-11-15 00:10:01.000000000 +0100
 @@ -42,6 +42,11 @@
  EXTRAC_CRC = $(OCAMLLIB)/extract_crc
  OCAMLDOC= @OCAMLDOC@
@@ -31,15 +31,15 @@
  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-04 17:14:09.000000000 +0100
-+++ trunk/src/Makefile	2005-11-04 17:22:03.000000000 +0100
+--- 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
 -	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
 +	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
- 	$^
+ 	`ls $^ | grep -v "/example.ml"`
  
  $(ROOT)/doc/cameleon.odoc:cameleon/*.ml cameleon/*.mli \
 @@ -550,7 +550,7 @@
@@ -84,3 +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

Modified: trunk/packages/cameleon/trunk/debian/rules
===================================================================
--- trunk/packages/cameleon/trunk/debian/rules	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/rules	2005-11-14 23:47:02 UTC (rev 2050)
@@ -5,6 +5,8 @@
 
 include /usr/share/dpatch/dpatch.make
 PACKAGE=cameleon
+VERSION=$(shell dpkg-parsechangelog | \
+	awk "/Version: .*/ { gsub(\"-.*\",\"\",\$2); print \$2; }")
 OCAMLIBDIR=$(shell ocamlc -where)
 CAMELEONTMP=$(CURDIR)/debian/tmp
 CAMELEON=$(CURDIR)/debian/cameleon
@@ -41,16 +43,17 @@
 	#$(MAKE) manual
 	# Make HTML manual
 	#$(MAKE) -C doc html
+	$(MAKE) -C debian/xml-man all 
 	touch build-stamp
 
 clean: clean1 unpatch
 clean1:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-	rm -f master.Makefile
+	-$(MAKE) -C debian/xml-man clean
+	-$(RM) src/dump.odoc doc/stdlib.odoc doc/cameleon.odoc
+	-$(RM) build-stamp depend-stamp configure-stamp
 	dh_clean
 
 install: build-stamp 
@@ -66,10 +69,17 @@
 	mkdir -p $(CAMELEONDOC)/$(OCAMLIBDIR)/cameleon
 	mv $(CAMELEONTMP)/$(OCAMLIBDIR)/cameleon/*.odoc \
 	  $(CAMELEONDOC)/$(OCAMLIBDIR)/cameleon
+	# Generate additional documentation
+	ocamldoc -html -d  $(CAMELEONDOC)/usr/share/doc/cameleon/html/ \
+	  -load $(CAMELEONDOC)/$(OCAMLIBDIR)/cameleon/cameleon.odoc
 	# Install library (libcameleon-ocaml-dev)
 	mkdir -p $(CAMELEONLIB)/$(OCAMLIBDIR)
 	mv $(CAMELEONTMP)/$(OCAMLIBDIR)/cameleon \
 	  $(CAMELEONLIB)/$(OCAMLIBDIR)
+	# Install META
+	mkdir -p $(CAMELEONLIB)/$(OCAMLIBDIR)/METAS
+	sed -e "s/@VERSION@/$(VERSION)/" debian/META.in \
+	  > $(CAMELEONLIB)/$(OCAMLIBDIR)/METAS/META.cameleon
 	# Move files
 	dh_install --sourcedir=$(CAMELEONTMP) --fail-missing --autodest
 	$(RM) -r $(CAMELEONTMP)
@@ -82,7 +92,7 @@
 	dh_installmenu -i
 	dh_installman -i
 	dh_installchangelogs -i ChangeLog
-	dh_strip -i
+	dh_strip -i -X.byte
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -96,8 +106,10 @@
 	dh_testroot -a
 	dh_installdocs -a
 	dh_installexamples -a
+	dh_installmenu -a
+	dh_installman -a
 	dh_installchangelogs -a ChangeLog
-	dh_strip -a
+	dh_strip -a -X.byte
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

Modified: trunk/packages/cameleon/trunk/debian/watch
===================================================================
--- trunk/packages/cameleon/trunk/debian/watch	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/watch	2005-11-14 23:47:02 UTC (rev 2050)
@@ -1,2 +1,2 @@
 version=2
-http://savannah.nongnu.org/download/cameleon/cameleon_([0-9\.]*)\.tar\.gz
+http://download.gna.org/cameleon/cameleon_([0-9\.]*)\.tar\.gz

Modified: trunk/packages/cameleon/trunk/debian/xml-man/tmpl_engine.byte.xml
===================================================================
--- trunk/packages/cameleon/trunk/debian/xml-man/tmpl_engine.byte.xml	2005-11-14 16:18:37 UTC (rev 2049)
+++ trunk/packages/cameleon/trunk/debian/xml-man/tmpl_engine.byte.xml	2005-11-14 23:47:02 UTC (rev 2050)
@@ -53,7 +53,7 @@
   <title>SEE ALSO</title>
 
   <para>
-    <filename>/usr/share/doc/examples/tmpl_engine.tmpl.ml</filename>
+    <filename>/usr/share/doc/examples/*.tmpl.ml</filename>
   </para>
 
 </refsect1>

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