- use version deps and build-deps

- moved stuff in /usr/lib/ocaml/<version> stdlib dir

diff --git a/helm/DEVEL/gdome_xslt/debian/changelog b/helm/DEVEL/gdome_xslt/debian/changelog
index 84046d7555cbed4896f2e5c1d7af5f53a57ebe48..4d53e08445a4bdc1289b8fcaa14af1cff3e570d3 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/changelog
+++ b/helm/DEVEL/gdome_xslt/debian/changelog
@@ -1,8 +1,14 @@
 gdome2-xslt (0.0.3-2) unstable; urgency=low
 
+  * Use versioned ocaml standard library directory
+  * Changed deps and build-deps to ocaml-3.06-1
   * Source named changed to gdome2-xslt
-  * Moved .so stub in /usr/lib/ocaml/stublibs
+  * Moved OCaml .so stub in <stdlib>/stublibs
+  * Moved ocaml stuff in /usr/lib/ocaml/3.06
   * Ship also C and C++ flavours
+  * Added dep from libgdome2-xslt-ocaml to libgdome2-ocaml
+  * Added dep from libgdome2-xslt-ocaml-dev to libgdome2-ocaml-dev-0.1.4
+  * Provided a better Description
   * Bumped Standards-Version to 3.5.8
   * Better test for ocamlopt existence
 

diff --git a/helm/DEVEL/gdome_xslt/debian/control b/helm/DEVEL/gdome_xslt/debian/control
index 4d3265d17561a774c29d4330253f9d6dc4a599e3..0672305025d27b1ee29a665add142c4491dc1937 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/control
+++ b/helm/DEVEL/gdome_xslt/debian/control
@@ -2,33 +2,55 @@ Source: gdome2-xslt
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack@debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-3.06, ocaml-findlib, libgdome2-ocaml-dev, libgdome2-dev, libxslt1-dev
+Build-Depends: debhelper (>> 4.0.0), ocaml-3.06-1, ocaml-findlib, libgdome2-ocaml-dev-0.1.4, libgdome2-dev, libxslt1-dev
 Standards-Version: 3.5.8
 
 Package: libgdome2-xslt0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: TODO
- TODO
+Description: Minimal XSLT processor working on GDome2 documents
+ gdome2-xslt is a very small C library that implements a minimal
+ XSLT processor that can be used to apply XSLT stylesheets to
+ gdome2 documents.
+ .
+ This package includes shared libraries for the C implementation
+ and for the C++ bindings.
 
 Package: libgdome2-xslt-dev
 Section: devel
 Architecture: any
 Depends: libgdome2-xslt0 (= ${Source-Version}), libxslt1-dev, libgdome2-dev, libgdome2-cpp-smart-dev
-Description: TODO
- TODO
+Description: Minimal XSLT processor working on GDome2 documents
+ gdome2-xslt is a very small C library that implements a minimal
+ XSLT processor that can be used to apply XSLT stylesheets to
+ gdome2 documents.
+ .
+ This package includes development support files for the C
+ library and for its C++ bindings.
 
 Package: libgdome2-xslt-ocaml
 Architecture: any
-Depends: ocaml-base-3.06, ${shlibs:Depends}
-Description: TODO
- TODO
+Depends: ocaml-base-3.06-1, libgdome2-ocaml, ${shlibs:Depends}
+Description: OCaml bindings for a minimal GDome2 based XSLT processor
+ gdome2-xslt is a very small C library that implements a minimal
+ XSLT processor that can be used to apply XSLT stylesheets to
+ gdome2 documents.
+ .
+ This package ships the OCaml language bindings for gdome2-xslt.
+ .
+ This package contains only the OCaml shared runtime stub libraries.
 
 Package: libgdome2-xslt-ocaml-dev
 Architecture: any
 Section: devel
-Depends: ocaml-3.06, libgdome2-xslt-ocaml (= ${Source-Version}), libxslt1-dev, libgdome2-dev
-Description: TODO
- TODO
+Depends: ocaml-3.06-1, libgdome2-xslt-ocaml (= ${Source-Version}), libgdome2-ocaml-dev-0.1.4, libxslt1-dev, libgdome2-dev
+Description: OCaml bindings for a minimal GDome2 based XSLT processor
+ gdome2-xslt is a very small C library that implements a minimal
+ XSLT processor that can be used to apply XSLT stylesheets to
+ gdome2 documents.
+ .
+ This package ships the OCaml language bindings for gdome2-xslt.
+ .
+ This package contains OCaml development stuff for gdome2-xslt.
 

diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs
index 00a96aed3ffcdab50ae6ef9ec144dd0f89d38e60..8fd99951383753f9b700b1d7fb1879c0c8c524a8 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs
+++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.dirs
@@ -1 +1 @@
-usr/lib/ocaml
+usr/lib/ocaml/3.06

diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.files b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.files
index e997c414eb7a8c62e408e75853c030bfad7226b9..e7203c3249610c92e97b1bf816bcb22b3e31776a 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.files
+++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml-dev.files
@@ -1,3 +1,3 @@
-usr/lib/ocaml/stublibs/*.owner
-usr/lib/ocaml/stublibs/lib*.so
-usr/lib/ocaml/gdome2-xslt/
+usr/lib/ocaml/3.06/stublibs/*.owner
+usr/lib/ocaml/3.06/stublibs/lib*.so
+usr/lib/ocaml/3.06/gdome2-xslt/

diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs
index 00a96aed3ffcdab50ae6ef9ec144dd0f89d38e60..8fd99951383753f9b700b1d7fb1879c0c8c524a8 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs
+++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.dirs
@@ -1 +1 @@
-usr/lib/ocaml
+usr/lib/ocaml/3.06

diff --git a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.files b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.files
index 263196f492389bb486500e72008ffb7357d72c4d..2dd4e59d9b0d8788e22d552af715eb8ba16243dd 100644 (file)
--- a/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.files
+++ b/helm/DEVEL/gdome_xslt/debian/libgdome2-xslt-ocaml.files
@@ -1 +1 @@
-usr/lib/ocaml/stublibs/dll*.so
+usr/lib/ocaml/3.06/stublibs/dll*.so

diff --git a/helm/DEVEL/gdome_xslt/debian/rules b/helm/DEVEL/gdome_xslt/debian/rules
index 48dcdb7fb9e1066378f998aaae5f438f5b350899..560c28f01ae904a11fa41c71dc83385a02a65b85 100755 (executable)
--- a/helm/DEVEL/gdome_xslt/debian/rules
+++ b/helm/DEVEL/gdome_xslt/debian/rules
@@ -9,6 +9,7 @@
 export DH_COMPAT=4
 
 TARGETDIR = debian/libgdome2-xslt-ocaml-dev
+SHARED_LIB_PKG = libgdome2-xslt0
 
 configure: configure-stamp
 configure-stamp:
@@ -50,6 +51,7 @@ binary-arch: build install
        dh_strip -s
        dh_compress -s
        dh_fixperms -s
+       dh_makeshlibs -p $(SHARED_LIB_PKG)
        dh_installdeb -s
        dh_shlibdeps -s
        dh_gencontrol -s