[Pkg-crosswire-commits] [sword] 01/08: lintian fixes for debian/copyright
Daniel Glassey
wdg at moszumanska.debian.org
Mon Sep 7 15:33:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
wdg pushed a commit to branch master
in repository sword.
commit 9e4c5ab9710417b6b30b649043181b71916f8f00
Author: Daniel Glassey <wdg at debian.org>
Date: Mon Sep 7 15:07:52 2015 +0100
lintian fixes for debian/copyright
---
debian/changelog | 12 +++++++++++-
debian/copyright | 45 ++++++++-------------------------------------
2 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7fa2648..3d3f455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sword (1.7.3+dfsg-4) UNRELEASED; urgency=medium
+
+ * debian/copyright:
+ fix short names of publicdomain licences to not have spaces
+ remove 'unknown license' - files are under GPL as with rest of tarball
+ unless otherwise specified
+
+ -- Daniel Glassey <wdg at debian.org> Mon, 07 Sep 2015 14:15:09 +0100
+
sword (1.7.3+dfsg-3) unstable; urgency=low
* c++ transition
@@ -8,9 +17,10 @@ sword (1.7.3+dfsg-3) unstable; urgency=low
-- Daniel Glassey <wdg at debian.org> Wed, 02 Sep 2015 14:15:09 +0100
+
sword (1.7.3+dfsg-2.1) unstable; urgency=medium
- * Non maintainer upload.
+ * Non-maintainer upload.
* Fix build with GCC 5 (-Wno-error=deprecated-declarations). Closes: #778133.
-- Matthias Klose <doko at debian.org> Fri, 10 Jul 2015 16:18:02 +0200
diff --git a/debian/copyright b/debian/copyright
index aa32d97..643116b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,31 +22,6 @@ Files: *
Copyright: 1996-2009 CrossWire Bible Society
License: GPL-2
-Files: include/installmgr.h
- include/rawverse.h
- include/defs.h
- include/rawverse.h
- include/rawverse4.h
- include/sysdata.h
- include/ftpparse.h
- include/nullim.h
- include/multimapwdef.h
- include/entriesblk.h
- bindings/swig/searcher.h
- bindings/swig/rendercallback.h
- bindings/swig/markupcallback.h
- bindings/swig/package/searcher.h
- bindings/swig/package/rendercallback.h
- bindings/swig/package/autogen.sh
- bindings/swig/package/markupcallback.h
- bindings/bcppmake/MainCLXTest.h
- bindings/bcppmake/MainTest.h
- bindings/autogen.sh
-Copyright: Unknown
-License: Unknown
- Probable copyright holder CrossWire Bible Society.
- Probable intended license GPL-2 .
- include/ftpparse.h - C++ wrapper
Files: include/untgz.h src/utilfuns/zlib/untgz.c
Copyright: Pedro A. Aranda Guti\irrez <paag at tid.es>
@@ -58,11 +33,17 @@ License: ZLIB
Files: include/sapphire.h src/modules/common/sapphire.cpp
Copyright: Michael Paul Johnson
-License: Public Domain
+License: public-domain
+ Dedicated to the Public Domain the author and inventor
+ (Michael Paul Johnson). This code comes with no warranty.
+ Use it at your own risk.
Files: bindings/corba/java/src/org/crosswire/util/Base64.java
Copyright: Robert Harder <rob at iharder.net>
-License: Public Domain - Base64
+License: public-domain
+ I am placing this code in the Public Domain. Do with it as you will.
+ This software comes with no guarantees or warranties but with
+ plenty of well-wishing instead!
Files: include/ftplib.h src/utilfuns/ftplib.c
Copyright: 1996, 1997 Thomas Pfau, pfau at cnj.digex.net
@@ -87,16 +68,6 @@ License: LGPL-2+
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.
- Use it at your own risk.
-
-License: Public Domain - Base64
- I am placing this code in the Public Domain. Do with it as you will.
- This software comes with no guarantees or warranties but with
- plenty of well-wishing instead!
-
License: ZLIB
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git
More information about the Pkg-crosswire-commits
mailing list