[Pkg-ocaml-maint-commits] [SCM] json-static packaging branch, master, updated. debian/0.9.6-2-1-g5a3a202

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 5a3a20251f9f30528ed26dce1dca178b066648a8
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 29 13:57:35 2009 +0200

    Use ocaml.mk as a CDBS "rules" file

diff --git a/debian/changelog b/debian/changelog
index dde1a1b..06c289a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+json-static (0.9.6-3) UNRELEASED; urgency=low
+
+  * Use ocaml.mk as a CDBS "rules" file
+
+ -- Stephane Glondu <steph at glondu.net>  Wed, 29 Jul 2009 13:57:14 +0200
+
 json-static (0.9.6-2) unstable; urgency=low
 
   * New upload to build against ocaml 3.11.
@@ -14,4 +20,3 @@ json-static (0.9.6-1) unstable; urgency=low
     Closes: #493109
 
  -- Romain Beauxis <toots at rastageeks.org>  Sat, 02 Aug 2008 03:29:47 +0200
-
diff --git a/debian/rules b/debian/rules
index b724a31..1571ddb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.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
 
 # In order to regenerate 'debian/control' :
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
@@ -19,4 +19,3 @@ CFLAGS += -fPIC
 
 build/libjson-static-camlp4-dev::
 	mkdir -p $(DESTDIR)
-

-- 
json-static packaging