Author: twerner Date: 2010-01-09 20:21:04 +0000 (Sat, 09 Jan 2010) New Revision: 11335
Added: trunk/libtablelayout-java/debian/patches/ trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch trunk/libtablelayout-java/debian/source/ trunk/libtablelayout-java/debian/source/format Modified: trunk/libtablelayout-java/debian/changelog trunk/libtablelayout-java/debian/control trunk/libtablelayout-java/debian/copyright trunk/libtablelayout-java/debian/orig-tar.sh Log: * new upstream version - new license * Add patch to change the package namespace from info.clearthought.layout to org.debian.tablelayout due to license issues. * Move package to main. * Fix Vcs-* headers. * Update Standards-Version: 3.8.3. * Switch to dpkg-source 3.0 (quilt) format. * Fix repackaging the source jar into a tarball. Modified: trunk/libtablelayout-java/debian/changelog =================================================================== --- trunk/libtablelayout-java/debian/changelog 2010-01-09 14:56:20 UTC (rev 11334) +++ trunk/libtablelayout-java/debian/changelog 2010-01-09 20:21:04 UTC (rev 11335) @@ -1,3 +1,17 @@ +libtablelayout-java (20090826-1) unstable; urgency=low + + * new upstream version + - new license + * Add patch to change the package namespace from info.clearthought.layout to + org.debian.tablelayout due to license issues. + * Move package to main. + * Fix Vcs-* headers. + * Update Standards-Version: 3.8.3. + * Switch to dpkg-source 3.0 (quilt) format. + * Fix repackaging the source jar into a tarball. + + -- Torsten Werner <twer...@debian.org> Sat, 09 Jan 2010 21:17:10 +0100 + libtablelayout-java (20070421-3) unstable; urgency=low * Change Maintainer: Debian Java Maintainers. Modified: trunk/libtablelayout-java/debian/control =================================================================== --- trunk/libtablelayout-java/debian/control 2010-01-09 14:56:20 UTC (rev 11334) +++ trunk/libtablelayout-java/debian/control 2010-01-09 20:21:04 UTC (rev 11335) @@ -1,13 +1,13 @@ Source: libtablelayout-java -Section: non-free/java +Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twer...@debian.org> Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Homepage: https://tablelayout.dev.java.net/ -Vcs-Svn: https://bollin.googlecode.com/svn/libtablelayout-java/trunk -Vcs-Browser: http://bollin.googlecode.com/svn/libtablelayout-java/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libtablelayout-java +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libtablelayout-java/ Package: libtablelayout-java Architecture: all Modified: trunk/libtablelayout-java/debian/copyright =================================================================== --- trunk/libtablelayout-java/debian/copyright 2010-01-09 14:56:20 UTC (rev 11334) +++ trunk/libtablelayout-java/debian/copyright 2010-01-09 20:21:04 UTC (rev 11335) @@ -4,41 +4,127 @@ It was downloaded from https://tablelayout.dev.java.net/servlets/ProjectDocumentList?folderID=3487&expandFolder=3487&folderID=3487 +The source code has been modified to make the package suitable for main (see +license III. 4.). The package namespace has been changed from +info.clearthought.layout to org.debian.tablelayout. There has been some +discussion about the new license at +<http://lists.debian.org/debian-legal/2009/06/msg00050.html>. + Upstream Author: Daniel Barbalace <clearthou...@dev.java.net> Copyright: -(c) 2001-2005 Daniel Barbalace. All rights reserved. +(c) 2001-2009 Daniel Barbalace. All rights reserved. License: + The Clearthought Software License, Version 2.0 + + Project maintained at https://tablelayout.dev.java.net + + I. Terms for redistribution of original source and binaries + + Redistribution and use of unmodified source and/or binaries are + permitted provided that the following condition is met: + + 1. Redistributions of original source code must retain the above + copyright notice and license. You are not required to redistribute + the original source; you may choose to redistribute only the + binaries. + + Basically, if you distribute unmodified source, you meet + automatically comply with the license with no additional effort on + your part. + + II. Terms for distribution of derived works via subclassing and/or + composition. + + You may generate derived works by means of subclassing and/or + composition (e.g., the Adaptor Pattern), provided that the following + conditions are met: + + 1. Redistributions of original source code must retain the above + copyright notice and license. You are not required to redistribute + the original source; you may choose to redistribute only the + binaries. + + 2. The original software is not altered. + + 3. Derived works are not contained in the info.clearthought + namespace/package or any subpackage of info.clearthought. + + 4. Derived works do not use the class or interface names from the + info.clearthought... packages + + For example, you may define a class with the following full name: + org.nameOfMyOrganization.layouts.RowMajorTableLayout + + However, you may not define a class with the either of the + following full names: + info.clearthought.layout.RowMajorTableLayout + org.nameOfMyOrganization.layouts.TableLayout + + III. Terms for redistribution of source modified via patch files. + + You may generate derived works by means of patch files provided + that the following conditions are met: + + 1. Redistributions of original source code must retain the above + copyright notice and license. You are not required to + redistribute the original source; you may choose to redistribute + only the binaries resulting from the patch files. + + 2. The original source files are not altered. All alteration is + done in patch files. + + 3. Derived works are not contained in the info.clearthought + namespace/package or any subpackage of info.clearthought. This + means that your patch files must change the namespace/package + for the derived work. See section II for examples. + + 4. Derived works do not use the class or interface names from the + info.clearthought... packages. This means your patch files + must change the names of the interfaces and classes they alter. + See section II for examples. + + 5. Derived works must include the following disclaimer. + "This work is derived from Clearthought's TableLayout, + https://tablelayout.dev.java.net, by means of patch files + rather than subclassing or composition. Therefore, this work + might not contain the latest fixes and features of TableLayout." + + IV. Terms for repackaging, transcoding, and compiling of binaries. + + You may do any of the following with the binaries of the + original software. + + 1. You may move binaries (.class files) from the original .jar file + to your own .jar file. + + 2. You may move binaries from the original .jar file to other + resource containing files, including but not limited to .zip, + .gz, .tar, .dll, .exe files. + + 3. You may backend compile the binaries to any platform, including + but not limited to Win32, Win64, MAC OS, Linux, Palm OS, any + handheld or embedded platform. + + 4. You may transcribe the binaries to other virtual machine byte + code protocols, including but not limited to .NET. + + V. License Disclaimer. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR, AFFILATED BUSINESSES, + OR ANYONE ELSE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (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 Clearthought Software License, Version 1.0 - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. The original software may not be altered. However, the classes - provided may be subclasses as long as the subclasses are not - packaged in the info.clearthought package or any subpackage of - info.clearthought. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE AUTHOR, AFFILATED BUSINESSES, - OR ANYONE ELSE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (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 (C) 2007, Torsten Werner <twer...@debian.org> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is (C) 2007-2009, Torsten Werner <twer...@debian.org> and +is licensed under the GPL-3, see `/usr/share/common-licenses/GPL-3'. Modified: trunk/libtablelayout-java/debian/orig-tar.sh =================================================================== --- trunk/libtablelayout-java/debian/orig-tar.sh 2010-01-09 14:56:20 UTC (rev 11334) +++ trunk/libtablelayout-java/debian/orig-tar.sh 2010-01-09 20:21:04 UTC (rev 11335) @@ -7,7 +7,7 @@ # clean up the upstream tarball mkdir $DIR -(cd $DIR && jar -x -f ../$3) +(cd $DIR && jar xf ../$3) tar -c -z -f $TAR $DIR rm -rf $DIR rm -rf $3 Added: trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch =================================================================== --- trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch (rev 0) +++ trunk/libtablelayout-java/debian/patches/0001-change-package-namespace.patch 2010-01-09 20:21:04 UTC (rev 11335) @@ -0,0 +1,76 @@ +From 7a9978421e3402621259ffa95e7fb617b3601474 Mon Sep 17 00:00:00 2001 +From: Torsten Werner <twer...@debian.org> +Date: Sat, 9 Jan 2010 21:03:56 +0100 +Subject: [PATCH] change package namespace + +--- + info/clearthought/layout/SingleFiledLayout.java | 2 +- + info/clearthought/layout/TableLayout.java | 4 ++-- + info/clearthought/layout/TableLayoutConstants.java | 2 +- + .../layout/TableLayoutConstraints.java | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/info/clearthought/layout/SingleFiledLayout.java b/info/clearthought/layout/SingleFiledLayout.java +index 9859446..0a680eb 100644 +--- a/info/clearthought/layout/SingleFiledLayout.java ++++ b/info/clearthought/layout/SingleFiledLayout.java +@@ -114,7 +114,7 @@ + * ==================================================================== + */ + +-package info.clearthought.layout; ++package org.debian.tablelayout; + + + +diff --git a/info/clearthought/layout/TableLayout.java b/info/clearthought/layout/TableLayout.java +index 4f5dbed..e19f8eb 100644 +--- a/info/clearthought/layout/TableLayout.java ++++ b/info/clearthought/layout/TableLayout.java +@@ -114,7 +114,7 @@ + * ==================================================================== + */ + +-package info.clearthought.layout; ++package org.debian.tablelayout; + + + +@@ -342,7 +342,7 @@ import java.lang.reflect.*; + public class TableLayout implements + java.awt.LayoutManager2, + java.io.Serializable, +- info.clearthought.layout.TableLayoutConstants ++ org.debian.tablelayout.TableLayoutConstants + { + + +diff --git a/info/clearthought/layout/TableLayoutConstants.java b/info/clearthought/layout/TableLayoutConstants.java +index bea9f8a..d6e1f79 100644 +--- a/info/clearthought/layout/TableLayoutConstants.java ++++ b/info/clearthought/layout/TableLayoutConstants.java +@@ -114,7 +114,7 @@ + * ==================================================================== + */ + +-package info.clearthought.layout; ++package org.debian.tablelayout; + + + +diff --git a/info/clearthought/layout/TableLayoutConstraints.java b/info/clearthought/layout/TableLayoutConstraints.java +index 4b43ddb..951b82f 100644 +--- a/info/clearthought/layout/TableLayoutConstraints.java ++++ b/info/clearthought/layout/TableLayoutConstraints.java +@@ -114,7 +114,7 @@ + * ==================================================================== + */ + +-package info.clearthought.layout; ++package org.debian.tablelayout; + + + +-- +1.6.5 + Added: trunk/libtablelayout-java/debian/source/format =================================================================== --- trunk/libtablelayout-java/debian/source/format (rev 0) +++ trunk/libtablelayout-java/debian/source/format 2010-01-09 20:21:04 UTC (rev 11335) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits