[opengm] 14/14: Merge remote-tracking branch 'origin/debian/sid' into debian/sid

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository opengm.

commit f9e58767b81370e24f245e9b6acb912db9c92063
Merge: 0b549d2 bfe003d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Feb 14 16:14:34 2016 +0000

    Merge remote-tracking branch 'origin/debian/sid' into debian/sid

 debian/changelog         | 6 ++++++
 debian/upstream/metadata | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c97da28,a3b80fd..75e94ca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,24 @@@
 -opengm (2.3.6-3) UNRELEASED; urgency=medium
 +opengm (2.3.6+20160131-1) unstable; urgency=medium
  
 -  * Team upload
 -  * Fix Vcs-Fields
++  * Team upload.
++
++  [Ghislain Antony Vaillant]
 +  * Drop patch Fix-testsuite-execution-on-32-bit.patch,
 +    applied upstream.
 +  * Provide examples in doc package.
 +  * d/rules: build examples conditionally on nocheck.
 +  * d/gbp.conf: use upstream tag format.
 +  * d/rules: simplify dh_autotest override.
 +  * d/control: use secure VCS URIs.
 +  * Fix usage of embedded jquery in doc package.
 +  * d/rules: move dh_numpy call to dh_python2 override.
 +  * d/rules: exclude examples from compression.
 +  * Bump standards version to 3.9.7, no changes required.
 +
++  [Andreas Tille]
+   * Avoid mixed quote signs in debian/upstream/metadata
+ 
 - -- Andreas Tille <tille at debian.org>  Fri, 12 Feb 2016 23:10:54 +0100
 + -- Ghislain Antony Vaillant <ghisvail at gmail.com>  Sun, 14 Feb 2016 14:27:29 +0000
  
  opengm (2.3.6-2) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git