[Pkg-ocaml-maint-commits] [SCM] pxp packaging branch, master, updated. debian/1.2.0.test1-3-23-g6f305b2

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 6f305b249501f9a63d6a41122272ff889aa4dfd0
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 17:24:35 2009 +0100

    debian/rules: use ocaml.mk as a CDBS "rules" snippet

diff --git a/debian/changelog b/debian/changelog
index 60e9027..3ad1034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
     - bump Standards-Version to 3.8.1 (no changes)
     - move pxp to (new) archive section "ocaml"
   * debian/docs: avoid installing vanished documents
+  * debian/rules: use ocaml.mk as a CDBS "rules" snippet
 
   [ Stephane Glondu ]
   * Switching packaging to git
diff --git a/debian/rules b/debian/rules
index 62bf490..97cf466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpxp-ocaml-dev
 OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)                                                                             

-- 
pxp packaging