The following commit has been merged in the master branch:
commit bdae9ad56542bb765e8c694b3b82dd1d9330506f
Author: Hendrik Tews hend...@askra.de
Date: Tue May 21 22:45:40 2013 +0200
new upstream release and small packaging changes
diff --git a/debian/changelog b/debian/changelog
index 6edde76..7bd3371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-ounit (1.1.1-2) UNRELEASED; urgency=low
+ounit (1.1.2-1) unstable; urgency=low
+ [ Sylvain Le Gall ]
* Remove Sylvain Le Gall from uploaders
- -- Sylvain Le Gall gil...@debian.org Fri, 21 Sep 2012 01:23:43 +
+ [ Hendrik Tews ]
+ * New upstream release
+ * install cmx files
+ * remove debian-changes-1.1.0-1 patch and strange changes in _tags
+ * add myself to uploaders
+ * bump standards version
+ * bump debhelper compat level
+
+ -- Hendrik Tews hend...@askra.de Wed, 22 May 2013 12:15:56 +0200
ounit (1.1.1-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 02a7178..a2f97e1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,15 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders:
- Stéphane Glondu glo...@debian.org
+ Stéphane Glondu glo...@debian.org,
+ Hendrik Tews hend...@askra.de
Build-Depends:
- debhelper (= 7.0.50~),
+ debhelper (= 9),
ocaml-nox (= 3.11.1-3~),
ocaml-findlib (= 1.2.5),
dh-ocaml (= 0.9.1),
camlp4
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ounit.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ounit.git
Homepage: http://ounit.forge.ocamlcore.org
diff --git a/debian/libounit-ocaml-dev.install.in
b/debian/libounit-ocaml-dev.install.in
index b04bf76..e83a197 100644
--- a/debian/libounit-ocaml-dev.install.in
+++ b/debian/libounit-ocaml-dev.install.in
@@ -4,4 +4,6 @@ usr/share/doc/ounit/* /usr/share/doc/libounit-ocaml-dev/html/api
@OCamlStdlibDir@/oUnit/META
@OCamlStdlibDir@/oUnit/*.mli
OPT: debian/tmp/usr/lib/ocaml/oUnit/*.a
+OPT: debian/tmp/usr/lib/ocaml/oUnit/*.cmxs
+OPT: debian/tmp/usr/lib/ocaml/oUnit/*.cmx
OPT: debian/tmp/usr/lib/ocaml/oUnit/*.cmxa
diff --git a/debian/patches/debian-changes-1.1.0-1
b/debian/patches/debian-changes-1.1.0-1
deleted file mode 100644
index 4420630..000
--- a/debian/patches/debian-changes-1.1.0-1
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Upstream changes introduced in version 1.1.0-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ounit (1.1.0-1) experimental; urgency=low
- .
- * New upstream release:
- * Applied patch from Michael Ekstrand concerning stack trace
- (Closes: #528603)
- * Update META version field (Closes: #607872)
- * Update homepage
- * Rebuild debian/rules using dh and oasis
- * Upgrade Standards-Version to 3.9.1 (no change)
- * Use DEP-5 for debian/copyright
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall gil...@debian.org
-Bug-Debian: http://bugs.debian.org/528603
-Bug-Debian: http://bugs.debian.org/607872
-
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: vendor|upstream|other, url of original patch
-Bug: url in upstream bugtracker
-Bug-Debian: http://bugs.debian.org/bugnumber
-Bug-Ubuntu: https://launchpad.net/bugs/bugnumber
-Forwarded: no|not-needed|url proving that it has been forwarded
-Reviewed-By: name and email of someone who approved the patch
-Last-Update: -MM-DD
-
ounit-1.1.0.orig/_tags
-+++ ounit-1.1.0/_tags
-@@ -17,3 +17,5 @@
- src/oUnit.odoc: oasis_document_api_ounit
- src/oUnit.ml: oasis_document_api_ounit
- src/api-ounit.docdir: oasis_document_api_ounit
-+.git: not_hygienic, -traverse
-+
diff --git a/debian/patches/series b/debian/patches/series
index c3e8e54..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-debian-changes-1.1.0-1
diff --git a/debian/rules b/debian/rules
index 793b94f..4367c62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
+
DESTDIR=$(CURDIR)/debian/tmp
include /usr/share/ocaml/ocamlvars.mk
@@ -27,7 +31,7 @@ OCAMLFIND_LDCONF=ignore
export OCAMLFIND_LDCONF
%:
- dh --with ocaml $@
+ dh $@ --with ocaml
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
--
ounit packaging
___
