[med-svn] r20812 - trunk/packages/cain/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-12-17 17:36:32 +0000 (Thu, 17 Dec 2015)
New Revision: 20812

Modified:
   trunk/packages/cain/trunk/debian/changelog
   trunk/packages/cain/trunk/debian/copyright
Log:
debian/copyright rewritten to match DEP5


Modified: trunk/packages/cain/trunk/debian/changelog
===================================================================
--- trunk/packages/cain/trunk/debian/changelog	2015-12-17 17:31:36 UTC (rev 20811)
+++ trunk/packages/cain/trunk/debian/changelog	2015-12-17 17:36:32 UTC (rev 20812)
@@ -2,6 +2,7 @@
 
   * New upstream version
   * Fixed watch file
+  * debian/copyright rewritten to match DEP5
 
  -- Andreas Tille <tille at debian.org>  Thu, 17 Dec 2015 18:30:43 +0100
 

Modified: trunk/packages/cain/trunk/debian/copyright
===================================================================
--- trunk/packages/cain/trunk/debian/copyright	2015-12-17 17:31:36 UTC (rev 20811)
+++ trunk/packages/cain/trunk/debian/copyright	2015-12-17 17:36:32 UTC (rev 20812)
@@ -1,28 +1,16 @@
-This work was packaged for Debian by:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Cain
+Upstream-Contact: Sean Mauch <sean at caltech.edu>
+Source: http://sourceforge.net/projects/cain/files
 
-    Ivo Maintz <ivo at maintz.de> on Tue, 05 Oct 2010 14:31:33 +0200
-
-It was downloaded from:
-
-    http://cain.sourceforge.net
-
-Upstream Author:
-
-    Sean Mauch <sean at caltech.edu>
-
-Copyright:
-
-    <Copyright (C) 1999-2011, California Institute of Technology>
-
-License:
-
-
-    All rights reserved.
-
+Files: *
+Copyright: 1999-2012, California Institute of Technology
+                      Sean Mauch <sean at caltech.edu>
+License: BSD-3-clause
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
-
+ .
     Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
     Redistributions in binary form must reproduce the above copyright notice,
@@ -31,7 +19,7 @@
     Neither the name of the California Institute of Technology nor the names
     of its contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
-    
+ .
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -44,10 +32,9 @@
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The Debian packaging is:
+Files: debian/*
+Copyright: 2010-2015 Ivo Maintz <ivo at maintz.de>
+           2015      Andreas Tille <tille at debian.org>
+License: GPL-3+
+ see /usr/share/common-licenses/GPL-3
 
-    Copyright (C) 2010-2011 Ivo Maintz <ivo at maintz.de>
-
-and is licensed under the GPL version 3, see
-/usr/share/common-licenses/GPL-3
-