[Pkg-ocaml-maint-commits] r1900 - trunk/packages/camlzip/trunk/debian

[Sven Luther]

Author: luther
Date: 2005-11-02 15:08:24 +0000 (Wed, 02 Nov 2005)
New Revision: 1900

Added:
   trunk/packages/camlzip/trunk/debian/compat
   trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in
   trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in
   trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in
Removed:
   trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs
   trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs
   trunk/packages/camlzip/trunk/debian/libzip-ocaml.files
Modified:
   trunk/packages/camlzip/trunk/debian/control
   trunk/packages/camlzip/trunk/debian/rules
Log:
Adapted to new no hardcoded abi scheme.


Added: trunk/packages/camlzip/trunk/debian/compat
===================================================================
--- trunk/packages/camlzip/trunk/debian/compat	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/compat	2005-11-02 15:08:24 UTC (rev 1900)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/camlzip/trunk/debian/control
===================================================================
--- trunk/packages/camlzip/trunk/debian/control	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/control	2005-11-02 15:08:24 UTC (rev 1900)
@@ -2,13 +2,13 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sven Luther <luther at debian.org>
-Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml (>= 3.08.2), ocaml-nox-3.09.0, dpatch
+Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= 3.09.0), dpatch
 Standards-Version: 3.5.2
 
 Package: libzip-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-3.09,0, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OcamlABI}, ${shlibs:Depends}
 Conflicts: camlzip (<< 1.01-3)
 Description: ocaml compression libraries
  This Objective Caml library provides easy access to compressed files in ZIP
@@ -20,7 +20,7 @@
 Package: libzip-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-3.09.0, zlib1g-dev (>> 1.1.4), libzip-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OcamlABI}, zlib1g-dev (>> 1.1.4), libzip-ocaml (= ${Source-Version})
 Conflicts: camlzip
 Replaces: camlzip
 Provides: camlzip

Deleted: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs	2005-11-02 15:08:24 UTC (rev 1900)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.09.0/zip

Copied: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in (from rev 1861, trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs)
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs	2005-10-27 22:32:16 UTC (rev 1861)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in	2005-11-02 15:08:24 UTC (rev 1900)
@@ -0,0 +1 @@
+/usr/lib/ocaml/#OcamlABI#/zip

Deleted: trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs	2005-11-02 15:08:24 UTC (rev 1900)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.09.0/stublibs

Copied: trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in (from rev 1861, trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs)
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs	2005-10-27 22:32:16 UTC (rev 1861)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in	2005-11-02 15:08:24 UTC (rev 1900)
@@ -0,0 +1 @@
+/usr/lib/ocaml/#OcamlABI#/stublibs

Deleted: trunk/packages/camlzip/trunk/debian/libzip-ocaml.files
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.files	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.files	2005-11-02 15:08:24 UTC (rev 1900)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/stublibs/dllcamlzip.so

Copied: trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in (from rev 1861, trunk/packages/camlzip/trunk/debian/libzip-ocaml.files)
===================================================================
--- trunk/packages/camlzip/trunk/debian/libzip-ocaml.files	2005-10-27 22:32:16 UTC (rev 1861)
+++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in	2005-11-02 15:08:24 UTC (rev 1900)
@@ -0,0 +1 @@
+usr/lib/ocaml/#OcamlABI#/stublibs/dllcamlzip.so

Modified: trunk/packages/camlzip/trunk/debian/rules
===================================================================
--- trunk/packages/camlzip/trunk/debian/rules	2005-11-02 15:07:43 UTC (rev 1899)
+++ trunk/packages/camlzip/trunk/debian/rules	2005-11-02 15:08:24 UTC (rev 1900)
@@ -5,17 +5,19 @@
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = camlzip
+OCAMLABI = `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.
 	
@@ -95,7 +97,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