[Pkg-ocaml-maint-commits] [dose3] 01/03: Merge branch 'master' into jessie-backports/master

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit bb009068413c40a4daf3f4f789559ac72b9a5e44
Merge: 7d685e2 1d32a58
Author: Ralf Treinen <treinen at irif.fr>
Date:   Fri Jan 20 13:16:26 2017 +0100

    Merge branch 'master' into jessie-backports/master
    
    Conflicts:
    	debian/changelog

 debian/changelog                          |  39 ++++
 debian/patches/architecture-tuples        | 325 ++++++++++++++++++++++++++++++
 debian/patches/architectures-dpkg-1.18.15 |  74 +++++++
 debian/patches/deb-drop-b-d-arch          | 238 ++++++++++++++++++++++
 debian/patches/ocaml-4.02.3+gcc-6.2.0     |  47 +++++
 debian/patches/series                     |   4 +
 6 files changed, 727 insertions(+)

diff --cc debian/changelog
index 3a60a13,f70cf83..8358200
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,41 +1,49 @@@
+ dose3 (5.0.1-8) unstable; urgency=medium
+ 
+   * Patches taken from upstream (thanks, Josch!)
+     - architecture-tuples: replace architecture triples by tuples.
+       (closes: #843409)
+     - architectures-dpkg-1.18.15: Update embedded cputable and tupletable
+       to dpkg 1.18.15
+     - deb-drop-d-b-arch: add support for --deb-drop-b-d-arch (closes: #850943)
+ 
+  -- Ralf Treinen <treinen at debian.org>  Tue, 17 Jan 2017 22:14:21 +0100
+ 
 +dose3 (5.0.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * backport to Debian Jessie
 +  * Refreshed patch debian/patches/jessie-backports.patch
 +
 + -- Ralf Treinen <treinen at debian.org>  Fri, 28 Oct 2016 20:12:28 +0200
 +
+ dose3 (5.0.1-7) unstable; urgency=medium
+ 
+   * use pic options only on native architectures.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Thu, 03 Nov 2016 13:23:49 +0100
+ 
+ dose3 (5.0.1-6) unstable; urgency=medium
+ 
+   * New patch ocaml-4.02.3+gcc-6.2.0 as provided by Josch: fix FTBFS. This
+     patch should probably be removed when we transition to ocaml 4.03.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Thu, 27 Oct 2016 08:55:57 +0200
+ 
+ dose3 (5.0.1-4) unstable; urgency=medium
+ 
+   * Revert the change introduced by 5.0.1-3, since it makes the
+     autobuilders fail.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Wed, 26 Oct 2016 08:18:30 +0200
+ 
+ dose3 (5.0.1-3) unstable; urgency=medium
+ 
+   * Added build-dependency "ocamlbuild|ocaml-nox(<<4.03)", in view of the
+     transition to ocaml 4.03 which does no longer include ocamlbuild.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Tue, 25 Oct 2016 22:03:12 +0200
++>>>>>>> master
+ 
  dose3 (5.0.1-2) unstable; urgency=medium
  
    [ Johannes Schauer ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git