[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-6-1-g2fd72b7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 2fd72b7749fcdd7857f9798c3ce040f0c2238c95
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 11 09:48:17 2010 +0100

    Fix CDBS include order (Closes: #569267)

diff --git a/debian/changelog b/debian/changelog
index 52092fb..2cd9aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-expat (0.9.1+debian1-7) UNRELEASED; urgency=low
+
+  * Fix CDBS include order (Closes: #569267)
+
+ -- Stéphane Glondu <glondu at debian.org>  Thu, 11 Feb 2010 09:48:29 +0100
+
 ocaml-expat (0.9.1+debian1-6) unstable; urgency=low
 
   [ Stephane Glondu ]
@@ -5,13 +11,13 @@ ocaml-expat (0.9.1+debian1-6) unstable; urgency=low
 
   [ Enrico Tassi ]
   * Switch packaging to git
-  * ported to new dh-ocaml 
-  * added debian/libexpat-ocaml-dev.ocamldoc 
+  * ported to new dh-ocaml
+  * added debian/libexpat-ocaml-dev.ocamldoc
   * Section: ocaml
   * Fixed VCS-Browse field in control file
   * Bumped standards-version to 3.8.3, no changes
   * debian/compat set to 7, fixed build dependency accordingly
-  * fixed copyright file adding years of copyright holding 
+  * fixed copyright file adding years of copyright holding
 
  -- Enrico Tassi <gareuselesinge at debian.org>  Wed, 11 Nov 2009 17:33:24 +0100
 
@@ -20,7 +26,7 @@ ocaml-expat (0.9.1+debian1-5) unstable; urgency=low
   * Rebuild against 3.11
   * Updated standards-version to 3.8.0, no changes needed
   * Added dh-ocaml do build-depends
-  * Adopted @OCamlStdlibDir@ and @OCamlStdlibDir@ 
+  * Adopted @OCamlStdlibDir@ and @OCamlStdlibDir@
 
  -- Enrico Tassi <gareuselesinge at debian.org>  Mon, 09 Mar 2009 22:27:20 +0100
 
diff --git a/debian/rules b/debian/rules
index 52189fb..4a08771 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)

-- 
ocaml-expat packaging