[pkg-java] r15961 - trunk/pirl/debian

Wed Apr 18 06:52:33 UTC 2012

Author: malat
Date: 2012-04-18 06:52:32 +0000 (Wed, 18 Apr 2012)
New Revision: 15961

Removed:
   trunk/pirl/debian/README.source
   trunk/pirl/debian/patches/
Modified:
   trunk/pirl/debian/changelog
   trunk/pirl/debian/copyright
   trunk/pirl/debian/orig-tar.sh
Log:
take new release with consistant lgpl-3 license

Deleted: trunk/pirl/debian/README.source
===================================================================

--- trunk/pirl/debian/README.source	2012-04-17 22:39:37 UTC (rev 15960)
+++ trunk/pirl/debian/README.source	2012-04-18 06:52:32 UTC (rev 15961)
@@ -1,10 +0,0 @@
-Some of the files are distributed under a LGPL-2.1 license
-Since the main page for the PIRL package list only GPL-2 as the main license
-the debian package reflect that. No effort has been made to split the LGPL files
-from the GPL one. The whole package is thus distributed under a GPL-2 license
-
-The original files from PIRL/TreeTable have been removed and replaced with newer
-file from the official java.sun.com website, see orig-tar.sh script.
-This allow using a BSD license within the code instead of the old sun license.
-
- -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Apr 2012 22:13:54 +0200

Modified: trunk/pirl/debian/changelog
===================================================================
--- trunk/pirl/debian/changelog	2012-04-17 22:39:37 UTC (rev 15960)
+++ trunk/pirl/debian/changelog	2012-04-18 06:52:32 UTC (rev 15961)
@@ -1,5 +1,5 @@
-pirl (2.3.4.dfsg-1) unstable; urgency=low
+pirl (2.3.6-1) unstable; urgency=low
 
   * Initial release (Closes: #668603)
 
- -- Mathieu Malaterre <malat at debian.org>  Fri, 13 Apr 2012 13:39:49 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 18 Apr 2012 08:51:38 +0200

Modified: trunk/pirl/debian/copyright
===================================================================
--- trunk/pirl/debian/copyright	2012-04-17 22:39:37 UTC (rev 15960)
+++ trunk/pirl/debian/copyright	2012-04-18 06:52:32 UTC (rev 15961)
@@ -4,22 +4,22 @@
 Source: http://pirlwww.lpl.arizona.edu/software/PIRL_Java_Packages.shtml
 
 Files: *
-Copyright: 2003-2008  Arizona Board of Regents on behalf of the
+Copyright: 2001-2012  Arizona Board of Regents on behalf of the
  Planetary Image Research Laboratory, Lunar and Planetary Laboratory at
  the University of Arizona.
-License: GPL-2
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License, version 2, as
- published by the Free Software Foundation.
- 
- 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
+License: LGPL-3
+ The PIRL Java Packages are free software; you can redistribute them
+ and/or modify them 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.
+ .
+ The PIRL Java Packages are distributed in the hope that they 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.
- 
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ 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/>.
 
 Files: PIRL/TreeTable/*.java
 Copyright: 1997, 2000 Sun Microsystems, Inc. All Rights Reserved.
@@ -60,9 +60,9 @@
 
 Files: debian/*
 Copyright: 2012, Mathieu Malaterre <malat at debian.org>
-License: GPL-2
+License: LGPL-3
  Same as above
 
-License: GPL-2
+License: LGPL-3
   On Debian GNU/Linux system you can find the complete text of the
-  GPL-2 license in '/usr/share/common-licenses/GPL-2'
+  LGPL-3 license in '/usr/share/common-licenses/LGPL-3'

Modified: trunk/pirl/debian/orig-tar.sh
===================================================================
--- trunk/pirl/debian/orig-tar.sh	2012-04-17 22:39:37 UTC (rev 15960)
+++ trunk/pirl/debian/orig-tar.sh	2012-04-18 06:52:32 UTC (rev 15961)
@@ -1,22 +1,12 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-TAR=pirl_$2.dfsg.orig.tar.gz
+TAR=pirl_$2.orig.tar.gz
 DIR=pirl-$2
 
 # clean up the upstream tarball
 tar -zxf $3
 mv PIRL-* PIRL
-cd PIRL/TreeTable
-rm AbstractCellEditor.java
-wget http://java.sun.com/products/jfc/tsc/articles/treetable1/src/AbstractCellEditor.java
-rm AbstractTreeTableModel.java
-wget http://java.sun.com/products/jfc/tsc/articles/treetable1/src/AbstractTreeTableModel.java
-rm TreeTableModel.java
-wget http://java.sun.com/products/jfc/tsc/articles/treetable1/src/TreeTableModel.java
-rm TreeTableModelAdapter.java
-wget http://java.sun.com/products/jfc/tsc/articles/treetable1/src/TreeTableModelAdapter.java
-cd ../..
 mkdir $DIR
 mv PIRL $DIR
 tar -czf $TAR $DIR


