[Pkg-ocaml-maint-commits] [SCM] ocaml-mad packaging branch, master, updated. debian/0.3.5-1-8-g3ca8f3e

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 3ca8f3e07f4ee40c902fb61cc0e11fd008bd18f4
Merge: 1f202b600a972b18a41ec4f2d02984294e629807 384f82680fe650e78407089b20d69d480c0d975f
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Feb 25 09:34:31 2009 +0100

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

diff --combined debian/changelog
index 052dd8c,61e6e61..527344e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,15 @@@
 -ocaml-mad (0.3.5-2) UNRELEASED; urgency=low
 +ocaml-mad (0.3.5-2) unstable; urgency=low
  
 -  * Switch packaging to git.
 +  * Switch packaging to git
+   * Use dh-ocaml's predefined variables.
 +  * Rebuild with OCaml 3.11.
    * Update compat to 7.
  
 - -- Samuel Mimram <smimram at debian.org>  Sun, 22 Feb 2009 23:46:43 +0100
 + -- Samuel Mimram <smimram at debian.org>  Wed, 25 Feb 2009 09:25:08 +0100
  
  ocaml-mad (0.3.5-1) experimental; urgency=low
  
 -  * New upstream release. 
 +  * New upstream release.
  
   -- Romain Beauxis <toots at rastageeks.org>  Mon, 05 Jan 2009 00:30:46 +0100
  

-- 
ocaml-mad packaging