[Pkg-ocaml-maint-commits] [SCM] ocamldap packaging branch, master, updated. debian/2.1.8-6-5-g9eb6c69

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a9e29cc924503ac2359f00cb39ecbd63e82b4079
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 16:05:25 2009 +0200

    Workaround a CDBS bug

diff --git a/debian/changelog b/debian/changelog
index 399d68c..37fe2d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocamldap (2.1.8-7) UNRELEASED; urgency=low
+
+  * Add myself to uploaders
+  * Change inclusion order in debian/rules to workaround a CDBS bug
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 16:05:33 +0200
+
 ocamldap (2.1.8-6) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
@@ -224,4 +231,3 @@ ocamldap (1.1.0-1) unstable; urgency=low
     * ocamldoc to generate a better doc for the module
 
  -- Sylvain LE GALL <sylvain.le-gall at polytechnique.org>  Thu,  4 Sep 2003 00:05:07 +0200
-
diff --git a/debian/control b/debian/control
index 8644051..df2d96c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: ocamldap
 Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org> 
+Uploaders:
+ Sylvain Le Gall <gildor at debian.org>,
+ Mehdi Dogguy <mehdi at debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1), 
  debhelper (>= 7), 
  dpatch, 
diff --git a/debian/rules b/debian/rules
index 58f81c6..b6d15ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-include /usr/share/cdbs/1/rules/debhelper.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/ocaml.mk
 

-- 
ocamldap packaging