[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.10-1-5-gc4121b5

[Romain Beauxis (none)]

The following commit has been merged in the master branch:
commit c4121b572e79f20367cc098ab2b265224fccdabd
Merge: 1ec90ab6ff7ed889f525c0d9910e32decb1b8e8d b7e61d34bb411867b9394e7678e3647bc95e50f7
Author: Romain Beauxis <toots at leonard.(none)>
Date:   Tue Feb 24 14:44:27 2009 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-ocaml-maint/packages/camlp5
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 975c65a,dfcb3b1..a787582
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,22 +1,28 @@@
- camlp5 (5.08-3) experimental; urgency=low
 -camlp5 (5.10-2) unstable; urgency=low
++camlp5 (5.10-3) unstable; urgency=low
  
-   [ Stephane Glondu ]
-   * Switching packaging to git
+   * uploading to unstable
+   * debian/rules: use ocaml.mk as a CDBS "rules" snippet, bump dh-ocaml
+     build-dep to the minimum version implementing this
+   * bump debhelper compatibility level to 7
+ 
+  -- Stefano Zacchiroli <zack at debian.org>  Tue, 24 Feb 2009 14:24:21 +0100
+ 
++camlp5 (5.10-2) experimental; urgency=low
++
++  * Versioned build-dep on ocaml-compiler-libs.
 +
-   [ Romain Beauxis ]
-   * Upload to experimental to build against 3.11
-   * Versioned ocaml related build-dep to avoid confusion
-   * Added dh-ocaml to build-dep
-   * Bumped standards version (no change needed)
++ -- Romain Beauxis <toots at rastageeks.org>  Mon, 15 Dec 2008 01:02:54 +0100
 +
-  -- Romain Beauxis <toots at rastageeks.org>  Tue, 02 Dec 2008 19:44:20 +0100
+ camlp5 (5.10-1) experimental; urgency=low
+ 
+   * New upstream release, compatible with OCaml 3.11.0 (Closes: #507884)
+   * Switch packaging to git
+   * Add build-dependency to dh-ocaml
+   * Add myself to uploaders
+   * Update Standards-Version to 3.8.0
+   * Add versioned dependency to OCaml to avoid confusion
+ 
+  -- Stephane Glondu <steph at glondu.net>  Fri, 05 Dec 2008 20:03:34 +0100
  
  camlp5 (5.08-2) unstable; urgency=low
  
@@@ -101,4 -108,3 +114,3 @@@ camlp5 (4.05-1) experimental; urgency=l
    * Initial release (Closes: #432587)
  
   -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Jul 2007 19:31:53 +0200
- 

-- 
camlp5 packaging