[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.0.5-5-8-g021edea

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 021edeaab330d214ba1ee0f7af9134c39a21fa8f
Merge: 516c2e7d8c8dd36fab6a66a93e60b399c0fcc14a 07def3572473923a600608a48d5c356dd86e4f2d
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 15:45:41 2009 +0100

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

diff --combined debian/changelog
index 451ab7d,f3ab8df..d3b9a03
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,15 @@@
 -bin-prot (1.0.5-6) UNRELEASED; urgency=low
 +bin-prot (1.2.10-1) UNRELEASED; urgency=low
  
+   [ Stefano Zacchiroli ]
 +  * New Upstream Version
    * debian/copyright: point to version-specific common license file
 +  * debian/watch: update to point to upstream proper location
 +  * debian/control: update Homepage field
  
+   [ Sylvain Le Gall ]
+   * Add debian/gbp.conf to force using pristine-tar
+ 
 - -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 15:18:52 +0100
 + -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Mar 2009 15:42:23 +0100
  
  bin-prot (1.0.5-5) unstable; urgency=low
  

-- 
bin-prot packaging