[bnd] 04/06: * Fix copyright issues * Don't include the test jars in the source tarball

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to annotated tag debian/0.0.337.1-2
in repository bnd.

commit 2118827538ec40270073d1a71bace7204ab7ba69
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Sun Aug 2 21:54:10 2009 +0000

    * Fix copyright issues
    * Don't include the test jars in the source tarball
---
 debian/TODO             |  1 +
 debian/changelog        |  7 +++++++
 debian/copyright        | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 debian/svn-transform.sh |  2 +-
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/debian/TODO b/debian/TODO
index 9c93be8..c8a53dc 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,3 +1,4 @@
 * Command-line script for the bnd command
 * Man page
 * Build the full jar with the OSGi and Eclipse dependencies (runtime and eclipse sub-packages)
+* Clarify the licensing issues for some files (BndScanner.java and Filter.java)
diff --git a/debian/changelog b/debian/changelog
index 217e3f1..20947d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bnd (0.0.337.1-2) experimental; urgency=low
+
+  * Fix copyright issues
+  * Don't include the test jars in the source tarball
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 22:48:47 +0100
+
 bnd (0.0.337.1-1) experimental; urgency=low
 
   * Initial release. (Closes: #539558)
diff --git a/debian/copyright b/debian/copyright
index 955ddad..ad13686 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,22 @@ Files: *
 Copyright: 2006-2009, aQute SARL
 License: Apache-2.0
 
+Files: eclipse/src/main/java/swing2swt/layout/AWTLayout.java eclipse/src/main/java/swing2swt/layout/GridLayout.java
+Copyright: 2003, IBM Corp.
+License: IBM-License
+
+Files: eclipse/src/main/java/aQute/bnd/plugin/editors/BndScanner.java
+Copyright: 2005, Rodrigo B. de Oliveira <rbo at acm.org>
+License: GPL-2+
+
+Files: libg/src/main/java/aQute/lib/filter/Filter.java
+Copyright: 2000, Gatespace AB
+License: OSGi-member-agreement
+
+Files: eclipse/src/main/java/aQute/bnd/plugin/Central.java libg/src/main/java/aQute/libg/clauses/Selector.java
+Copyright: 2006-2008, OSGi Alliance
+License: OSGi-member-agreement
+
 Files: debian/*
 Copyright: 2009, Ludovic Claude <ludovic.claude at laposte.net>.
 License: GPL-3+
@@ -15,8 +31,45 @@ License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
 
+License: GPL-2
+  On Debian GNU/Linux system you can find the complete text of the
+  GNU General Public License version 2 license in 
+  '/usr/share/common-licenses/GPL-2'.
+
 License: GPL-3
   On Debian GNU/Linux system you can find the complete text of the
   GNU General Public License version 3 license in 
   '/usr/share/common-licenses/GPL-3'.
 
+License: IBM-License
+ (Looks like a BSD license)
+ The sample program(s) is/are owned by International Business Machines
+ Corporation or one of its subsidiaries ("IBM") and is/are copyrighted and
+ licensed, not sold.
+ .
+ You may copy, modify, and distribute this/these sample program(s) in any form
+ without payment to IBM, for any purpose including developing, using, marketing
+ or distributing programs that include or are derivative works of the sample
+ program(s).
+ .
+ The sample program(s) is/are provided to you on an "AS IS" basis, without
+ warranty of any kind.  IBM HEREBY EXPRESSLY DISCLAIMS ALL WARRANTIES, EITHER
+ EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  Some jurisdictions do
+ not allow for the exclusion or limitation of implied warranties, so the above
+ limitations or exclusions may not apply to you.  IBM shall not be liable for
+ any damages you suffer as a result of using, modifying or distributing the
+ sample program(s) or its/their derivatives.
+ .
+ Each copy of any portion of this/these sample program(s) or any derivative
+ work, must include the above copyright notice and disclaimer of warranty.
+
+License: OSGi-member-agreement
+ Gatespace grants Open Services Gateway Initiative (OSGi) an irrevocable,
+ perpetual, non-exclusive, worldwide, paid-up right and license to
+ reproduce, display, perform, prepare and have prepared derivative works
+ based upon and distribute and sublicense this material and derivative
+ works thereof as set out in the OSGi MEMBER AGREEMENT as of January 24
+ 2000, for use in accordance with Section 2.2 of the BY-LAWS of the
+ OSGi MEMBER AGREEMENT.
+
diff --git a/debian/svn-transform.sh b/debian/svn-transform.sh
index 92bdcfc..e0b58c3 100644
--- a/debian/svn-transform.sh
+++ b/debian/svn-transform.sh
@@ -55,7 +55,7 @@ mkdir -p $DEST/eclipse/src/main/java/aQute/bnd
 rsync --cvs-exclude -r --exclude 'test' --exclude 'aQute' --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.bnd/src/ $DEST/eclipse/src/main/java/   
 rsync --cvs-exclude -r $SRC/aQute.bnd/src/aQute/bnd/plugin $SRC/aQute.bnd/src/aQute/bnd/launch $SRC/aQute.bnd/src/aQute/bnd/junit $SRC/aQute.bnd/src/aQute/bnd/jareditor $SRC/aQute.bnd/src/aQute/bnd/classpath $DEST/eclipse/src/main/java/aQute/bnd  
 
-rsync --cvs-exclude -r $SRC/aQute.bnd/jar $DEST/core/src/test/resources
+#rsync --cvs-exclude -r $SRC/aQute.bnd/jar $DEST/core/src/test/resources
 mkdir -p $DEST/src/main/assembly
 mkdir -p $DEST/src/main/resources
 cp $SRC/aQute.bnd/plugin.xml $DEST/src/main/resources

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git