[libswingx-java] 12/26: * 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

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libswingx-java.

commit 3364b52693e0b44bab9ee30918bd1501ddb89e91
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Nov 24 01:07:54 2009 +0000

    * 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
---
 debian/changelog                | 10 +++++++
 debian/control                  |  2 +-
 debian/patches/pom.diff         | 59 +++++++++++++++++++----------------------
 debian/patches/series           |  1 -
 debian/patches/swingworker.diff | 11 --------
 5 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2438e3..0a09e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <drazzib at debian.org>  Tue, 24 Nov 2009 02:07:30 +0100
+
 libswingx-java (1:1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 55925b1..9603f95 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswingx-java/
 
 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
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index 33860db..c92f089 100644
--- a/debian/patches/pom.diff
+++ b/debian/patches/pom.diff
@@ -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>
diff --git a/debian/patches/series b/debian/patches/series
index 5ff0c9d..7740e23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-swingworker.diff
 pom.diff
diff --git a/debian/patches/swingworker.diff b/debian/patches/swingworker.diff
deleted file mode 100644
index 66d97d8..0000000
--- a/debian/patches/swingworker.diff
+++ /dev/null
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libswingx-java.git