[Pkg-ocaml-maint-commits] r2227 - trunk/packages/cameleon/trunk/debian

Sylvain LE GALL gildor-guest at costa.debian.org
Sat Dec 3 00:08:38 UTC 2005


Author: gildor-guest
Date: 2005-12-03 00:08:37 +0000 (Sat, 03 Dec 2005)
New Revision: 2227

Added:
   trunk/packages/cameleon/trunk/debian/control.in
Modified:
   trunk/packages/cameleon/trunk/debian/changelog
   trunk/packages/cameleon/trunk/debian/control
   trunk/packages/cameleon/trunk/debian/rules
Log:
Remove hardcoded OCaml ABI

Modified: trunk/packages/cameleon/trunk/debian/changelog
===================================================================
--- trunk/packages/cameleon/trunk/debian/changelog	2005-12-03 00:05:01 UTC (rev 2226)
+++ trunk/packages/cameleon/trunk/debian/changelog	2005-12-03 00:08:37 UTC (rev 2227)
@@ -2,17 +2,18 @@
 
   * New upstream release
   * Upgrade to standards version 3.6.2.0 (no change)
-  * Remove most of the binary packages. All the former libraries are grouped in 
+  * Remove most of the binary packages. All the former libraries are grouped in
     libcameleon-ocaml-dev. Ioxml, zoggy, mlchat, omom are no more shipped,
-    since they seemed to have disappeared. 
+    since they seemed to have disappeared.
   * Stop using *.in files. Since all libraries are in the same package a
     simple "mv" is enough.
   * Get rid of lablgtk1 dependencies.
   * Write manpages for all binaries.
   * All META file are grouped in META.cameleon. Most of the former library are
     now a subpackage of cameleon (e.g cameleon.okey).
+  * Remove hardcoded OCaml ABI
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 29 Nov 2005 22:22:01 +0100
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Sat,  3 Dec 2005 01:07:47 +0100
 
 cameleon (1.3-7) unstable; urgency=low
 

Modified: trunk/packages/cameleon/trunk/debian/control
===================================================================
--- trunk/packages/cameleon/trunk/debian/control	2005-12-03 00:05:01 UTC (rev 2226)
+++ trunk/packages/cameleon/trunk/debian/control	2005-12-03 00:08:37 UTC (rev 2227)
@@ -3,12 +3,12 @@
 Priority: optional
 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)
+Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= 3.09.0), liblablgtk2-ocaml-dev (>= 2.4.0)
 Standards-Version: 3.6.2.0
 
 Package: cameleon
 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}
+Depends: ocaml-report (= ${Source-Version}), ocamlcvs (= ${Source-Version}), ocaml-dbforge (= ${Source-Version}), libcameleon-ocaml-dev (= ${Source-Version}), ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Suggests: cameleon-doc
 Provides: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy
 Conflicts: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy
@@ -40,7 +40,7 @@
 
 Package: ocaml-report
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: XML report tool for documenting OCaml applications
  The Report tool aims to make generation of XML documents from OCaml
@@ -52,7 +52,7 @@
 
 Package: ocamlcvs
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: graphical frontend for accessing CVS
  OCamlCVS is a graphical front end for the CVS configuration
@@ -66,7 +66,7 @@
 
 Package: ocaml-dbforge
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Suggests: cameleon-doc
 Description: graphical tool for generating OCaml code to access databases
  DBforge is a tool for generating OCaml code to access databases. This
@@ -78,7 +78,7 @@
 Package: libcameleon-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, liblablgtk2-ocaml-dev (>= 2.4.0)
+Depends: ocaml-nox-${F:OCamlABI}, liblablgtk2-ocaml-dev (>= 2.4.0)
 Suggests: cameleon-doc
 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

Copied: trunk/packages/cameleon/trunk/debian/control.in (from rev 2188, trunk/packages/cameleon/trunk/debian/control)
===================================================================
--- trunk/packages/cameleon/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/cameleon/trunk/debian/control.in	2005-12-03 00:08:37 UTC (rev 2227)
@@ -0,0 +1,99 @@
+Source: cameleon
+Section: devel
+Priority: optional
+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 (>= #OCamlABI#), liblablgtk2-ocaml-dev (>= 2.4.0)
+Standards-Version: 3.6.2.0
+
+Package: cameleon
+Architecture: any
+Depends: ocaml-report (= ${Source-Version}), ocamlcvs (= ${Source-Version}), ocaml-dbforge (= ${Source-Version}), libcameleon-ocaml-dev (= ${Source-Version}), ocaml-base-nox-${F:OCamlABI}, ${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.
+ .
+ Its main features are :
+  - graphical user interface,
+  - configuration management based on CVS,
+  - easy access to and browsing of documentation,
+  - various editors, according to customizable file types,
+  - use of plug-ins to define new features,
+  - highly customizable interface (menus, toolbar, keyboard shortcuts).
+ .
+ You will find the Cameleon user manual as well as the programming guide
+ for most Cameleon libraries in the `cameleon-doc' package.
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+
+Package: cameleon-doc
+Architecture: all
+Description: documentation for Cameleon
+ This package provides the Cameleon Reference Manual in
+ HTML, Postscript and odoc formats.
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+
+Package: ocaml-report
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Suggests: cameleon-doc
+Description: XML report tool for documenting OCaml applications
+ The Report tool aims to make generation of XML documents from OCaml
+ applications easier.
+ The main idea is to separate the structure of the document from the
+ information computed by the application and placed in the document.
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+
+Package: ocamlcvs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Suggests: cameleon-doc
+Description: graphical frontend for accessing CVS
+ OCamlCVS is a graphical front end for the CVS configuration
+ management utility.
+ It displays the file and directories handled by CVS and offers CVS
+ functionalities through menus. OCamlCVS can also show differences
+ between two revisions, and a merge assistant can be used to resolve
+ conflicts.
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+
+Package: ocaml-dbforge
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Suggests: cameleon-doc
+Description: graphical tool for generating OCaml code to access databases
+ DBforge is a tool for generating OCaml code to access databases. This
+ code is generated from a schema, described through a graphical user
+ interface.
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+
+Package: libcameleon-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, liblablgtk2-ocaml-dev (>= 2.4.0)
+Suggests: cameleon-doc
+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,
+  - Okey, a library to easily add handlers to key press events in LablGtk,
+  - Configwin, a library to easily build configuration or input windows
+    in LablGtk,
+  - Report, a tool to graphically define the structure of XML/HTML documents
+    and provide the OCaml code to fill them at runtime,
+  - DBForge, a tool to generate the OCaml code to access database tables,
+    the code being generated from the database schema defined graphically,
+  - Gpattern, a library containing convenient classes to use with LablGtk. 
+ .
+ You can find more information about cameleon at http://home.gna.org/cameleon/
+

Modified: trunk/packages/cameleon/trunk/debian/rules
===================================================================
--- trunk/packages/cameleon/trunk/debian/rules	2005-12-03 00:05:01 UTC (rev 2226)
+++ trunk/packages/cameleon/trunk/debian/rules	2005-12-03 00:08:37 UTC (rev 2227)
@@ -15,7 +15,10 @@
 DBFORGE=$(CURDIR)/debian/ocaml-dbforge
 OCAMLCVS=$(CURDIR)/debian/ocamlcvs
 REPORT=$(CURDIR)/debian/ocaml-report
+OCAMLABI=$(shell ocamlc -version)
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
 
 configure: configure-stamp
 configure-stamp: patch-stamp 
@@ -97,7 +100,7 @@
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
-	dh_gencontrol -i
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -114,7 +117,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a 
-	dh_gencontrol -a
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -a
 	dh_builddeb -a
 




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