[pkg-java] r4624 - trunk/concurrent-dfsg/debian

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Mon Nov 5 18:26:17 UTC 2007


Author: varun-guest
Date: 2007-11-05 18:26:16 +0000 (Mon, 05 Nov 2007)
New Revision: 4624

Added:
   trunk/concurrent-dfsg/debian/README.Debian
   trunk/concurrent-dfsg/debian/README.Debian-source
   trunk/concurrent-dfsg/debian/ant.properties
   trunk/concurrent-dfsg/debian/changelog
   trunk/concurrent-dfsg/debian/compat
   trunk/concurrent-dfsg/debian/control
   trunk/concurrent-dfsg/debian/copyright
   trunk/concurrent-dfsg/debian/dirs
   trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base
   trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs
   trunk/concurrent-dfsg/debian/rules
Removed:
   trunk/concurrent-dfsg/debian/README.Debian-source
   trunk/concurrent-dfsg/debian/ant.properties
   trunk/concurrent-dfsg/debian/changelog
   trunk/concurrent-dfsg/debian/compat
   trunk/concurrent-dfsg/debian/control
   trunk/concurrent-dfsg/debian/copyright
   trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base
   trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs
   trunk/concurrent-dfsg/debian/orig-tar.sh
   trunk/concurrent-dfsg/debian/rules
Log:
* Revert all previous changes. See #448812


Added: trunk/concurrent-dfsg/debian/README.Debian
===================================================================
--- trunk/concurrent-dfsg/debian/README.Debian	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/README.Debian	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,25 @@
+concurrent-dfsg for Debian
+--------------------------
+
+The concurrent library as supplied upstream contains some classes
+which are derived from SUN classes under non-free licence.
+
+Therefore these classes are removed to make the debian package
+DFSG compliant. The removed java source files are:
+
+CopyOnWriteArrayList.java 
+ConcurrentReaderHashMap.java
+ConcurrentHashMap.java
+PropertyChangeMulticaster.java
+VetoableChangeMulticaster.java
+
+Due to inheritance from and usage of the non-free classes also
+the following java source files are removed:
+
+CopyOnWriteArraySet.java
+ObservableSync.java
+
+Please use this concurrent library only for your programs if
+you don't need some of the above mentioned java classes !
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 29 Oct 2005 23:12:19 +0200

Deleted: trunk/concurrent-dfsg/debian/README.Debian-source
===================================================================
--- trunk/concurrent-dfsg/debian/README.Debian-source	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/README.Debian-source	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,13 +0,0 @@
-concurrent-dfsg
-===============
-
-The upstream supplied source package contains binary jar files.
-Currently no clean source distribution exists. Therefore, the upstream
-sources were modified to comply with the Debian Free Software
-Guidelines.
-
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the 
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varunhiremath at gmail.com>, Fri,  2 Nov 2007 14:46:38 +0530

Added: trunk/concurrent-dfsg/debian/README.Debian-source
===================================================================
--- trunk/concurrent-dfsg/debian/README.Debian-source	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/README.Debian-source	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,25 @@
+concurrent-dfsg for Debian
+--------------------------
+
+The concurrent library as supplied upstream contains some classes
+which are derived from SUN classes under non-free licence.
+
+This is a step-by-step instruction how this package
+was derived from upstream concurrent.tar.gz:
+
+- extracted concurrent.tar.gz and renamed the directory to 
+  concurrent-dfsg-<version>
+- removed all html javadoc files except intro.html/demos.html
+- removed the following non-free java source files
+
+CopyOnWriteArrayList.java 
+ConcurrentReaderHashMap.java
+ConcurrentHashMap.java
+PropertyChangeMulticaster.java
+VetoableChangeMulticaster.java
+CopyOnWriteArraySet.java
+ObservableSync.java
+
+- created the concurrent-dfsg_<version>.orig.tar.gz file
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 29 Oct 2005 23:12:19 +0200

Deleted: trunk/concurrent-dfsg/debian/ant.properties
===================================================================
--- trunk/concurrent-dfsg/debian/ant.properties	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/ant.properties	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1 +0,0 @@
-docs=docs/api

Added: trunk/concurrent-dfsg/debian/ant.properties
===================================================================
--- trunk/concurrent-dfsg/debian/ant.properties	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/ant.properties	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1 @@
+docs=docs/api

Deleted: trunk/concurrent-dfsg/debian/changelog
===================================================================
--- trunk/concurrent-dfsg/debian/changelog	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/changelog	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,29 +0,0 @@
-concurrent-dfsg (1.3.4.ds1-1) unstable; urgency=low
-
-  * debian/control:
-    + Remove Wolfgang Baer and add myself and Torsten to Uploaders
-    + Add Homepage, Vcs-{Svn, Browser} Headers.
-    + Switch to java-gcj from kaffe
-  * Repackage the source and include all java files (Closes: #448812)
-  * Add debian/orig-tar.sh
-  * Remove README.Debian and add a new README.Debian-source
-  * Clean up debian/rules and use cdbs variables.
-
- -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 02 Nov 2007 18:52:46 +0530
-
-concurrent-dfsg (1.3.4-2) unstable; urgency=low
-
-  * Removed explicit usage of jikes build compiler property
-    for kaffe jikes -> ecj transition
-
- -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:16:26 +0100
-
-concurrent-dfsg (1.3.4-1) unstable; urgency=low
-
-  * Initial Release (closes: #294540, #161603)
-  * The upstream source was repackaged due to inclusion
-    of some SUN derived classes. The affected and therefore
-    removed classes are documented in README.Debian. Steps
-    to reproduce are given in the README.Debian-source file.
-
- -- Wolfgang Baer <WBaer at gmx.de>  Sat, 29 Oct 2005 23:12:19 +0200

Added: trunk/concurrent-dfsg/debian/changelog
===================================================================
--- trunk/concurrent-dfsg/debian/changelog	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/changelog	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,16 @@
+concurrent-dfsg (1.3.4-2) unstable; urgency=low
+
+  * Removed explicit usage of jikes build compiler property
+    for kaffe jikes -> ecj transition
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:16:26 +0100
+
+concurrent-dfsg (1.3.4-1) unstable; urgency=low
+
+  * Initial Release (closes: #294540, #161603)
+  * The upstream source was repackaged due to inclusion
+    of some SUN derived classes. The affected and therefore
+    removed classes are documented in README.Debian. Steps
+    to reproduce are given in the README.Debian-source file.
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 29 Oct 2005 23:12:19 +0200

Deleted: trunk/concurrent-dfsg/debian/compat
===================================================================
--- trunk/concurrent-dfsg/debian/compat	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/compat	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1 +0,0 @@
-5

Added: trunk/concurrent-dfsg/debian/compat
===================================================================
--- trunk/concurrent-dfsg/debian/compat	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/compat	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1 @@
+4

Deleted: trunk/concurrent-dfsg/debian/control
===================================================================
--- trunk/concurrent-dfsg/debian/control	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/control	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,41 +0,0 @@
-Source: concurrent-dfsg
-Section: libs
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev
-Standards-Version: 3.7.2
-Homepage: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libconcurrent-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libconcurrent-java
-
-Package: libconcurrent-java
-Section: libs
-Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
-Suggests: libconcurrent-java-doc
-Description: utility classes for concurrent java programming
- The concurrent java library provides standardized, efficient versions of 
- utility classes commonly encountered in concurrent Java programming. 
- Discussions of the rationale and applications of several of these classes
- can be found in the second edition of Concurrent Programming in Java. 
- .
- The package mainly consists of implementations of a few interfaces:
- .
-  * Sync -- locks, conditions
-  * Channel -- queues, buffers
-  * Barrier -- multi-party synchronization
-  * SynchronizedVariable -- atomic ints, refs etc
-  * java.util.Collection -- collections
-  * Executor -- replacements for direct use of Thread
-
-Package: libconcurrent-java-doc
-Section: doc
-Architecture: all
-Suggests: libconcurrent-java
-Description: documentation and javadoc api for libconcurrent-java
- The concurrent java library provides standardized, efficient versions of 
- utility classes commonly encountered in concurrent Java programming.
- .
- This package contains the introduction and javadoc api.

Added: trunk/concurrent-dfsg/debian/control
===================================================================
--- trunk/concurrent-dfsg/debian/control	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/control	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,37 @@
+Source: concurrent-dfsg
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, kaffe
+Standards-Version: 3.6.2
+
+Package: libconcurrent-java
+Section: libs
+Architecture: all
+Depends: kaffe | java1-runtime | java2-runtime
+Suggests: java-virtual-machine, libconcurrent-java-doc
+Description: utility classes for concurrent java programming
+ The concurrent java library provides standardized, efficient versions of 
+ utility classes commonly encountered in concurrent Java programming. 
+ Discussions of the rationale and applications of several of these classes
+ can be found in the second edition of Concurrent Programming in Java. 
+ .
+ The package mainly consists of implementations of a few interfaces:
+ .
+  * Sync -- locks, conditions
+  * Channel -- queues, buffers
+  * Barrier -- multi-party synchronization
+  * SynchronizedVariable -- atomic ints, refs etc
+  * java.util.Collection -- collections
+  * Executor -- replacements for direct use of Thread
+
+Package: libconcurrent-java-doc
+Section: doc
+Architecture: all
+Suggests: libconcurrent-java
+Description: documentation and javadoc api for libconcurrent-java
+ The concurrent java library provides standardized, efficient versions of 
+ utility classes commonly encountered in concurrent Java programming.
+ .
+ This package contains the introduction and javadoc api.

Deleted: trunk/concurrent-dfsg/debian/copyright
===================================================================
--- trunk/concurrent-dfsg/debian/copyright	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/copyright	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,14 +0,0 @@
-This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
-Tue,  8 Feb 2005 17:03:57 +0100.
-
-It was downloaded from 
-<http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html>
-
-Copyright:
-
-Upstream Author: Doug Lea <dl at cs.oswego.edu>
-
-License:
-
-All classes are released to the public domain and may be used 
-for any purpose whatsoever without permission or acknowledgment. 

Added: trunk/concurrent-dfsg/debian/copyright
===================================================================
--- trunk/concurrent-dfsg/debian/copyright	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/copyright	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,14 @@
+This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
+Tue,  8 Feb 2005 17:03:57 +0100.
+
+It was downloaded from 
+<http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html>
+
+Copyright:
+
+Upstream Author: Doug Lea <dl at cs.oswego.edu>
+
+License:
+
+All classes are released to the public domain and may be used 
+for any purpose whatsoever without permission or acknowledgment. 

Added: trunk/concurrent-dfsg/debian/dirs
===================================================================
--- trunk/concurrent-dfsg/debian/dirs	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/dirs	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1 @@
+usr/share/java

Deleted: trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base
===================================================================
--- trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,10 +0,0 @@
-Document: libconcurrent-java-doc
-Title: Programmer API for libconcurrent-java
-Author: The Apache Ant Development Team
-Abstract: This is the programmer API of libconcurrent-java, a library
- of utility classes for concurrent java programming.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libconcurrent-java-doc/api/index.html
-Files: /usr/share/doc/libconcurrent-java-doc/api/*.html

Added: trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base
===================================================================
--- trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/libconcurrent-java-doc.doc-base	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,10 @@
+Document: libconcurrent-java-doc
+Title: Programmer API for libconcurrent-java
+Author: The Apache Ant Development Team
+Abstract: This is the programmer API of libconcurrent-java, a library
+ of utility classes for concurrent java programming.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libconcurrent-java-doc/api/index.html
+Files: /usr/share/doc/libconcurrent-java-doc/api/*.html

Deleted: trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs
===================================================================
--- trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,3 +0,0 @@
-intro.html
-taskDemo
-docs/api

Added: trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs
===================================================================
--- trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/libconcurrent-java-doc.docs	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,3 @@
+intro.html
+taskDemo
+docs/api

Deleted: trunk/concurrent-dfsg/debian/orig-tar.sh
===================================================================
--- trunk/concurrent-dfsg/debian/orig-tar.sh	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/orig-tar.sh	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=concurrent-dfsg-$1
-TAR=../concurrent-dfsg_$1.orig.tar.gz
-
-# Download sources
-wget http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
-
-# clean up the upstream tarball
-tar zxf concurrent.tar.gz
-mv concurrent $DIR
-GZIP=--best tar czf $TAR $DIR
-rm -rf $DIR concurrent.tar.gz
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi
-
-exit 0

Deleted: trunk/concurrent-dfsg/debian/rules
===================================================================
--- trunk/concurrent-dfsg/debian/rules	2007-11-05 12:07:37 UTC (rev 4623)
+++ trunk/concurrent-dfsg/debian/rules	2007-11-05 18:26:16 UTC (rev 4624)
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules file for concurrent-dfsg (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME 		:= /usr/lib/jvm/java-gcj
-DEB_JARS 		:= $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_BUILD_TARGET 	:= dist javadoc
-
-clean::
-	-rm -rf docs
-
-install/libconcurrent-java::
-	install -m 644 -D lib/concurrent.jar debian/libconcurrent-java/usr/share/java/concurrent-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/concurrent-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/concurrent.jar
-
-get-orig-source:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)

Added: trunk/concurrent-dfsg/debian/rules
===================================================================
--- trunk/concurrent-dfsg/debian/rules	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/rules	2007-11-05 18:26:16 UTC (rev 4624)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# debian/rules file for concurrent-dfsg (uses cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
+DEB_ANT_BUILD_TARGET := dist javadoc
+
+clean::
+	-rm -rf docs
+
+install/libconcurrent-java::
+	install -m 644 lib/concurrent.jar debian/libconcurrent-java/usr/share/java/concurrent-$(UPSTREAM_VERSION).jar
+	ln -s concurrent-$(UPSTREAM_VERSION).jar debian/libconcurrent-java/usr/share/java/concurrent.jar




More information about the pkg-java-commits mailing list