[shibboleth-sp2] 01/02: Merge branch 'debian/master' into debian/jessie-backports

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch debian/jessie-backports
in repository shibboleth-sp2.

commit f90b78ca684f95623f4391a186fb37a0956f5605
Merge: 737082d 65599a2
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Mon Dec 19 17:15:37 2016 +0100

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

 debian/changelog | 22 ++++++++++++++++++++++
 debian/control   |  1 +
 debian/rules     |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index fb6f22e,73df245..e6bcda1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,25 +1,48 @@@
+ shibboleth-sp2 (2.6.0+dfsg1-4) unstable; urgency=medium
+ 
+   [ Ferenc Wágner ]
+   * [f226ae4] Fix typo in shibboleth-sp2-utils description
+   * [3d458a9] /lib/lsb/init-functions is in package lsb-base (>= 3.0-6)
+   * [5cab41e] New patch Increase-the-timeouts-in-the-shibd-service-file.patch.
+     Increase the timeouts in the shibd service file (Closes: #840056)
+ 
+   [ Etienne Dysli Metref ]
+   * [9c23ecb] Add myself to uploaders
+   * [5b3a209] Update dependencies to OpenSAML 2.6 and XMLTooling 1.6.
+     These versions are listed in the RPM spec file as dependencies.
+     Also bumped required versions of shibboleth-sp2-utils and
+     shibboleth-sp2-common to 2.6 to be in sync with the source package.
+   * [518aa2b] Enable shibd.service during installation.
+     Add a build-dependency on dh-systemd and 'dh --with systemd' to rules.
+     This restores the behaviour of enabling shibd during installation that
+     we had with the sysvinit file, but not with the systemd service unit.
+     (Closes: #846608)
+ 
+  -- Etienne Dysli Metref <etienne.dysli-metref at switch.ch>  Thu, 08 Dec 2016 10:06:50 +0100
+ 
 +shibboleth-sp2 (2.6.0+dfsg1-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  [ Ferenc Wágner ]
 +  * [f226ae4] Fix typo in shibboleth-sp2-utils description
 +  * [3d458a9] /lib/lsb/init-functions is in package lsb-base (>= 3.0-6)
 +  * [5cab41e] New patch Increase-the-timeouts-in-the-shibd-service-file.patch.
 +    Increase the timeouts in the shibd service file (Closes: #840056)
 +
 +  [ Etienne Dysli Metref ]
 +  * Rebuild for jessie-backports.
 +  * [9c23ecb] Add myself to uploaders
 +  * [5b3a209] Update dependencies to OpenSAML 2.6 and XMLTooling 1.6.
 +    These versions are listed in the RPM spec file as dependencies.
 +    Also bumped required versions of shibboleth-sp2-utils and
 +    shibboleth-sp2-common to 2.6 to be in sync with the source package.
 +  * [1d0db86] Force usage of backported dependencies
 +    - log4shib (1.0.9-3)
 +    - opensaml2 (2.6.0-4)
 +    - xml-security-c (1.7.3-3)
 +    - xmltooling (1.6.0-3)
 +
 + -- Etienne Dysli Metref <etienne.dysli-metref at switch.ch>  Fri, 21 Oct 2016 15:02:53 +0200
 +
  shibboleth-sp2 (2.6.0+dfsg1-3) unstable; urgency=medium
  
    * [fa3baff] Revert "Require experimental xmltooling and libsaml for matching

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git