[pkg-java] r14321 - in trunk/libspring-java/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-08-18 23:54:28 +0000 (Thu, 18 Aug 2011)
New Revision: 14321

Added:
   trunk/libspring-java/debian/patches/0010_quartz_17.diff
Modified:
   trunk/libspring-java/debian/changelog
   trunk/libspring-java/debian/control
   trunk/libspring-java/debian/patches/series
Log:
* Fix FTBFS due to changes introduced in libquartz-java 1.7. (Closes: #638389)
* Bump Standards-Version to 3.9.2. No changes were required.


Modified: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog	2011-08-18 23:14:04 UTC (rev 14320)
+++ trunk/libspring-java/debian/changelog	2011-08-18 23:54:28 UTC (rev 14321)
@@ -1,3 +1,10 @@
+libspring-java (3.0.5.RELEASE-4) UNRELEASED; urgency=low
+
+  * Fix FTBFS due to changes introduced in libquartz-java 1.7. (Closes: #638389)
+  * Bump Standards-Version to 3.9.2. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 18 Aug 2011 19:04:13 -0430
+
 libspring-java (3.0.5.RELEASE-3) unstable; urgency=low
 
   * Upgrade d/maven.rules and d/maven.ignoreRules to include

Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control	2011-08-18 23:14:04 UTC (rev 14320)
+++ trunk/libspring-java/debian/control	2011-08-18 23:54:28 UTC (rev 14321)
@@ -19,7 +19,7 @@
  libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, libstruts1.2-java,
  libtiles-java, libtomcat6-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java,
  testng, velocity
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://springframework.org/about
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-java/

Added: trunk/libspring-java/debian/patches/0010_quartz_17.diff
===================================================================
--- trunk/libspring-java/debian/patches/0010_quartz_17.diff	                        (rev 0)
+++ trunk/libspring-java/debian/patches/0010_quartz_17.diff	2011-08-18 23:54:28 UTC (rev 14321)
@@ -0,0 +1,21 @@
+Description: Dummy compatibility with Quartz 1.7
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/638389
+Forwarded: no
+Last-Update: 2011-08-18
+
+--- libspring-java-3.0.5.RELEASE.orig/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
++++ libspring-java-3.0.5.RELEASE/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
+@@ -81,4 +81,12 @@ public class LocalTaskExecutorThreadPool
+ 		return 1;
+ 	}
+ 
++	public void setInstanceId(String id) {
++		throw new UnsupportedOperationException("setInstanceId");
++	}
++
++	public void setInstanceName(String name) {
++		throw new UnsupportedOperationException("setInstanceName");
++	}
++
+ }

Modified: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series	2011-08-18 23:14:04 UTC (rev 14320)
+++ trunk/libspring-java/debian/patches/series	2011-08-18 23:54:28 UTC (rev 14321)
@@ -7,3 +7,4 @@
 0007_no_jruby.diff
 0008_jpa_20_api.diff
 0009_hibernate_validator_41.diff
+0010_quartz_17.diff