[med-svn] r12114 - trunk/packages/libcolt-java/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-08-24 20:16:41 +0000 (Fri, 24 Aug 2012)
New Revision: 12114

Modified:
   trunk/packages/libcolt-java/trunk/debian/changelog
   trunk/packages/libcolt-java/trunk/debian/copyright
Log:
DEP5


Modified: trunk/packages/libcolt-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/changelog	2012-08-24 14:25:08 UTC (rev 12113)
+++ trunk/packages/libcolt-java/trunk/debian/changelog	2012-08-24 20:16:41 UTC (rev 12114)
@@ -1,3 +1,10 @@
+colt (1.2.0~nojar-3) UNRELEASED; urgency=low
+
+  * debian/copyright:
+     - DEP5
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Aug 2012 22:15:08 +0200
+
 colt (1.2.0~nojar-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/packages/libcolt-java/trunk/debian/copyright
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/copyright	2012-08-24 14:25:08 UTC (rev 12113)
+++ trunk/packages/libcolt-java/trunk/debian/copyright	2012-08-24 20:16:41 UTC (rev 12114)
@@ -1,12 +1,12 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: colt
 Upstream-Contact: Wolfgang Hoschek <whoschek at lbl.gov>
-Original-Source: http://acs.lbl.gov/software/colt/
+Source: http://acs.lbl.gov/software/colt/
 
 Files: src/cern/*
 Copyright: © 1999 CERN - European Organization for Nuclear Research
              Wolfgang Hoschek <wolfgang.hoschek at cern.ch>
-License: Colt License Agreement
+License: Colt_License_Agreement
     Permission to use, copy, modify, distribute and sell this software and its
     documentation for any purpose is hereby granted without fee, provided that
     the above copyright notice appear in all copies and that both that
@@ -17,7 +17,7 @@
 
 Files: src/hep.aida.*
 Copyright: © 2004 Pavel Binko, Dino Ferrero Merlino, Wolfgang Hoschek, Tony Johnson, Andreas Pfeiffer, and others.
-License: LGPL, with the exception that any usage related to military applications is expressly forbidden
+License: LGPL-no-military
  hep.aida.* is non-free according to the information in xdocs/license.xml:
  .
   Permission to use and/or redistribute this work is granted under the terms of
@@ -28,9 +28,9 @@
  On Debian systems, you can read the full text of the GNU Lesser General Public
  License in ‘/usr/share/common-licenses/LGPL’.
 
-
 Files: debian/*
 Copyright: © 2012 Andreas Tille <tille at debian.org>
 License: LGPL
  On Debian systems, you can read the full text of the GNU Lesser General Public
  License in ‘/usr/share/common-licenses/LGPL’.
+