[Pkg-ocaml-maint-commits] r6290 - in /trunk/packages/ounit/trunk/debian: changelog clean compat control rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Sat Feb 28 18:42:15 2009
New Revision: 6290

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6290
Log:
* Add build-dependency on dh-ocaml, use rules/ocaml.ml
* Upgrade to debhelper 7, use debian/clean

Added:
    trunk/packages/ounit/trunk/debian/clean
Modified:
    trunk/packages/ounit/trunk/debian/changelog
    trunk/packages/ounit/trunk/debian/compat
    trunk/packages/ounit/trunk/debian/control
    trunk/packages/ounit/trunk/debian/rules

Modified: trunk/packages/ounit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/changelog?rev=6290&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/changelog (original)
+++ trunk/packages/ounit/trunk/debian/changelog Sat Feb 28 18:42:15 2009
@@ -1,11 +1,12 @@
-ounit (1.0.3-2) UNRELEASED; urgency=low
+ounit (1.0.3-2) unstable; urgency=low
 
   * Update Standards-Version to 3.8.0:
     * Add Homepage field
     * Add README.source
-  * Add build-dependency on dh-ocaml
+  * Add build-dependency on dh-ocaml, use rules/ocaml.ml
+  * Upgrade to debhelper 7, use debian/clean
 
- -- Sylvain Le Gall <gildor at debian.org>  Fri, 22 Aug 2008 17:39:53 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 28 Feb 2009 19:39:57 +0100
 
 ounit (1.0.3-1) unstable; urgency=low
 

Added: trunk/packages/ounit/trunk/debian/clean
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/clean?rev=6290&op=file
==============================================================================
--- trunk/packages/ounit/trunk/debian/clean (added)
+++ trunk/packages/ounit/trunk/debian/clean Sat Feb 28 18:42:15 2009
@@ -1,0 +1,2 @@
+debian/libounit-ocaml-dev.dirs
+debian/libounit-ocaml-dev.doc-base.ocamldoc-apiref

Modified: trunk/packages/ounit/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/compat?rev=6290&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/compat (original)
+++ trunk/packages/ounit/trunk/debian/compat Sat Feb 28 18:42:15 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/packages/ounit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/control?rev=6290&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/control (original)
+++ trunk/packages/ounit/trunk/debian/control Sat Feb 28 18:42:15 2009
@@ -3,7 +3,13 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), docbook-utils, dh-ocaml
+Build-Depends: cdbs (>= 0.4), 
+ debhelper (>= 7), 
+ dpatch, 
+ ocaml-nox (>= 3.11), 
+ ocaml-findlib (>= 1.2.4), 
+ docbook-utils, 
+ dh-ocaml (>= 0.4.1)
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ounit/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/

Modified: trunk/packages/ounit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ounit/trunk/debian/rules?rev=6290&op=diff
==============================================================================
--- trunk/packages/ounit/trunk/debian/rules (original)
+++ trunk/packages/ounit/trunk/debian/rules Sat Feb 28 18:42:15 2009
@@ -17,13 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 PACKAGE_DEV := libounit-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -39,18 +36,13 @@
 DEB_MAKE_INSTALL_TARGET  := install 
 DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libounit-ocaml-dev
-
-clean::
-	-$(RM) '$(CURDIR)/depend'
-	-$(RM) -r '$(CURDIR)/manual'
-	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.dirs'
-	-$(RM) '$(CURDIR)/debian/libounit-ocaml-dev.doc-base.ocamldoc-apiref'
 
 build/libounit-ocaml-dev::manual
 manual:
 	mkdir '$@'
 	docbook2html '$(CURDIR)/doc/manual/src/OUnit.xml' --output '$@'
 
+clean::
+	$(RM) -r '$(CURDIR)/manual'
+	$(RM) -r '$(CURDIR)/depend'