[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3.3-1-11-gc8d5522

[Hendrik Tews]

The following commit has been merged in the master branch:
commit b61f7ff7375729984cf1f78cec929981d8b22f80
Author: Hendrik Tews <hendrik at askra.de>
Date:   Tue Jan 31 13:05:01 2012 +0100

    * hints from Stephane 2012-01-30

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 5114582..855ad0f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>,
  Hendrik Tews <hendrik at askra.de>
 Build-Depends:
+ ocaml-nox (>= 3.11.1-3~),
  ocaml-best-compilers,
  debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9~),
@@ -21,8 +22,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/otags.git
 Package: otags
 Architecture: any
 Depends:
- camlp4-extra (>= 3.12.1),
- camlp4-extra (<< 3.13),
+ camlp4-extra,
+ ocaml-base-nox-${F:OCamlABI},
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/prerm b/debian/prerm
index c82a87d..1d3e65e 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -6,14 +6,7 @@
 set -e
 
 case "$1" in
-  remove)
-    rm -f /var/lib/otags/vi/TAGS
-    rm -f /var/lib/otags/emacs/TAGS
-    rm -f /var/lib/otags/TAGS
-    rm -f /var/lib/otags/tags
-  ;;
-
-  upgrade)
+  remove|upgrade)
     rm -f /var/lib/otags/vi/TAGS
     rm -f /var/lib/otags/emacs/TAGS
     rm -f /var/lib/otags/TAGS
diff --git a/debian/rules b/debian/rules
index 059628d..fa5574a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,16 @@
 export DH_VERBOSE=1
 
 %:
-	dh --with ocaml $@ 
+	dh --with ocaml $@
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
 	./configure --prefix /usr
 
+.PHONY override_dh_gencontrol
+override_dh_gencontrol:
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 	@echo "   dh_auto_test disabled"
diff --git a/debian/watch b/debian/watch
index cf9b592..973bb50 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-# try uscan(1) 
+# try uscan(1)
 
 # Compulsory line, this is a version 3 file
 version=3

-- 
otags packaging