[Pkg-ocaml-maint-commits] [SCM] json-wheel packaging branch, master, updated. debian/1.0.6-1-2-gf1961bd

[Stephane Glondu]

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

    Use ocaml.mk as a CDBS "rules" file

diff --git a/debian/changelog b/debian/changelog
index c62ccdd..732f8b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+json-wheel (1.0.6-2) UNRELEASED; urgency=low
+
+  * Use ocaml.mk as a CDBS "rules" file
+
+ -- Stephane Glondu <steph at glondu.net>  Wed, 29 Jul 2009 13:59:11 +0200
+
 json-wheel (1.0.6-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 3a13483..3a23ab5 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
@@ -28,4 +28,3 @@ build/libjson-wheel-ocaml-dev::
 	mkdir -p $(DESTDIR)
 	mkdir -p $(PREFIX)/bin
 	make html
-

-- 
json-wheel packaging