[Pkg-ocaml-maint-commits] r2034 - trunk/packages/gmetadom/trunk/debian

Stefano Zacchiroli zack at costa.debian.org
Sun Nov 13 11:33:48 UTC 2005


Author: zack
Date: 2005-11-13 11:33:43 +0000 (Sun, 13 Nov 2005)
New Revision: 2034

Added:
   trunk/packages/gmetadom/trunk/debian/control.in
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs.in
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install.in
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs.in
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install.in
Modified:
   trunk/packages/gmetadom/trunk/debian/changelog
   trunk/packages/gmetadom/trunk/debian/control
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs
   trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install
   trunk/packages/gmetadom/trunk/debian/rules
Log:
3.09 transition


Modified: trunk/packages/gmetadom/trunk/debian/changelog
===================================================================
--- trunk/packages/gmetadom/trunk/debian/changelog	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/changelog	2005-11-13 11:33:43 UTC (rev 2034)
@@ -1,3 +1,14 @@
+gmetadom (0.2.3-3) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.09
+  * debian/*
+    - use dpatch
+    - no longer hardcoding of ocaml abi version anywhere
+  * debian/control
+    - bumped standards version
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 13 Nov 2005 11:27:30 +0000
+
 gmetadom (0.2.3-2) unstable; urgency=low
 
   * src/gdome_caml/test/Makefile.in

Modified: trunk/packages/gmetadom/trunk/debian/control
===================================================================
--- trunk/packages/gmetadom/trunk/debian/control	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/control	2005-11-13 11:33:43 UTC (rev 2034)
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: ocaml-findlib, debhelper (>= 4.1.0), ocaml-nox-3.08.3, libgdome2-dev (>= 0.8.1), pkg-config, cdbs
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), libgdome2-dev (>= 0.8.1), pkg-config, dpatch, cdbs
+Standards-Version: 3.6.2
 
 Package: libgdome2-cpp-smart0c2
 Section: libs
@@ -36,7 +36,7 @@
 Package: libgdome2-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for GDome2 DOM implementation
  OCaml bindings for GDome2 that is a fast, light and complete DOM level2
  implementation based on libxml2.
@@ -49,7 +49,7 @@
 Package: libgdome2-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libgdome2-dev (>= 0.8.1), libgdome2-ocaml (= ${Source-Version}), ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, libgdome2-dev (>= 0.8.1), libgdome2-ocaml (= ${Source-Version}), ${misc:Depends}
 Description: OCaml bindings for GDome2 DOM implementation
  OCaml bindings for GDome2 that is a fast, light and complete DOM level2
  implementation based on libxml2.

Added: trunk/packages/gmetadom/trunk/debian/control.in
===================================================================
--- trunk/packages/gmetadom/trunk/debian/control.in	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/control.in	2005-11-13 11:33:43 UTC (rev 2034)
@@ -0,0 +1,62 @@
+Source: gmetadom
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), libgdome2-dev (>= 0.8.1), pkg-config, dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: libgdome2-cpp-smart0c2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgdome2-cpp-smart0
+Replaces: libgdome2-cpp-smart0
+Description: C++ bindings for GDome2 DOM implementation
+ C++ bindings for GDome2 that is a fast, light and complete DOM level2
+ implementation based on libxml2.
+ .
+ This particular binding is one of the bindings from the GMetaDOM
+ bindings collection.
+ .
+ This package includes the shared library.
+
+Package: libgdome2-cpp-smart-dev
+Section: libdevel
+Architecture: any
+Depends: libgdome2-cpp-smart0c2 (= ${Source-Version}), libgdome2-dev (>= 0.8.1), ${misc:Depends}
+Description: C++ bindings for GDome2 DOM implementation
+ C++ bindings for GDome2 that is a fast, light and complete DOM level2
+ implementation based on libxml2.
+ .
+ This particular binding is one of the bindings from the GMetaDOM
+ bindings collection.
+ .
+ This package includes the development files.
+
+Package: libgdome2-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for GDome2 DOM implementation
+ OCaml bindings for GDome2 that is a fast, light and complete DOM level2
+ implementation based on libxml2.
+ .
+ This particular binding is one of the bindings from the GMetaDOM
+ binding collection.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libgdome2-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libgdome2-dev (>= 0.8.1), libgdome2-ocaml (= ${Source-Version}), ${misc:Depends}
+Description: OCaml bindings for GDome2 DOM implementation
+ OCaml bindings for GDome2 that is a fast, light and complete DOM level2
+ implementation based on libxml2.
+ .
+ This particular binding is one of the bindings from the GMetaDOM
+ binding collection.
+ .
+ This package contains the development part of the GDome2 OCaml
+ bindings.
+

Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs	2005-11-13 11:33:43 UTC (rev 2034)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/gdome2
+usr/lib/ocaml/3.09.0/gdome2

Added: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs.in
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs.in	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.dirs.in	2005-11-13 11:33:43 UTC (rev 2034)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/gdome2

Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install	2005-11-13 11:33:43 UTC (rev 2034)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ocaml/3.08.3/gdome2/             usr/lib/ocaml/3.08.3/
-debian/tmp/usr/lib/ocaml/3.08.3/stublibs/*.owner    usr/lib/ocaml/3.08.3/stublibs/
+debian/tmp/usr/lib/ocaml/3.09.0/gdome2/             usr/lib/ocaml/3.09.0/
+debian/tmp/usr/lib/ocaml/3.09.0/stublibs/*.owner    usr/lib/ocaml/3.09.0/stublibs/

Added: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install.in
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install.in	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml-dev.install.in	2005-11-13 11:33:43 UTC (rev 2034)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/gdome2/             usr/lib/ocaml/@OCamlABI@/
+debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*.owner    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs	2005-11-13 11:33:43 UTC (rev 2034)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/stublibs
+usr/lib/ocaml/3.09.0/stublibs

Added: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs.in
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs.in	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.dirs.in	2005-11-13 11:33:43 UTC (rev 2034)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/stublibs

Modified: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install	2005-11-13 11:33:43 UTC (rev 2034)
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/3.08.3/stublibs/*.so       usr/lib/ocaml/3.08.3/stublibs/
+debian/tmp/usr/lib/ocaml/3.09.0/stublibs/*.so       usr/lib/ocaml/3.09.0/stublibs/

Added: trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install.in
===================================================================
--- trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install.in	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/libgdome2-ocaml.install.in	2005-11-13 11:33:43 UTC (rev 2034)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/ocaml/@OCamlABI@/stublibs/*.so       usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/gmetadom/trunk/debian/rules
===================================================================
--- trunk/packages/gmetadom/trunk/debian/rules	2005-11-13 11:24:28 UTC (rev 2033)
+++ trunk/packages/gmetadom/trunk/debian/rules	2005-11-13 11:33:43 UTC (rev 2034)
@@ -2,7 +2,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --with-modules="gdome_cpp_smart gdome_caml"
+
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+DEB_CONFIGURE_EXTRA_FLAGS = --with-modules="gdome_cpp_smart gdome_caml"
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 common-binary-arch::
 	-find debian/ -type f -size 0 -exec rm {} \;
 	-find debian/libgdome2-ocaml-dev -type d -name CVS -exec rm -rf {} \;




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