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

[Andreas Tille]

Author: tille
Date: 2012-01-24 12:31:16 +0000 (Tue, 24 Jan 2012)
New Revision: 9409

Modified:
   trunk/packages/libcolt-java/trunk/debian/changelog
   trunk/packages/libcolt-java/trunk/debian/control
   trunk/packages/libcolt-java/trunk/debian/copyright
   trunk/packages/libcolt-java/trunk/debian/get-orig-source
   trunk/packages/libcolt-java/trunk/debian/watch
Log:
The package unfortunately needs to go to non-free because an exception clause from LGPL.  I tried to contact the author but did not succeeded until now.


Modified: trunk/packages/libcolt-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/changelog	2012-01-24 11:31:44 UTC (rev 9408)
+++ trunk/packages/libcolt-java/trunk/debian/changelog	2012-01-24 12:31:16 UTC (rev 9409)
@@ -1,5 +1,14 @@
-colt (1.2.0~dfsg-1) unstable; urgency=low
+colt (1.2.0~nojar-1) unstable; urgency=low
 
   * Initial release (Closes: #656741)
+  * Remark: The package version "~nojar" was chosen in contrast to the
+    previous "~dfsg" to reflect that binary JAR files which are unneeded
+    are stripped from the upstream tarball to avoid more trouble with
+    licensing issues.  So the only issue with the explicte exclusion of
+    military applications remains and is the reason for upload to non-free.
+    However at least the final target beast-mcmc could go to contrib.
+    Remark2: I'm not sure what "military applications" actually means
+    without a proper definition and whether this license is applicable at
+    all.
 
- -- Andreas Tille <tille at debian.org>  Fri, 20 Jan 2012 21:22:44 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 24 Jan 2012 12:16:20 +0100

Modified: trunk/packages/libcolt-java/trunk/debian/control
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/control	2012-01-24 11:31:44 UTC (rev 9408)
+++ trunk/packages/libcolt-java/trunk/debian/control	2012-01-24 12:31:16 UTC (rev 9409)
@@ -1,5 +1,5 @@
 Source: colt
-Section: java
+Section: non-free/java
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
@@ -30,7 +30,7 @@
  performance, functionality and (re)usability. 
 
 Package: libcolt-java-doc
-Section: doc
+Section: non-free/doc
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}

Modified: trunk/packages/libcolt-java/trunk/debian/copyright
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/copyright	2012-01-24 11:31:44 UTC (rev 9408)
+++ trunk/packages/libcolt-java/trunk/debian/copyright	2012-01-24 12:31:16 UTC (rev 9409)
@@ -17,20 +17,14 @@
 
 Files: src/hep.aida.*
 Copyright: © 2004 Pavel Binko, Dino Ferrero Merlino, Wolfgang Hoschek, Tony Johnson, Andreas Pfeiffer, and others.
-License: LGPL
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+License: LGPL, with the exception that any usage related to military applications is expressly forbidden
+ hep.aida.* is non-free according to the information in xdocs/license.xml:
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Lesser General Public License for more details.
+  Permission to use and/or redistribute this work is granted under the terms of
+  the LGPL License, with the exception that any usage related to military
+  applications is expressly forbidden. The software and documentation made
+  available under the terms of this license are provided with no warranty.
  .
- You should have received a copy of the GNU Lesser General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
  On Debian systems, you can read the full text of the GNU Lesser General Public
  License in ‘/usr/share/common-licenses/LGPL’.
 

Modified: trunk/packages/libcolt-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/get-orig-source	2012-01-24 11:31:44 UTC (rev 9408)
+++ trunk/packages/libcolt-java/trunk/debian/get-orig-source	2012-01-24 12:31:16 UTC (rev 9409)
@@ -26,8 +26,8 @@
 find . -name "*concurrent*" -delete
 
 # Remove unneeded JARs
-rm -rf lib/*
+find . -name "*.jar" -delete
 
 cd ..
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${NAME}"
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~nojar.orig.tar.gz "${NAME}"
 rm -rf "${NAME}"

Modified: trunk/packages/libcolt-java/trunk/debian/watch
===================================================================
--- trunk/packages/libcolt-java/trunk/debian/watch	2012-01-24 11:31:44 UTC (rev 9408)
+++ trunk/packages/libcolt-java/trunk/debian/watch	2012-01-24 12:31:16 UTC (rev 9409)
@@ -1,4 +1,4 @@
 version=3
-opts="dversionmangle=s/~dfsg//g" \
+opts="dversionmangle=s/~nojar//g" \
 http://acs.lbl.gov/software/colt/colt-download/releases/colt-([\d\.]+)\.tar\.gz \
     debian debian/get-orig-source