[Pkg-ocaml-maint-commits] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 95396a20a42017ae766a6c4e322ef97536edf374
Merge: 22121189befbd2f4aae291f7d84bfe8e8ac9ba76 67d04a3282edb176a6e4212668ae3c71df906efc
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed May 8 14:46:28 2013 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index ecc5427,ce5c412..92e5905
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
 -cryptokit (1.5-2) UNRELEASED; urgency=low
 +cryptokit (1.7-1) UNRELEASED; urgency=low
  
++  [ Stéphane Glondu ]
 +  * New upstream release
 +
++  [ Sylvain Le Gall ]
+   * Remove Sylvain Le Gall from uploaders
+ 
 - -- Sylvain Le Gall <gildor at debian.org>  Fri, 21 Sep 2012 01:13:31 +0000
 + -- Stéphane Glondu <glondu at debian.org>  Wed, 08 May 2013 14:32:08 +0200
  
  cryptokit (1.5-1) unstable; urgency=low
  
diff --combined debian/control
index f9a3f16,4832c4a..449dc07
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,6 +5,6 @@@ Maintainer: Debian OCaml Maintainers <d
  Uploaders:
   Ralf Treinen <treinen at debian.org>,
   Samuel Mimram <smimram at debian.org>,
-  Sylvain Le Gall <gildor at debian.org>,
   Stéphane Glondu <glondu at debian.org>,
   Mehdi Dogguy <mehdi at debian.org>
  Build-Depends:
@@@ -14,7 -13,7 +13,7 @@@
   debhelper (>= 8),
   zlib1g-dev,
   dh-ocaml (>= 0.9)
 -Standards-Version: 3.9.2
 +Standards-Version: 3.9.4
  Homepage: http://forge.ocamlcore.org/projects/cryptokit/
  Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cryptokit.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cryptokit.git

-- 
cryptokit packaging