[Pkg-ocaml-maint-commits] r1882 - trunk/packages/ledit/trunk/debian

[Sven Luther]

Author: luther
Date: 2005-11-02 10:17:16 +0000 (Wed, 02 Nov 2005)
New Revision: 1882

Added:
   trunk/packages/ledit/trunk/debian/compat
Modified:
   trunk/packages/ledit/trunk/debian/changelog
   trunk/packages/ledit/trunk/debian/control
   trunk/packages/ledit/trunk/debian/rules
Log:
Removed all explicit mention of the ocaml abi number, we lose abi build-depends this way though.


Modified: trunk/packages/ledit/trunk/debian/changelog
===================================================================
--- trunk/packages/ledit/trunk/debian/changelog	2005-11-02 01:35:02 UTC (rev 1881)
+++ trunk/packages/ledit/trunk/debian/changelog	2005-11-02 10:17:16 UTC (rev 1882)
@@ -1,7 +1,9 @@
 ledit (1.11-6) unstable; urgency=low
 
   * Rebuilt for ocaml 3.09.0.
-  * Changed loc to _loc for camlp4.
+  * Changed campl4 loc to _loc.
+  * Removed all references to the ocaml abi from the control file, in favour
+    of a dh_gencontrol substitution variable.
 
  -- Sven Luther <luther at debian.org>  Thu, 27 Oct 2005 21:23:22 +0000
 

Added: trunk/packages/ledit/trunk/debian/compat
===================================================================
--- trunk/packages/ledit/trunk/debian/compat	2005-11-02 01:35:02 UTC (rev 1881)
+++ trunk/packages/ledit/trunk/debian/compat	2005-11-02 10:17:16 UTC (rev 1882)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/ledit/trunk/debian/control
===================================================================
--- trunk/packages/ledit/trunk/debian/control	2005-11-02 01:35:02 UTC (rev 1881)
+++ trunk/packages/ledit/trunk/debian/control	2005-11-02 10:17:16 UTC (rev 1882)
@@ -2,12 +2,12 @@
 Section: editors
 Priority: optional
 Maintainer: Sven Luther <luther at debian.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), ocaml-nox-3.09.0, dpatch
-Standards-Version: 3.6.0
+Build-Depends-Indep: debhelper (>> 4.0.0), ocaml-nox, dpatch
+Standards-Version: 3.6.2
 
 Package: ledit
 Architecture: all
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.09.0
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OcamlABI}
 Description: line editor for interactive programs
  Ledit is a line editor, allowing to use control commands like in emacs
  or in shells (bash, tcsh). To be used with interactive commands. It is

Modified: trunk/packages/ledit/trunk/debian/rules
===================================================================
--- trunk/packages/ledit/trunk/debian/rules	2005-11-02 01:35:02 UTC (rev 1881)
+++ trunk/packages/ledit/trunk/debian/rules	2005-11-02 10:17:16 UTC (rev 1882)
@@ -6,13 +6,11 @@
 include /usr/share/dpatch/dpatch.make
 PACKAGE = ledit
 VERSION = 1.11
+OCAMLABI = $(shell ocamlc -version)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -82,7 +80,7 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -u-VF:OcamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb