[pkg-java] r18963 - in trunk/trove3/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2016-01-30 15:20:35 +0000 (Sat, 30 Jan 2016)
New Revision: 18963

Added:
   trunk/trove3/debian/README.source
   trunk/trove3/debian/patches/do-not-copy-junit.jar.patch
Removed:
   trunk/trove3/debian/README.Debian-source
Modified:
   trunk/trove3/debian/changelog
   trunk/trove3/debian/control
   trunk/trove3/debian/patches/series
   trunk/trove3/debian/rules
Log:
Release 3.0.3-3


Deleted: trunk/trove3/debian/README.Debian-source
===================================================================
--- trunk/trove3/debian/README.Debian-source	2016-01-28 14:42:19 UTC (rev 18962)
+++ trunk/trove3/debian/README.Debian-source	2016-01-30 15:20:35 UTC (rev 18963)
@@ -1,10 +0,0 @@
-The upstream supplied source package contains binary jar files and
-pre-built documentation. 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.
-
--- Torsten Werner <twerner at debian.org>  Fri Oct 12 19:17:47 CEST 2007

Added: trunk/trove3/debian/README.source
===================================================================
--- trunk/trove3/debian/README.source	                        (rev 0)
+++ trunk/trove3/debian/README.source	2016-01-30 15:20:35 UTC (rev 18963)
@@ -0,0 +1,10 @@
+The upstream supplied source package contains binary jar files and
+pre-built documentation. 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.
+
+-- Torsten Werner <twerner at debian.org>  Fri Oct 12 19:17:47 CEST 2007

Modified: trunk/trove3/debian/changelog
===================================================================
--- trunk/trove3/debian/changelog	2016-01-28 14:42:19 UTC (rev 18962)
+++ trunk/trove3/debian/changelog	2016-01-30 15:20:35 UTC (rev 18963)
@@ -1,3 +1,15 @@
+trove3 (3.0.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Build target release and ship all generated classes like
+    TIntObjectHashMap.class.
+  * Enable the test suite. Add ant-optional and junit4 to Build-Depends.
+  * Remove Michael Koch from Uploaders. He is not active anymore.
+  * Use canonical Vcs-URI. Use https.
+  * Rename README.Debian-source to README.source.
+
+ -- Markus Koschany <apo at debian.org>  Sat, 30 Jan 2016 15:54:00 +0100
+
 trove3 (3.0.3-2) unstable; urgency=low
 
   * Bump to policy version 3.9.6 (no changes)

Modified: trunk/trove3/debian/control
===================================================================
--- trunk/trove3/debian/control	2016-01-28 14:42:19 UTC (rev 18962)
+++ trunk/trove3/debian/control	2016-01-30 15:20:35 UTC (rev 18963)
@@ -2,12 +2,12 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Erich Schubert <erich at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant, maven-repo-helper
+Uploaders: Erich Schubert <erich at debian.org>, Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 9), javahelper, default-jdk, ant, ant-optional, maven-repo-helper, junit4
 Standards-Version: 3.9.6
 Homepage: http://trove4j.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/trove3
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/trove3/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/trove3
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/trove3/
 
 Package: libtrove3-java
 Architecture: all

Added: trunk/trove3/debian/patches/do-not-copy-junit.jar.patch
===================================================================
--- trunk/trove3/debian/patches/do-not-copy-junit.jar.patch	                        (rev 0)
+++ trunk/trove3/debian/patches/do-not-copy-junit.jar.patch	2016-01-30 15:20:35 UTC (rev 18963)
@@ -0,0 +1,20 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 30 Jan 2016 00:29:11 +0100
+Subject: do not copy junit.jar
+
+---
+ build.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index e85f287..6e5e591 100644
+--- a/build.xml
++++ b/build.xml
+@@ -181,7 +181,6 @@
+         <copy todir="${dist.root}/${version}">
+             <fileset dir="${output.dir}" includes="lib/**,javadocs/**" />
+         </copy>
+-        <copy todir="${dist.root}/${version}/lib" file="${lib}/junit.jar"/>
+         
+         <!-- Misc. Files -->
+         <copy todir="${dist.root}/${version}">

Modified: trunk/trove3/debian/patches/series
===================================================================
--- trunk/trove3/debian/patches/series	2016-01-28 14:42:19 UTC (rev 18962)
+++ trunk/trove3/debian/patches/series	2016-01-30 15:20:35 UTC (rev 18963)
@@ -1,2 +1,3 @@
 01_build_target_5_0.patch
 add-maven-pom.patch
+do-not-copy-junit.jar.patch

Modified: trunk/trove3/debian/rules
===================================================================
--- trunk/trove3/debian/rules	2016-01-28 14:42:19 UTC (rev 18962)
+++ trunk/trove3/debian/rules	2016-01-30 15:20:35 UTC (rev 18963)
@@ -4,11 +4,13 @@
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_UPSTREAM_VERSION := 3.0.3
 
+export CLASSPATH := /usr/share/java/junit4.jar
+
 %:
 	dh $@ --with javahelper,maven_repo_helper
 
 override_dh_auto_build-indep:
-	dh_auto_build -- -Dversion.number=$(DEB_UPSTREAM_VERSION) jar javadoc
+	dh_auto_build -- -Dversion.number=$(DEB_UPSTREAM_VERSION) release javadoc
 
 override_dh_auto_install-indep:
 	# Install pom and jar