[Pkg-ocaml-maint-commits] [SCM] cryptgps packaging branch, master, updated. debian/0.2.1-5-5-g8a7cd0d

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 8a7cd0d3e8ca5571ea86c7d8c7ce7034f9055b1c
Merge: fd0ab32408ad51bae0f2f9616bf1560a9e2776b6 31f3ca07c18885e924516b5e722e8d8cbe5712f2
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Feb 26 19:23:10 2009 +0100

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

diff --combined debian/changelog
index 6a64b79,6dc5543..b05c115
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,16 @@@
 -cryptgps (0.2.1-6) UNRELEASED; urgency=low
 +cryptgps (0.2.1-6) unstable; urgency=low
  
++  [ Stefano Zacchiroli ]
 +  * upload to unstable
 +  * debian/control:
 +    - update build-deps: remove obsolete ones, add more strict ones to
 +      ensure buildability in unstable
 +  * debian/rules: use ocaml.mk as a CDBS "rules" snippet
++  
++  [ Mehdi Dogguy ]
+   * Fix watch file.
  
 - -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 19 Feb 2009 15:24:51 +0100
 + -- Stefano Zacchiroli <zack at debian.org>  Thu, 26 Feb 2009 19:22:21 +0100
  
  cryptgps (0.2.1-5) experimental; urgency=low
  

-- 
cryptgps packaging