[pkg-java] r11328 - trunk/bnd/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-01-06 22:59:30 +0000 (Wed, 06 Jan 2010)
New Revision: 11328

Modified:
   trunk/bnd/debian/changelog
   trunk/bnd/debian/control
   trunk/bnd/debian/copyright
   trunk/bnd/debian/orig-tar.sh
   trunk/bnd/debian/svn-transform.sh
Log:
* New upstream release
* Exclude the Filter class from the distribution as it has
  some copyright issues and it is not used anymore in this
  new version of BND
* Update copyright according to upstream changes, all
  contentious issues have been cleared.
* Bump up Standards-Version to 3.8.3, no change

Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2010-01-04 22:36:21 UTC (rev 11327)
+++ trunk/bnd/debian/changelog	2010-01-06 22:59:30 UTC (rev 11328)
@@ -1,3 +1,15 @@
+bnd (0.0.384-1) unstable; urgency=low
+
+  * New upstream release
+  * Exclude the Filter class from the distribution as it has
+    some copyright issues and it is not used anymore in this
+    new version of BND
+  * Update copyright according to upstream changes, all
+    contentious issues have been cleared.
+  * Bump up Standards-Version to 3.8.3, no change
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 12:14:20 +0100
+
 bnd (0.0.337.2-3) unstable; urgency=low
 
   * Force name of bnd library installed in /usr/share/java

Modified: trunk/bnd/debian/control
===================================================================
--- trunk/bnd/debian/control	2010-01-04 22:36:21 UTC (rev 11327)
+++ trunk/bnd/debian/control	2010-01-06 22:59:30 UTC (rev 11328)
@@ -5,7 +5,7 @@
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at drazzib.com>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, maven-ant-helper
 Build-Depends-Indep: maven-repo-helper, junit
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bnd
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bnd
 Homepage: http://www.aqute.biz/Code/Bnd

Modified: trunk/bnd/debian/copyright
===================================================================
--- trunk/bnd/debian/copyright	2010-01-04 22:36:21 UTC (rev 11327)
+++ trunk/bnd/debian/copyright	2010-01-06 22:59:30 UTC (rev 11328)
@@ -11,36 +11,18 @@
 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/libg/clauses/Selector.java
+Copyright: 2006, OSGi Alliance
+License: Apache-2.0
 
-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+
+License: Apache-2.0
 
 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
@@ -64,12 +46,3 @@
  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.
-

Modified: trunk/bnd/debian/orig-tar.sh
===================================================================
--- trunk/bnd/debian/orig-tar.sh	2010-01-04 22:36:21 UTC (rev 11327)
+++ trunk/bnd/debian/orig-tar.sh	2010-01-06 22:59:30 UTC (rev 11328)
@@ -4,7 +4,7 @@
 TAR=../bnd_$VERSION.orig.tar.gz
 DIR=bnd-$VERSION
 
-DATE=20090701
+DATE=20091209
 cvs -z3 -d:pserver:anonymous at bnd.cvs.sourceforge.net:/cvsroot/bnd checkout -D $DATE -d bnd-cvs .
 
 # Use a script to transform the current codebase.

Modified: trunk/bnd/debian/svn-transform.sh
===================================================================
--- trunk/bnd/debian/svn-transform.sh	2010-01-04 22:36:21 UTC (rev 11327)
+++ trunk/bnd/debian/svn-transform.sh	2010-01-06 22:59:30 UTC (rev 11328)
@@ -12,7 +12,7 @@
 
 echo "Copy files..."
 mkdir -p $DEST/libg/src/main/java
-rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.libg/src/ $DEST/libg/src/main/java/   
+rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' --exclude '**/filter' $SRC/aQute.libg/src/ $DEST/libg/src/main/java/   
 
 mkdir -p $DEST/runtime/src/main/java
 rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' $SRC/aQute.runtime/src/ $DEST/runtime/src/main/java/