[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.12.2-1-4-g36db534
The following commit has been merged in the master branch: commit 52c083f113012b4d3899b7bf1b340360fb498e81 Merge: d3c0a748b12abedd1bd1bd9af042056225be5038 ba68b147a7adfa283b8ba5caca229b338c52d15d Author: Hendrik Tews hend...@askra.de Date: Thu May 17 13:16:57 2012 +0200 Merge tag 'upstream/3.12.3' Upstream version 3.12.3 -- otags packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.12.2-1-4-g36db534
The following commit has been merged in the master branch: commit 0b9b5305870a2f47b5d58f1d25fe4e05115ccb49 Author: Hendrik Tews hend...@askra.de Date: Thu May 17 13:26:20 2012 +0200 update packaging - debhelper compat - standards version - enable tests - changelog diff --git a/debian/changelog b/debian/changelog index 7301315..44a52f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +otags (3.12.3-1) unstable; urgency=low + + * new upstream release + * debhelper compat level 9 + * standards version 3.9.3 + * enable test during build + + -- Hendrik Tews hend...@askra.de Thu, 17 May 2012 13:25:52 +0200 + otags (3.12.2-1) unstable; urgency=low * Imported Upstream version 3.12.2 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index a574afe..192bf33 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,11 @@ Uploaders: Build-Depends: ocaml-nox (= 3.11.1-3~), ocaml-best-compilers, - debhelper (= 8), + debhelper (= 9), dh-ocaml (= 0.9~), camlp4-extra (= 3.12.1), camlp4-extra ( 3.13) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://askra.de/software/otags/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/otags.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/otags.git diff --git a/debian/rules b/debian/rules index 9335f8a..f69e2ce 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,14 @@ # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +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 + %: dh $@ --with ocaml @@ -21,7 +25,3 @@ override_dh_auto_configure: .PHONY: override_dh_gencontrol override_dh_gencontrol: dh_gencontrol -- -VF:OCamlABI=$(OCAML_ABI) - -.PHONY: override_dh_auto_test -override_dh_auto_test: - @echodh_auto_test disabled -- otags packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.12.2-1-4-g36db534
The following commit has been merged in the master branch:
commit 36db5341f647dae0a3add66a71a4e365793f1ad3
Author: Hendrik Tews hend...@askra.de
Date: Thu May 17 14:20:17 2012 +0200
fix dependencies
diff --git a/debian/changelog b/debian/changelog
index 44a52f1..51bb19f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ otags (3.12.3-1) unstable; urgency=low
* debhelper compat level 9
* standards version 3.9.3
* enable test during build
+ * overrides for dh_auto_clean, dh_ocaml
- -- Hendrik Tews hend...@askra.de Thu, 17 May 2012 13:25:52 +0200
+ -- Hendrik Tews hend...@askra.de Thu, 17 May 2012 14:18:27 +0200
otags (3.12.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 192bf33..fe92fb4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends:
debhelper (= 9),
dh-ocaml (= 0.9~),
camlp4-extra (= 3.12.1),
- camlp4-extra ( 3.13)
+ camlp4-extra ( 3.13),
+ libsexplib-camlp4-dev
Standards-Version: 3.9.3
Homepage: http://askra.de/software/otags/
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/otags.git
@@ -23,7 +24,6 @@ Package: otags
Architecture: any
Depends:
camlp4-extra,
- ocaml-base-nox-${F:OCamlABI},
${ocaml:Depends},
${shlibs:Depends},
${misc:Depends}
diff --git a/debian/rules b/debian/rules
index f69e2ce..8800369 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,8 @@
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
include /usr/share/ocaml/ocamlvars.mk
@@ -25,3 +25,13 @@ override_dh_auto_configure:
.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
+
+.PHONY: override_dh_ocaml
+override_dh_ocaml:
+ dh_ocaml --runtime-map otags
--
otags packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
