fix debian/copyright for lintian

2 files changed, 30 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index e43be5e..b36467e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-pysqlcipher (2.6.3.3+b1) unstable; urgency=medium
+pysqlcipher (2.6.3.4) unstable; urgency=medium
 
-  * Build against latest sqlcipher 
+  * remove unneeded debian watch file
+  * bump dependency on sqlcipher >= 3.2.0-1.1
+  * fix debian/copyright file to have proper dep-5 format
 
- -- Ben Carrillo <ben@futeisha.org>  Tue, 01 Sep 2015 15:38:41 -0400
+ -- Micah Anderson <micah@debian.org>  Tue, 01 Sep 2015 15:38:41 -0400
 
 pysqlcipher (2.6.3.3) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index b0eabf7..176a920 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,52 +3,32 @@ Upstream-Name: pysqlcipher
 Upstream-Contact: kali@leap.se
 Source: <http://github.com/leapcode/pysqlcipher/>
 
-Files: setup.*
-    Copyright (C) 2013 Kali Kaneko <kali@futeisha.org>
-    Copyright (C) 2005-2010 Gerhard Häring <gh@ghaering.de>
-
-    This software is provided 'as-is', without any express or implied
-    warranty. In no event will the authors be held liable for any
-    damages arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any
-    purpose, including commercial applications, and to alter it and
-    redistribute it freely, subject to the following restrictions:
-
-        1. The origin of this software must not be misrepresented; you
-           must not claim that you wrote the original software. If you
-           use this software in a product, an acknowledgment in the
-           product documentation would be appreciated but is not
-           required.
-
-        2. Altered source versions must be plainly marked as such, and
-           must not be misrepresented as being the original software.
-
-        3. This notice may not be removed or altered from any source
-           distribution.
-
 Files: *
-    Copyright (C) 2005-2010 Gerhard Häring <gh@ghaering.de>
-
-    This software is provided 'as-is', without any express or implied
-    warranty. In no event will the authors be held liable for any
-    damages arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any
-    purpose, including commercial applications, and to alter it and
-    redistribute it freely, subject to the following restrictions:
+Copyright: 2005-2010 Gerhard Häring <gh@ghaering.de>
+License: Zlib
 
-        1. The origin of this software must not be misrepresented; you
-           must not claim that you wrote the original software. If you
-           use this software in a product, an acknowledgment in the
-           product documentation would be appreciated but is not
-           required.
-
-        2. Altered source versions must be plainly marked as such, and
-           must not be misrepresented as being the original software.
-
-        3. This notice may not be removed or altered from any source
-           distribution.
+Files: setup.*
+Copyright:
+        2013 Kali Kaneko <kali@futeisha.org>
+        2005-2010 Gerhard Häring <gh@ghaering.de>
+License: Zlib
+
+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
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgement in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
 
 Files: debian/*
 Copyright: Copyright 2013 Kali Kaneko <kali@futeisha.org>
@@ -56,4 +36,4 @@ License: GPL-3+
  
 License: GPL-3+
  On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
\ No newline at end of file
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
\ No newline at end of file