[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.12.3-1-7-g482133d

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 6014b98968957a4d581d1fc9b09aedb70f8e004e
Author: Hendrik Tews <hendrik at askra.de>
Date:   Wed May 23 22:21:15 2012 +0200

    adapt packaging to new upstream release

diff --git a/debian/changelog b/debian/changelog
index 51bb19f..c324770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+otags (3.12.4-1) unstable; urgency=low
+
+  * new upstream release
+  * delete bits in dh_auto_clean override that are done by make clean now
+  * add README for /usr/share/otags/hints
+
+ -- Hendrik Tews <hendrik at askra.de>  Wed, 23 May 2012 08:52:21 +0200
+
 otags (3.12.3-1) unstable; urgency=low
 
   * new upstream release
diff --git a/debian/rules b/debian/rules
index 8800369..4010059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@
 #export DH_VERBOSE=1
 #export DH_OPTIONS=-v
 
-include /usr/share/ocaml/ocamlvars.mk
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -22,16 +20,19 @@ export DH_OPTIONS
 override_dh_auto_configure:
 	./configure --prefix /usr
 
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	dh_auto_clean
-	make -C contrib clean
-	rm -f Makefile conf.ml test/test.newtags
+	rm -f Makefile conf.ml
 
 .PHONY: override_dh_ocaml
 override_dh_ocaml:
 	dh_ocaml --runtime-map otags
+
+INSTDIR:=debian/otags
+HINTSDIR:=$(INSTDIR)/usr/share/otags/hints
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	dh_auto_install
+	install -d $(HINTSDIR)
+	install -m 644 debian/README.hints $(HINTSDIR)/README

-- 
otags packaging