[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.10-1-4-ged0716f

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit ed0716f4ee171133734167b7f66ad1c296746cde
Merge: f97e7e6cb942660474ee5db0b2f53b183b5a7b90 1c6c614f24f6c6a8f181db0f714adcc42b228f44
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jul 7 23:00:39 2009 +0200

    Merge branch 'master' of git+ssh://git.debian.org//git/pkg-ocaml-maint/packages/bin-prot
    
    Conflicts:
    	.hg_archival.txt
    	.hgtags
    	Changelog
    	debian/changelog
    	debian/control
    	lib/META
    	lib/Makefile
    	lib/read_c.mli
    	lib/read_ml.ml
    	lib/read_stubs.c
    	lib/size.ml
    	lib/type_class.ml
    	lib/type_class.mli
    	lib/unsafe_read_c.ml
    	lib/utils.ml
    	lib/utils.mli
    	lib/write_ml.ml
    	lib_test/bin_prot_test.ml

diff --combined debian/changelog
index 0187d98,b37bcff..f699c49
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,18 +1,28 @@@
 +bin-prot (1.2.14-1) unstable; urgency=low
 +
-   [ Stefano Zacchiroli ]
-   * debian/copyright: point to version-specific common license file
- 
-   [ Sylvain Le Gall ]
-   * Add debian/gbp.conf to force using pristine-tar
 +  * New Upstream Version
 +  * Tighten build-depends to ease OCaml 3.11.1 transition
 +  * Upgrade standards-version to 3.8.2 (section ocaml)
 +  * Update debian/copyright
 +  * Fix typo in debian/README.Debian
 +
 + -- Sylvain Le Gall <gildor at debian.org>  Tue, 07 Jul 2009 01:08:55 +0200
 +
+ bin-prot (1.2.10-1) unstable; 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
+     - bump Standards-Version to 3.8.1 (no change)
+ 
+   [ Sylvain Le Gall ]
+   * Add debian/gbp.conf to force using pristine-tar
+ 
+  -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Mar 2009 16:19:11 +0100
+ 
  bin-prot (1.0.5-5) unstable; urgency=low
  
    [ Stefano Zacchiroli ]
diff --combined debian/control
index 5ea4699,eaf4a1e..5e5fdd2
--- a/debian/control
+++ b/debian/control
@@@ -1,5 -1,5 +1,5 @@@
  Source: bin-prot
 -Section: devel
 +Section: ocaml
  Priority: extra
  Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
  Uploaders:
@@@ -9,18 -9,19 +9,18 @@@ Build-Depends
   debhelper (>= 7),
   cdbs,
   dh-ocaml (>= 0.4),
 - ocaml-nox (>= 3.11),
 + ocaml-nox (>= 3.11.1),
   ocaml-findlib (>= 1.2.4),
   camlp4,
   camlp4-extra,
 - libtype-conv-camlp4-dev (>= 1.6.7),
 + libtype-conv-camlp4-dev (>= 1.6.7-2),
   libounit-ocaml-dev (>= 1.0.3-2)
 -Standards-Version: 3.8.1
 +Standards-Version: 3.8.2
  Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bin-prot.git
  Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git
- Homepage: http://www.janestcapital.com/ocaml/
+ Homepage: http://www.ocaml.info/home/ocaml_sources.html#bin-prot
  
  Package: libbin-prot-camlp4-dev
 -Section: libdevel
  Architecture: any
  Depends:
   ocaml-nox-${F:OCamlABI},

-- 
bin-prot packaging