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

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Fri Nov 2 13:11:30 UTC 2007 

Author: varun-guest
Date: 2007-11-02 13:11:30 +0000 (Fri, 02 Nov 2007)
New Revision: 4587

Added:
   trunk/concurrent-dfsg/debian/orig-tar.sh
Removed:
   trunk/concurrent-dfsg/debian/README.Debian
   trunk/concurrent-dfsg/debian/dirs
Modified:
   trunk/concurrent-dfsg/debian/README.Debian-source
   trunk/concurrent-dfsg/debian/changelog
   trunk/concurrent-dfsg/debian/compat
   trunk/concurrent-dfsg/debian/control
   trunk/concurrent-dfsg/debian/rules
Log:
* Rename package
* 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.
* Add debian/orig-tar.sh
* Remove README.Debian and add a new README.Debian-source
* Clean up debian/rules and use cdbs variables.

Deleted: trunk/concurrent-dfsg/debian/README.Debian
===================================================================
--- trunk/concurrent-dfsg/debian/README.Debian	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/README.Debian	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1,25 +0,0 @@
-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

Modified: trunk/concurrent-dfsg/debian/README.Debian-source
===================================================================
--- trunk/concurrent-dfsg/debian/README.Debian-source	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/README.Debian-source	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1,25 +1,13 @@
-concurrent-dfsg for Debian
---------------------------
+libconcurrent-java
+==================
 
-The concurrent library as supplied upstream contains some classes
-which are derived from SUN classes under non-free licence.
+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.
 
-This is a step-by-step instruction how this package
-was derived from upstream concurrent.tar.gz:
+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.
 
-- 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
+ -- Varun Hiremath <varunhiremath at gmail.com>, Fri,  2 Nov 2007 14:46:38 +0530

Modified: trunk/concurrent-dfsg/debian/changelog
===================================================================
--- trunk/concurrent-dfsg/debian/changelog	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/changelog	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1,3 +1,17 @@
+libconcurrent-java (1.3.4.ds1-1) unstable; urgency=low
+
+  * Rename package
+  * 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.
+  * 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

Modified: trunk/concurrent-dfsg/debian/compat
===================================================================
--- trunk/concurrent-dfsg/debian/compat	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/compat	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1 +1 @@
-4
+5

Modified: trunk/concurrent-dfsg/debian/control
===================================================================
--- trunk/concurrent-dfsg/debian/control	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/control	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1,16 +1,20 @@
-Source: concurrent-dfsg
+Source: libconcurrent-java
 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
+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: kaffe | java1-runtime | java2-runtime
-Suggests: java-virtual-machine, libconcurrent-java-doc
+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. 

Deleted: trunk/concurrent-dfsg/debian/dirs
===================================================================
--- trunk/concurrent-dfsg/debian/dirs	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/dirs	2007-11-02 13:11:30 UTC (rev 4587)
@@ -1 +0,0 @@
-usr/share/java

Added: trunk/concurrent-dfsg/debian/orig-tar.sh
===================================================================
--- trunk/concurrent-dfsg/debian/orig-tar.sh	                        (rev 0)
+++ trunk/concurrent-dfsg/debian/orig-tar.sh	2007-11-02 13:11:30 UTC (rev 4587)
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=libconcurrent-java-$1
+TAR=../libconcurrent-java_$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

Modified: trunk/concurrent-dfsg/debian/rules
===================================================================
--- trunk/concurrent-dfsg/debian/rules	2007-11-02 11:56:05 UTC (rev 4586)
+++ trunk/concurrent-dfsg/debian/rules	2007-11-02 13:11:30 UTC (rev 4587)
@@ -3,19 +3,17 @@
 
 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/jvm/java-gcj
+DEB_JARS 		:= $(ANT_HOME)/lib/ant-launcher.jar
+DEB_ANT_BUILD_TARGET 	:= dist javadoc
 
-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
+	install -m 644 -D lib/concurrent.jar $(DEB_DESTDIR)/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)

More information about the pkg-java-commits mailing list