[Pkg-crosswire-commits] [sword] 03/04: Imported Debian patch 1.7.3+dfsg-2

[Daniel Glassey]

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

wdg pushed a commit to branch master
in repository sword.

commit c88bd3fa52626e9d96bc91e1cd52153718e99ea0
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Wed Jul 16 01:27:30 2014 +0100

    Imported Debian patch 1.7.3+dfsg-2
---
 debian/changelog          |  7 +++++++
 debian/copyright          | 10 ++++++++++
 debian/libsword-dev.links |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 82a6213..f2db2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sword (1.7.3+dfsg-2) unstable; urgency=medium
+
+  * Add missing license in debian/copyright. (Closes: 754869)
+  * Fix libsword.so symlink in the dev package.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Wed, 16 Jul 2014 01:27:30 +0100
+
 sword (1.7.3+dfsg-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/copyright b/debian/copyright
index aba3e52..aa32d97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,6 +64,11 @@ Files: bindings/corba/java/src/org/crosswire/util/Base64.java
 Copyright: Robert Harder <rob at iharder.net>
 License: Public Domain - Base64
 
+Files: include/ftplib.h src/utilfuns/ftplib.c
+Copyright: 1996, 1997 Thomas Pfau, pfau at cnj.digex.net
+           73 Catherine Street, South Bound Brook, NJ, 08880
+License: LGPL-2+
+
 Files: debian/*
 Copyright: 2009 CrossWire Packaging Team <pkg-crosswire-devel at lists.alioth.debian.org>
             -2008 Daniel Glassey <wdg at debian.org>
@@ -77,6 +82,11 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General Public
  License, version 2, can be found in /usr/share/common-licenses/GPL-2.
 
+License: LGPL-2+
+ On Debian systems, the complete text of the GNU Library General
+ Public License, version 2, can be found in
+ /usr/share/common-licenses/LGPL-2.
+
 License: Public Domain
  Dedicated to the Public Domain the author and inventor
  (Michael Paul Johnson).  This code comes with no warranty.
diff --git a/debian/libsword-dev.links b/debian/libsword-dev.links
index 78477fe..5718586 100644
--- a/debian/libsword-dev.links
+++ b/debian/libsword-dev.links
@@ -1 +1 @@
-usr/lib/libsword.so.10 usr/lib/libsword.so
+usr/lib/libsword.so.11 usr/lib/libsword.so

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