Author: drazzib Date: 2009-11-24 01:07:54 +0000 (Tue, 24 Nov 2009) New Revision: 11115
Removed: trunk/libswingx-java/debian/patches/swingworker.diff Modified: trunk/libswingx-java/debian/changelog trunk/libswingx-java/debian/control trunk/libswingx-java/debian/patches/pom.diff trunk/libswingx-java/debian/patches/series Log: * FIXME: Need patch in "jajuk" before uploading this * New upstream release. - remove debian/patches/swingworker.diff (merged upstream) - update debian/patches/pom.diff * Depends on java6-runtime-headless as we build java6 bytecode Modified: trunk/libswingx-java/debian/changelog =================================================================== --- trunk/libswingx-java/debian/changelog 2009-11-24 01:06:18 UTC (rev 11114) +++ trunk/libswingx-java/debian/changelog 2009-11-24 01:07:54 UTC (rev 11115) @@ -1,3 +1,13 @@ +libswingx-java (1:1.6-1) UNRELEASED; urgency=low + + * FIXME: Need patch in "jajuk" before uploading this + * New upstream release. + - remove debian/patches/swingworker.diff (merged upstream) + - update debian/patches/pom.diff + * Depends on java6-runtime-headless as we build java6 bytecode + + -- Damien Raude-Morvan <[email protected]> Tue, 24 Nov 2009 02:07:30 +0100 + libswingx-java (1:1.0-1) unstable; urgency=low * New upstream release. Modified: trunk/libswingx-java/debian/control =================================================================== --- trunk/libswingx-java/debian/control 2009-11-24 01:06:18 UTC (rev 11114) +++ trunk/libswingx-java/debian/control 2009-11-24 01:07:54 UTC (rev 11115) @@ -13,7 +13,7 @@ Package: libswingx-java Architecture: all -Depends: ${misc:Depends}, default-jre | java5-runtime +Depends: ${misc:Depends}, default-jre | java6-runtime Description: extensions to the Swing GUI toolkit This package contains extensions to the Swing GUI toolkit, including new and enhanced components that provide functionality commonly required by rich Modified: trunk/libswingx-java/debian/patches/pom.diff =================================================================== --- trunk/libswingx-java/debian/patches/pom.diff 2009-11-24 01:06:18 UTC (rev 11114) +++ trunk/libswingx-java/debian/patches/pom.diff 2009-11-24 01:07:54 UTC (rev 11115) @@ -1,47 +1,43 @@ --- a/swingx-beaninfo/pom.xml +++ b/swingx-beaninfo/pom.xml @@ -20,14 +20,6 @@ - <groupId>com.jhlabs</groupId> - <artifactId>filters</artifactId> - </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>swing-worker</artifactId> -- </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>multiplegradientpaint</artifactId> -- </dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + </dependency> +- <dependency> +- <groupId>org.swinglabs</groupId> +- <artifactId>swing-worker</artifactId> +- </dependency> +- <dependency> +- <groupId>org.swinglabs</groupId> +- <artifactId>multiplegradientpaint</artifactId> +- </dependency> <!-- Preferably we should use this jmock configuration with junit 4 --> <!--dependency> <groupId>org.jmock</groupId> --- a/swingx-core/pom.xml +++ b/swingx-core/pom.xml @@ -16,14 +16,6 @@ - <artifactId>filters</artifactId> - </dependency> - <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>swing-worker</artifactId> -- </dependency> -- <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>multiplegradientpaint</artifactId> -- </dependency> -- <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <artifactId>filters</artifactId> + </dependency> + <dependency> +- <groupId>org.swinglabs</groupId> +- <artifactId>swing-worker</artifactId> +- </dependency> +- <dependency> +- <groupId>org.swinglabs</groupId> +- <artifactId>multiplegradientpaint</artifactId> +- </dependency> +- <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> --- a/pom.xml +++ b/pom.xml -@@ -113,18 +113,6 @@ +@@ -112,13 +112,6 @@ + <version>2.0.235</version> <scope>compile</scope> </dependency> - <dependency> -- <groupId>org.swinglabs</groupId> -- <artifactId>swing-worker</artifactId> -- <version>1.1</version> -- <!--scope>compile</scope--> - </dependency> - <dependency> - <groupId>org.swinglabs</groupId> @@ -49,7 +45,6 @@ - <version>1.0</version> - <scope>compile</scope> - </dependency> -- <dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.5</version> Modified: trunk/libswingx-java/debian/patches/series =================================================================== --- trunk/libswingx-java/debian/patches/series 2009-11-24 01:06:18 UTC (rev 11114) +++ trunk/libswingx-java/debian/patches/series 2009-11-24 01:07:54 UTC (rev 11115) @@ -1,2 +1 @@ -swingworker.diff pom.diff Deleted: trunk/libswingx-java/debian/patches/swingworker.diff =================================================================== --- trunk/libswingx-java/debian/patches/swingworker.diff 2009-11-24 01:06:18 UTC (rev 11114) +++ trunk/libswingx-java/debian/patches/swingworker.diff 2009-11-24 01:07:54 UTC (rev 11115) @@ -1,11 +0,0 @@ ---- a/src/java/org/jdesktop/swingx/auth/LoginService.java -+++ b/src/java/org/jdesktop/swingx/auth/LoginService.java -@@ -27,7 +27,7 @@ - import javax.swing.event.EventListenerList; - - import org.jdesktop.beans.AbstractBean; --import org.jdesktop.swingworker.SwingWorker; -+import javax.swing.SwingWorker; - - /** - * <b>LoginService</b> is the abstract base class for all classes implementing _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
