[Pkg-ocaml-maint-commits] [SCM] json-static packaging branch, master, updated. debian/0.9.6-2-6-g6f052c4

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 6f052c426b6d0f54f0d20ea38afa4650ccb7ffdf
Merge: 0ce039b2d4f65f30473e6b47034e94b5d103d455 5a3a20251f9f30528ed26dce1dca178b066648a8
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Sep 23 20:56:36 2009 -0500

    Fixed merge conflict

diff --combined debian/changelog
index bbfe2e1,06c289a..8a05ac0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,14 @@@
 -json-static (0.9.6-3) UNRELEASED; urgency=low
 +json-static (0.9.8-1) unstable; urgency=low
  
++  [ Romain Beauxis ]
 +  * New upstream release. 
 +  * Bumped standards version to 3.8.3
 +  * Changed section to ocaml
-   * Changed ocaml.mk cdbs support include to 
-     /usr/share/cdbs/1/rules/ocaml.mk
 +
-  -- Romain Beauxis <toots at rastageeks.org>  Wed, 23 Sep 2009 20:07:38 -0500
++  [ Stephane Glondu ]
+   * Use ocaml.mk as a CDBS "rules" file
+ 
+  -- Stephane Glondu <steph at glondu.net>  Wed, 29 Jul 2009 13:57:14 +0200
  
  json-static (0.9.6-2) unstable; urgency=low
  
@@@ -24,4 -20,3 +26,3 @@@ json-static (0.9.6-1) unstable; urgency
      Closes: #493109
  
   -- Romain Beauxis <toots at rastageeks.org>  Sat, 02 Aug 2008 03:29:47 +0200
- 

-- 
json-static packaging