From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 19 Jan 2017 17:29:48 +0000 (+0000)
Subject: Merge version 6.1.6+dfsg2-3+rpi1 and 6.1.6+dfsg2-4 to produce 6.1.6+dfsg2-4+rpi1
X-Git-Tag: archive/raspbian/6.1.6+dfsg2-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c455d8e45a34ba1af23cd5a88e24ee3b85a4aaf;p=virtuoso-opensource.git

Merge version 6.1.6+dfsg2-3+rpi1 and 6.1.6+dfsg2-4 to produce 6.1.6+dfsg2-4+rpi1
---

5c455d8e45a34ba1af23cd5a88e24ee3b85a4aaf
diff --cc debian/changelog
index 3d4c7f34,3644f68e..7fd674af
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- virtuoso-opensource (6.1.6+dfsg2-3+rpi1) stretch-staging; urgency=medium
++virtuoso-opensource (6.1.6+dfsg2-4+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 6.1.6+dfsg2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 06:38:56 +0000]
 +  * revert removal of armhf from mono/libvirtuoso5.5-cil architecture lists
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Mar 2016 22:00:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2017 17:29:46 +0000
++
+ virtuoso-opensource (6.1.6+dfsg2-4) unstable; urgency=medium
+ 
+   * QA upload.
+   * Add patch to fix FTBFS with OpenSSL 1.1.
+     Thanks to Sebastian Andrzej Siewior <sebastian@breakpoint.cc> for the
+     patch.  Closes: #828594
+   * d/control: drop make from build-deps, as it's build-essential and that
+     version is old enough.
+   * Bump debhelper compat level to 10.
+     + --with autoreconf is now defuault.
+     + --parallel is now default.
+ 
+  -- Mattia Rizzolo <mattia@debian.org>  Tue, 10 Jan 2017 12:56:02 +0100
  
  virtuoso-opensource (6.1.6+dfsg2-3) unstable; urgency=medium
  
diff --cc debian/control
index 57024977,1e5b60b5..c64c2e48
--- a/debian/control
+++ b/debian/control
@@@ -6,13 -6,10 +6,10 @@@ Standards-Version: 3.9.
  Homepage: http://virtuoso.openlinksw.com/wiki/main/Main/
  Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/virtuoso-opensource.git
  Vcs-Git: https://anonscm.debian.org/git/collab-maint/virtuoso-opensource.git
- Build-Depends: autoconf (>= 2.57),
-                automake (>= 1.10),
-                autotools-dev,
+ Build-Depends:
                 bison (>= 1.35),
 -               cli-common-dev (>= 0.8~) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armel sparc s390x ppc64],
 +               cli-common-dev (>= 0.8~) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armel armhf sparc s390x ppc64],
-                debhelper (>= 9),
-                dh-autoreconf,
+                debhelper (>= 10),
                 docbook2x,
                 docbook-xml,
                 flex (>= 2.5.4),
@@@ -27,8 -24,7 +24,7 @@@
                 libwbxml2-dev,
                 libxml2-dev,
                 m4 (>= 1.4.1),
-                make (>= 3.79.1),
 -               mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 arm armel sparc s390x ppc64],
 +               mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 arm armel armhf sparc s390x ppc64],
                 net-tools,
                 pkg-kde-tools,
                 po-debconf,