[pkg-java] r17658 - in trunk/c3p0/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2014-01-15 14:51:43 +0000 (Wed, 15 Jan 2014)
New Revision: 17658

Added:
   trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch
Modified:
   trunk/c3p0/debian/changelog
   trunk/c3p0/debian/compat
   trunk/c3p0/debian/control
   trunk/c3p0/debian/patches/series
   trunk/c3p0/debian/watch
Log:
Disable-asynchronous-runner-tests.patch

Fix #725456


Modified: trunk/c3p0/debian/changelog
===================================================================
--- trunk/c3p0/debian/changelog	2014-01-13 10:09:37 UTC (rev 17657)
+++ trunk/c3p0/debian/changelog	2014-01-15 14:51:43 UTC (rev 17658)
@@ -1,3 +1,15 @@
+c3p0 (0.9.1.2-9) unstable; urgency=medium
+
+  * Team upload.
+  * Add disable-asynchronous-runner-tests.patch. Disable optional Junit tests
+    that can cause the build process to hang. (Closes: #725456)
+  * Update watch file to detect the latest upstream release.
+    Thanks to Bart Martens.
+  * Declare compliance with Debian Policy 3.9.5.
+  * Bump compat level to 9 and require debhelper >= 9.
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 15 Jan 2014 14:56:37 +0100
+
 c3p0 (0.9.1.2-8) unstable; urgency=low
 
   * debian/control:

Modified: trunk/c3p0/debian/compat
===================================================================
--- trunk/c3p0/debian/compat	2014-01-13 10:09:37 UTC (rev 17657)
+++ trunk/c3p0/debian/compat	2014-01-15 14:51:43 UTC (rev 17658)
@@ -1 +1 @@
-5
+9

Modified: trunk/c3p0/debian/control
===================================================================
--- trunk/c3p0/debian/control	2014-01-13 10:09:37 UTC (rev 17657)
+++ trunk/c3p0/debian/control	2014-01-15 14:51:43 UTC (rev 17658)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper, default-jdk
+Build-Depends: debhelper (>= 9), cdbs, maven-repo-helper, default-jdk
 Build-Depends-Indep: ant, liblog4j1.2-java, ant-optional, junit, libhsqldb-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/c3p0
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/c3p0
 Homepage: http://sourceforge.net/projects/c3p0

Added: trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch
===================================================================
--- trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch	                        (rev 0)
+++ trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch	2014-01-15 14:51:43 UTC (rev 17658)
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Wed, 15 Jan 2014 14:10:24 +0100
+Subject: disable asynchronous runnner tests
+
+---
+ build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index b03cab6..3d53fc4 100644
+--- a/build.xml
++++ b/build.xml
+@@ -605,6 +605,8 @@
+ 			<batchtest fork="yes" toDir="${build.testresults.dir}">
+ 				<fileset dir="${build.classes.dir}">
+ 					<include name="**/*JUnitTestCase.class"/>
++					<exclude name="**/ThreadPoolAsynchronousRunnerJUnitTestCase.class"/>
++					<exclude name="**/ThreadPerTaskAsynchronousRunnerJUnitTestCase.class"/>
+ 				</fileset>
+ 			</batchtest>
+ 		</junit>

Modified: trunk/c3p0/debian/patches/series
===================================================================
--- trunk/c3p0/debian/patches/series	2014-01-13 10:09:37 UTC (rev 17657)
+++ trunk/c3p0/debian/patches/series	2014-01-15 14:51:43 UTC (rev 17658)
@@ -1,3 +1,4 @@
 build.patch
 testing.patch
 java-7-compat.patch
+disable-asynchronous-runnner-tests.patch

Modified: trunk/c3p0/debian/watch
===================================================================
--- trunk/c3p0/debian/watch	2014-01-13 10:09:37 UTC (rev 17657)
+++ trunk/c3p0/debian/watch	2014-01-15 14:51:43 UTC (rev 17658)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/c3p0/ c3p0-([\d\.]+)\.src\.tgz debian debian/orig-tar.sh
+opts=uversionmangle=s/\.src$//;s/^(\S+\.bin)$/0.0.$1/;s/-(pre\d*)$/~$1/ \
+http://qa.debian.org/watch/sf.php/c3p0/c3p0[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) debian debian/orig-tar.sh