[med-svn] [libvcflib] 01/02: Merge branch 'master' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository libvcflib.

commit fe4cbbc38e2c245112b4ce63015980ecedcd0bfe
Merge: 8d09323 27c21a3
Author: Andreas Tille <tille at debian.org>
Date:   Wed Mar 8 12:00:22 2017 +0100

    Merge branch 'master' into debian/jessie-backports

 debian/changelog                                |  21 +
 debian/compat                                   |   2 +-
 debian/control                                  |   6 +-
 debian/copyright                                |   4 +-
 debian/libvcflib-dev.lintian-overrides          |   1 +
 debian/libvcflib-tools.lintian-overrides        |   1 +
 debian/libvcflib1.lintian-overrides             |   1 +
 debian/patches/series                           |   1 +
 debian/patches/use_debian_packaged_libssw.patch |  23 +
 debian/rules                                    |   3 +-
 debian/upstream/metadata                        |  12 -
 debian/watch                                    |   2 +-
 src/ssw.c                                       | 834 ------------------------
 src/ssw.h                                       | 129 ----
 src/ssw_cpp.cpp                                 | 399 ------------
 src/ssw_cpp.h                                   | 216 ------
 16 files changed, 59 insertions(+), 1596 deletions(-)

diff --cc debian/changelog
index c250ef7,983267f..9024f7d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ libvcflib (1.0.0~rc1+dfsg1-3) unstable; urgency=medium
+ 
+   * Fix location of binary tools
+     Closes: #856424
+   * Remove empty debian/upstream/metadata boilerplate
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 01 Mar 2017 15:43:05 +0100
+ 
+ libvcflib (1.0.0~rc1+dfsg1-1) unstable; urgency=medium
+ 
+   * Adapt to recent PIE changes in dpkg (Thanks for the patch to Adrian Bunk
+     <bunk at stusta.de>)
+     Closes: #844890
+   * d/watch: version=4
+   * debhelper 10
+   * Remove code copy of libssw
+     Closes: #838513
+   * Add lintian overrides for false positive
+ 
+  -- Andreas Tille <tille at debian.org>  Tue, 22 Nov 2016 13:13:12 +0100
+ 
 +libvcflib (1.0.0~rc1+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2016 11:32:07 +0100
 +
  libvcflib (1.0.0~rc1+dfsg-1) unstable; urgency=low
  
    * Initial release (Closes: #838020)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libvcflib.git