[Pkg-ocaml-maint-commits] r4537 - in /trunk/packages/cameleon/trunk/debian: cameleon.desktop chamo.desktop changelog control control.in dbforge.desktop ocaml-docbrowser.desktop ocamlcvs.desktop patches/00list patches/ocamldoc_best.dpatch report.desktop rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Tue Sep 18 22:46:27 UTC 2007 

Author: gildor
Date: Tue Sep 18 22:46:27 2007
New Revision: 4537

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4537
Log:
* Add desktop file
* Update patches to match latest upstream version

Modified:
    trunk/packages/cameleon/trunk/debian/cameleon.desktop
    trunk/packages/cameleon/trunk/debian/chamo.desktop
    trunk/packages/cameleon/trunk/debian/changelog
    trunk/packages/cameleon/trunk/debian/control
    trunk/packages/cameleon/trunk/debian/control.in
    trunk/packages/cameleon/trunk/debian/dbforge.desktop
    trunk/packages/cameleon/trunk/debian/ocaml-docbrowser.desktop
    trunk/packages/cameleon/trunk/debian/ocamlcvs.desktop
    trunk/packages/cameleon/trunk/debian/patches/00list
    trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch
    trunk/packages/cameleon/trunk/debian/report.desktop
    trunk/packages/cameleon/trunk/debian/rules

Modified: trunk/packages/cameleon/trunk/debian/cameleon.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/cameleon.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/cameleon.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/cameleon.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=Cameleon
-Generic Name=OCaml Integrated Development Environment
-Generic Name[fr]=Environnement de développement logiciel OCaml 
+GenericName=OCaml Integrated Development Environment
+GenericName[fr]=Environnement de développement logiciel OCaml 
 Comment=Visual environment to develop OCaml application
 Comment[fr]=Environnement visuel pour le développement d'application OCaml
 TryExec=cameleon2.byte

Modified: trunk/packages/cameleon/trunk/debian/chamo.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/chamo.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/chamo.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/chamo.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=Chamo
-Generic Name=Source code editor
-Generic Name[fr]=Editeur de code source
+GenericName=Source code editor
+GenericName[fr]=Editeur de code source
 Comment=Emacs-like editor for OCaml code
 Comment[fr]=Editeur de code OCaml à la emacs
 TryExec=chamo.byte

Modified: trunk/packages/cameleon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/changelog?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/changelog (original)
+++ trunk/packages/cameleon/trunk/debian/changelog Tue Sep 18 22:46:27 2007
@@ -1,4 +1,4 @@
-cameleon (1.9.17-1) UNRELEASED; urgency=low
+cameleon (1.9.18.20070918svn-1) UNRELEASED; urgency=low
 
   * New upstream release,
   * Upgrade debian/watch version to 3,
@@ -17,8 +17,9 @@
   * Change email address to gildor at debian.org everywhere
   * Use DTD from docbook-xml package and not from docbook package
   * Reduce debian/changelog to 80 columns
-
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 23 Jun 2007 23:37:13 +0100
+  * Build for ocaml 3.10.0
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 00:26:43 +0200
 
 cameleon (1.9.13-2) unstable; urgency=low
 

Modified: trunk/packages/cameleon/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/control?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control (original)
+++ trunk/packages/cameleon/trunk/debian/control Tue Sep 18 22:46:27 2007
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
  liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev,
  liblablgtksourceview-ocaml-dev (>= 0.2.1), imagemagick, ocaml-findlib,
- dpkg-dev (>= 1.13.19)
+ dpkg-dev (>= 1.13.19), libpcre-ocaml-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cameleon
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/

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=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control.in (original)
+++ trunk/packages/cameleon/trunk/debian/control.in Tue Sep 18 22:46:27 2007
@@ -6,7 +6,7 @@
 Build-Depends: @cdbs@, 
  liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev,
  liblablgtksourceview-ocaml-dev (>= 0.2.1), imagemagick, ocaml-findlib,
- dpkg-dev (>= 1.13.19)
+ dpkg-dev (>= 1.13.19), libpcre-ocaml-dev, camlp4 (>= 3.10.0)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cameleon
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/

Modified: trunk/packages/cameleon/trunk/debian/dbforge.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/dbforge.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/dbforge.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/dbforge.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=DBForge
-Generic Name=Database designer
-Generic Name[fr]=Créateur de base de données
+GenericName=Database designer
+GenericName[fr]=Créateur de base de données
 Comment=Design database schema for OCaml
 Comment[fr]=Créé des schémas de base de données pour OCaml
 TryExec=dbforge2.gui.byte

Modified: trunk/packages/cameleon/trunk/debian/ocaml-docbrowser.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/ocaml-docbrowser.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/ocaml-docbrowser.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/ocaml-docbrowser.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=OCaml docbrowser
-Generic Name=Documentation browser for OCaml
-Generic Name[fr]=Visualiseur de documentation pour OCaml
+GenericName=Documentation browser for OCaml
+GenericName[fr]=Visualiseur de documentation pour OCaml
 Comment=Handle ocamldoc generated documentation
 Comment[fr]=Prend en charge la documentation produite par ocamldoc
 TryExec=docbrowser2.byte

Modified: trunk/packages/cameleon/trunk/debian/ocamlcvs.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/ocamlcvs.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/ocamlcvs.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/ocamlcvs.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=OCamlCVS
-Generic Name=Handle CVS
-Generic Name[fr]=Gestion de CVS
+GenericName=Handle CVS
+GenericName[fr]=Gestion de CVS
 Comment=Visual utility to manage CVS files
 Comment[fr]=Utilitaire visuel pour gérer les fichiers sous CVS
 TryExec=ocamlcvs2.byte

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=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list (original)
+++ trunk/packages/cameleon/trunk/debian/patches/00list Tue Sep 18 22:46:27 2007
@@ -1,5 +1,2 @@
 xml_light
 ocamldoc_best
-byte_compilation
-mktop_bad_header
-testpcre

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=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch (original)
+++ trunk/packages/cameleon/trunk/debian/patches/ocamldoc_best.dpatch Tue Sep 18 22:46:27 2007
@@ -5,20 +5,20 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cameleon-1.9.16~/doc/Makefile cameleon-1.9.16/doc/Makefile
---- cameleon-1.9.16~/doc/Makefile	2006-11-10 00:22:51.000000000 +0100
-+++ cameleon-1.9.16/doc/Makefile	2006-11-10 00:24:08.000000000 +0100
-@@ -52,4 +52,4 @@
-         fi; done
+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 @@
  clean:
+ 	$(RM) *.odoc
  distclean: clean
 -dummy:
 \ No newline at end of file
 +dummy:
-diff -urNad cameleon-1.9.16~/master.Makefile.in cameleon-1.9.16/master.Makefile.in
---- cameleon-1.9.16~/master.Makefile.in	2006-11-10 00:22:51.000000000 +0100
-+++ cameleon-1.9.16/master.Makefile.in	2006-11-10 00:24:08.000000000 +0100
-@@ -43,6 +43,11 @@
+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 @@
  EXTRAC_CRC = $(OCAMLLIB)/extract_crc
  OCAMLDOC= @OCAMLDOC@
  OCAMLDOCOPT= @OCAMLDOC_OPT@
@@ -30,52 +30,52 @@
  OCAMLPP=
  LATEX=TEXINPUTS=$(ROOT)/doc: latex
  HEVEA=hevea -fix -francais -I $(ROOT)/doc -exec xxdate.exe
-diff -urNad cameleon-1.9.16~/src/Makefile cameleon-1.9.16/src/Makefile
---- cameleon-1.9.16~/src/Makefile	2006-11-10 00:24:08.000000000 +0100
-+++ cameleon-1.9.16/src/Makefile	2006-11-10 00:24:08.000000000 +0100
-@@ -841,7 +841,7 @@
+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 \
  	$(GTKSV_UTILS_CMO:.cmo=.ml) $(GTKSV_UTILS_CMO:.cmo=.mli)
--	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
-+	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
- 	`ls $^ | grep -v example.ml | grep -v example2.ml`
+-	$(OCAMLDOCOPT) \
++	$(OCAMLDOCBEST) \
+ 	$(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $@ \
+ 	`ls $^ | grep -v example.ml | grep -v example2.ml | grep -v test | grep -v cam_rss`
  
- $(ROOT)/doc/cameleon.odoc:cameleon/*.ml cameleon/*.mli \
-@@ -860,7 +860,7 @@
+@@ -1066,7 +1066,7 @@
  	odot/*.ml odot/*.mli \
  	editor/*.ml editor/*.mli \
  	$(GTKSV_UTILS_CMO:.cmo=.ml) $(GTKSV_UTILS_CMO:.cmo=.mli)
--	$(OCAMLDOCOPT) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
-+	$(OCAMLDOCBEST) $(INCLUDES) -keep-code $(OCAMLPP) $(COMPFLAGS) -sort -dump $@ \
+-	$(OCAMLDOCOPT) \
++	$(OCAMLDOCBEST) \
+ 	$(INCLUDES) -keep-code $(COMPFLAGS) -sort -dump $@ \
  	ocamlcvs/ocamlcvs.mli \
  	odot/odot.mli odot/odot_view.mli \
- 	$(GTKSV_UTILS_CMO:.cmo=.ml) $(GTKSV_UTILS_CMO:.cmo=.mli) \
-@@ -884,12 +884,12 @@
+@@ -1092,12 +1092,12 @@
  dumps.odoc:
  	for i in editor cameleon utils config_file gtksv-utils okey \
  	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 \
+-	$(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) $(OCAMLPP) $(COMPFLAGS) \
-+	$(OCAMLDOCBEST) $(OCAMLPP) $(COMPFLAGS) \
+-	$(OCAMLDOCOPT) $(COMPFLAGS) \
++	$(OCAMLDOCBEST) $(COMPFLAGS) \
  	-html \
  	-load dump.odoc \
  	-intro $(ROOT)/doc/reference_doc_intro.text \
-@@ -897,7 +897,7 @@
- 
+@@ -1106,7 +1106,7 @@
  websitedoc: $(ROOT)/doc/cameleon.odoc
- 	$(MKDIR) $(ROOT)/web/site/refdoc
--	$(OCAMLDOCOPT) $(OCAMLPP) $(COMPFLAGS) \
-+	$(OCAMLDOCBEST) $(OCAMLPP) $(COMPFLAGS) \
+ 	$(MKDIR) $(ROOT)/../website/refdoc
+ 	$(MKDIR) $(ROOT)/../website/snippets
+-	$(OCAMLDOCOPT) $(COMPFLAGS) \
++	$(OCAMLDOCBEST) $(COMPFLAGS) \
  	-html \
  	-load $< \
  	-intro $(ROOT)/doc/web_reference_doc_intro.text \
-@@ -911,7 +911,7 @@
+@@ -1132,7 +1132,7 @@
  
  dot: dep.dot
  dep.dot: dump.odoc

Modified: trunk/packages/cameleon/trunk/debian/report.desktop
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/report.desktop?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/report.desktop (original)
+++ trunk/packages/cameleon/trunk/debian/report.desktop Tue Sep 18 22:46:27 2007
@@ -3,8 +3,8 @@
 Encoding=UTF-8
 Type=Application
 Name=Report
-Generic Name=XML schema builder for OCaml
-Generic Name[fr]=Constructeur de schema XML pour OCaml
+GenericName=XML schema builder for OCaml
+GenericName[fr]=Constructeur de schema XML pour OCaml
 Comment=Edit schema to define XML reader in OCaml
 Comment[fr]=Edition de schema qui définissent des lecteurs XML en OCaml
 TryExec=report2.gui.byte

Modified: trunk/packages/cameleon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/rules?rev=4537&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/rules (original)
+++ trunk/packages/cameleon/trunk/debian/rules Tue Sep 18 22:46:27 2007
@@ -65,7 +65,7 @@
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
 
 clean::
 	-$(RM) $(CURDIR)/src/dump.odoc

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