[Pkg-ocaml-maint-commits] r1895 - trunk/packages/lablgl/trunk/debian

Sven Luther luther at costa.debian.org
Wed Nov 2 12:46:01 UTC 2005 

Author: luther
Date: 2005-11-02 12:46:00 +0000 (Wed, 02 Nov 2005)
New Revision: 1895

Added:
   trunk/packages/lablgl/trunk/debian/compat
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs.in
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs.in
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files.in
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in
Removed:
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override
Modified:
   trunk/packages/lablgl/trunk/debian/changelog
   trunk/packages/lablgl/trunk/debian/control
   trunk/packages/lablgl/trunk/debian/rules
Log:
Adapted to dh_compat 4.
Removed any hardcoded ocaml abi.


Modified: trunk/packages/lablgl/trunk/debian/changelog
===================================================================
--- trunk/packages/lablgl/trunk/debian/changelog	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/changelog	2005-11-02 12:46:00 UTC (rev 1895)
@@ -1,6 +1,7 @@
 lablgl (1.01-8) unstable; urgency=low
 
   * Rebuilt for ocaml 3.09.0.
+  * No hardcoded ocaml abi versions anymore.
 
  -- Sven Luther <luther at debian.org>  Thu, 27 Oct 2005 22:29:48 +0000
 

Added: trunk/packages/lablgl/trunk/debian/compat
===================================================================
--- trunk/packages/lablgl/trunk/debian/compat	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/compat	2005-11-02 12:46:00 UTC (rev 1895)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/lablgl/trunk/debian/control
===================================================================
--- trunk/packages/lablgl/trunk/debian/control	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/control	2005-11-02 12:46:00 UTC (rev 1895)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 3.0.0), ocaml, ocaml-3.09.0, tcl8.4-dev, tk8.4-dev, xlibmesa-gl-dev|libgl-dev, libglu1-xorg-dev|libglu-dev, libglut3-dev, x-dev, libxmu-dev, libx11-dev, dpatch
+Build-Depends: debhelper (>> 3.0.0), ocaml, tcl8.4-dev, tk8.4-dev, xlibmesa-gl-dev|libgl-dev, libglu1-xorg-dev|libglu-dev, libglut3-dev, x-dev, libxmu-dev, libx11-dev, dpatch
 Standards-Version: 3.6.2.0
 
 # Reasons for Build-Depends:
 #
 # debhelper (>> 3.0.0): used in debian/rules
-# ocaml, ocaml-3.09.0: the ocaml compiler and stdlib, with labltk
+# ocaml: the ocaml compiler and stdlib, with labltk
 # tcl8.4-dev: #include <tcl.h>
 # tk8.4-dev: #include <tk.h>
 # libgl-dev: #include <GL/gl.h>
@@ -26,7 +26,7 @@
 Package: liblablgl-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-3.09.0, ${shlibs:Depends}
+Depends: ocaml-base-${F:OcamlABI}, ${shlibs:Depends}
 Conflicts: lablgl (<< 0.97-2)
 Description: Runtime libraries for lablgl
  LablGL is an OpenGL interface for Objective Caml. Since it includes
@@ -39,7 +39,7 @@
 Package: liblablgl-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-3.09.0, xlibmesa-gl-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, libglu1-xorg-dev|xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev
+Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-${F:OcamlABI}, xlibmesa-gl-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, libglu1-xorg-dev|xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev
 Conflicts: lablgl, findlib (<< 1.0.2)
 Replaces: lablgl
 Provides: lablgl

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs	2005-11-02 12:46:00 UTC (rev 1895)
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/ocaml/3.09.0/lablgl
-usr/lib/ocaml/3.09.0/stublibs
-usr/share/lintian/overrides

Copied: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs.in (from rev 1862, trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs)
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs	2005-10-27 22:35:44 UTC (rev 1862)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.dirs.in	2005-11-02 12:46:00 UTC (rev 1895)
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/ocaml/#OcamlABI#/lablgl
+usr/lib/ocaml/#OcamlABI#/stublibs
+usr/share/lintian/overrides

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs	2005-11-02 12:46:00 UTC (rev 1895)
@@ -1,3 +0,0 @@
-usr/lib/ocaml/3.09.0/lablgl
-usr/lib/ocaml/3.09.0/stublibs
-usr/share/lintian/overrides

Copied: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs.in (from rev 1862, trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs)
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs	2005-10-27 22:35:44 UTC (rev 1862)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.dirs.in	2005-11-02 12:46:00 UTC (rev 1895)
@@ -0,0 +1,3 @@
+usr/lib/ocaml/#OcamlABI#/lablgl
+usr/lib/ocaml/#OcamlABI#/stublibs
+usr/share/lintian/overrides

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files	2005-11-02 12:46:00 UTC (rev 1895)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.09.0/stublibs

Copied: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files.in (from rev 1862, trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files)
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files	2005-10-27 22:35:44 UTC (rev 1862)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.files.in	2005-11-02 12:46:00 UTC (rev 1895)
@@ -0,0 +1 @@
+/usr/lib/ocaml/#OcamlABI#/stublibs

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override	2005-11-02 12:46:00 UTC (rev 1895)
@@ -1,2 +0,0 @@
-liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.09.0/stublibs/dlllablgl.so /usr/X11R6/lib
-liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.09.0/stublibs/dlltogl.so /usr/X11R6/lib

Copied: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in (from rev 1862, trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override)
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override	2005-10-27 22:35:44 UTC (rev 1862)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in	2005-11-02 12:46:00 UTC (rev 1895)
@@ -0,0 +1,2 @@
+liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgl.so /usr/X11R6/lib
+liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/#OcamlABI#/stublibs/dlltogl.so /usr/X11R6/lib

Modified: trunk/packages/lablgl/trunk/debian/rules
===================================================================
--- trunk/packages/lablgl/trunk/debian/rules	2005-11-02 12:14:50 UTC (rev 1894)
+++ trunk/packages/lablgl/trunk/debian/rules	2005-11-02 12:46:00 UTC (rev 1895)
@@ -10,16 +10,20 @@
 include /usr/share/dpatch/dpatch.make
 PACKAGE = ocaml
 
+OCAMLABI = ${shell ocamlc -version}
+
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
 export OCAML_LIBDIR=`ocamlc -where`
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
+	
 configure: configure-stamp
 configure-stamp:
+	for t in `find . -name \*.in`; do				\
+		sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in};	\
+	done
+
 	dh_testdir
 	# Add here commands to configure the package.
 	cp debian/Makefile.config .
@@ -104,7 +108,7 @@
 	dh_installdeb -s
 #	dh_perl -s
 	dh_shlibdeps -s
-	dh_gencontrol -s
+	dh_gencontrol -s -- -VF:OcamlABI="$(OCAMLABI)"
 	dh_md5sums -s
 	dh_builddeb -s

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