[Pkg-ocaml-maint-commits] r2218 - trunk/packages/ounit/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-12-02 22:20:04 +0000 (Fri, 02 Dec 2005)
New Revision: 2218

Added:
   trunk/packages/ounit/trunk/debian/control.in
Modified:
   trunk/packages/ounit/trunk/debian/changelog
   trunk/packages/ounit/trunk/debian/control
   trunk/packages/ounit/trunk/debian/rules
Log:
Prepare release -- SLG


Modified: trunk/packages/ounit/trunk/debian/changelog
===================================================================
--- trunk/packages/ounit/trunk/debian/changelog	2005-12-02 22:13:11 UTC (rev 2217)
+++ trunk/packages/ounit/trunk/debian/changelog	2005-12-02 22:20:04 UTC (rev 2218)
@@ -1,8 +1,9 @@
 ounit (1.0.2-2) unstable; urgency=low
 
   * Transition to svn-buildpackage
+  * Remove hardcoded OCaml ABI (Closes: #339124)
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 22 Aug 2005 23:45:09 +0200
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Fri,  2 Dec 2005 23:18:37 +0100
 
 ounit (1.0.2-1) unstable; urgency=low
 

Modified: trunk/packages/ounit/trunk/debian/control
===================================================================
--- trunk/packages/ounit/trunk/debian/control	2005-12-02 22:13:11 UTC (rev 2217)
+++ trunk/packages/ounit/trunk/debian/control	2005-12-02 22:20:04 UTC (rev 2218)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.4-1), dpatch, docbook-utils
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.0.4-1), dpatch, docbook-utils
 Standards-Version: 3.6.2.0
 
 Package: libounit-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3
+Depends: ocaml-nox-${F:OCamlABI}
 Description: Unit testing framework for Objective Caml
  OUnit is a unit testing framework for Objective Caml, imspired
  by the JUnit tool for JAva and the HUnit tool for Haskell.

Copied: trunk/packages/ounit/trunk/debian/control.in (from rev 2188, trunk/packages/ounit/trunk/debian/control)
===================================================================
--- trunk/packages/ounit/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/ounit/trunk/debian/control.in	2005-12-02 22:20:04 UTC (rev 2218)
@@ -0,0 +1,18 @@
+Source: ounit
+Section: devel
+Priority: optional
+Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OCamlABI#), ocaml-findlib (>= 1.0.4-1), dpatch, docbook-utils
+Standards-Version: 3.6.2.0
+
+Package: libounit-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}
+Description: Unit testing framework for Objective Caml
+ OUnit is a unit testing framework for Objective Caml, imspired
+ by the JUnit tool for JAva and the HUnit tool for Haskell.
+ .
+ OUnit is designed to provide a convenient way for you to write tests
+ for your OCaml code.  Tests can be aggregated into test suites, making
+ it easy to both write tests close to the code being examined and
+ execute a comprehensive aggregate set of tests -- or any subset of it.

Modified: trunk/packages/ounit/trunk/debian/rules
===================================================================
--- trunk/packages/ounit/trunk/debian/rules	2005-12-02 22:13:11 UTC (rev 2217)
+++ trunk/packages/ounit/trunk/debian/rules	2005-12-02 22:20:04 UTC (rev 2218)
@@ -6,7 +6,11 @@
 
 include /usr/share/dpatch/dpatch.make
 PACKAGE=ounit
+OCAMLABI=$(shell ocamlc -version)
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,31 +41,28 @@
 	mkdir -p $(DDOCAMLDIR)
 	$(MAKE) install DESTDIR=$(DDOCAMLDIR)
 
-
-# Build architecture-independent files here.
 binary-indep: build install
 
-# Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs changelog
-	dh_installdocs 
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a changelog
+	dh_installdocs -a
 	mv $(DD)/usr/share/doc/libounit-ocaml-dev/*.{css,html} \
 		$(DD)/usr/share/doc/libounit-ocaml-dev/html/api
 	docbook2html $(DD)/usr/share/doc/libounit-ocaml-dev/OUnit.xml \
 		--output $(DD)/usr/share/doc/libounit-ocaml-dev/html/manual
-	dh_installexamples examples/*
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installexamples -a examples/*
+	dh_installman -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_md5sums -a 
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure