[pkg-java] r14515 - in trunk/libswingx1-java: . debian debian/patches debian/source
Andrew Ross
rockclimb-guest at alioth.debian.org
Sun Aug 28 10:34:23 UTC 2011
Author: rockclimb-guest
Date: 2011-08-28 10:34:23 +0000 (Sun, 28 Aug 2011)
New Revision: 14515
Added:
trunk/libswingx1-java/debian/
trunk/libswingx1-java/debian/README.source
trunk/libswingx1-java/debian/build.properties
trunk/libswingx1-java/debian/build.xml
trunk/libswingx1-java/debian/changelog
trunk/libswingx1-java/debian/compat
trunk/libswingx1-java/debian/control
trunk/libswingx1-java/debian/copyright
trunk/libswingx1-java/debian/libswingx1-java-doc.javadoc
trunk/libswingx1-java/debian/libswingx1-java.jlibs
trunk/libswingx1-java/debian/libswingx1-java.poms
trunk/libswingx1-java/debian/orig-tar.exclude
trunk/libswingx1-java/debian/orig-tar.sh
trunk/libswingx1-java/debian/patches/
trunk/libswingx1-java/debian/patches/pom.patch
trunk/libswingx1-java/debian/patches/series
trunk/libswingx1-java/debian/patches/swingworker.diff
trunk/libswingx1-java/debian/rules
trunk/libswingx1-java/debian/source/
trunk/libswingx1-java/debian/source/format
trunk/libswingx1-java/debian/watch
Log:
[svn-inject] Applying Debian modifications (1:1.0-1) to trunk
Property changes on: trunk/libswingx1-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/libswingx1-java/debian/README.source
===================================================================
--- trunk/libswingx1-java/debian/README.source (rev 0)
+++ trunk/libswingx1-java/debian/README.source 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,23 @@
+Patch system
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
+Orig tarball repack
+===================
+
+The upstream supplied source package contains binary jar files.
+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.
+
+-- Varun Hiremath <varunhiremath at gmail.com> Mon, 27 Aug 2007 19:02:53 +0530
Added: trunk/libswingx1-java/debian/build.properties
===================================================================
--- trunk/libswingx1-java/debian/build.properties (rev 0)
+++ trunk/libswingx1-java/debian/build.properties 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,6 @@
+javadoc.dir=build/api
+maven.test.skip=true
+build.javaVersion=1.5
+classpath.compile = \
+ /usr/share/java/batik-all.jar:\
+ ${basedir}/swingx-core/build/swingx-core-${version}.jar
Added: trunk/libswingx1-java/debian/build.xml
===================================================================
--- trunk/libswingx1-java/debian/build.xml (rev 0)
+++ trunk/libswingx1-java/debian/build.xml 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,49 @@
+<project name="swingx" basedir=".." default="build">
+
+ <property file="debian/build.properties"/>
+ <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <attribute name="src"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ <property name="build.sourceDirectory" value="@{src}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+
+ <target name="clean">
+ <delete dir="build"/>
+ <cleanmodule dir="swingx-core"/>
+ <cleanmodule dir="swingx-beaninfo"/>
+ </target>
+
+ <target name="package">
+ <packagemodule dir="swingx-core" src="../src/java/"/>
+ <packagemodule dir="swingx-beaninfo" src="../src/beaninfo/"/>
+ </target>
+
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="src/java/"/>
+ <packageset dir="src/beaninfo/"/>
+ </javadoc>
+ </target>
+
+
+</project>
Added: trunk/libswingx1-java/debian/changelog
===================================================================
--- trunk/libswingx1-java/debian/changelog (rev 0)
+++ trunk/libswingx1-java/debian/changelog 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,104 @@
+libswingx1-java (1:1.0-1) unstable; urgency=low
+
+ * Rename old release to libswingx1 for compatibility purposes.
+ * Add myself to uploaders.
+ * Update standards version to 3.9.2 (no changes needed).
+ * Switch to source format 3.0 (quilt).
+ * Don't install maven repo to avoid conflicts with libswingx-java.
+ * Use javahelper to install jars and javadoc.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Sun, 28 Aug 2011 09:15:06 +0100
+
+libswingx-java (1:1.0-1~orig) unstable; urgency=low
+
+ * New upstream release.
+ * New "libswingx-java-doc" package:
+ - contains API javadoc documentation
+ * Bump Standards-Version to 3.8.3
+ - Change section to "java"
+ - Rename debian/README.Debian-source to debian/README.source
+ - Describe quilt patch system in debian/README.source
+ * Bump debhelper version to >= 7
+ * Remove unused Depends on ${shlibs:Depends}
+ * Default JRE:
+ - Build-Depends on default-jdk
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+ * Add myself to Uploaders
+ * Use DEP5 format for debian/copyright
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+ Maven repository
+ - Remove unneeded dependencies in pom.diff patch
+ * Maven ant helper (build system):
+ - Add a Build-Depends dependency on maven-ant-helper
+ - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
+ - Build classpath is now defined in debian/build.properties
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 02 Nov 2009 00:17:00 +0100
+
+libswingx-java (1:0.9.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Torsten Werner <twerner at debian.org> Tue, 17 Feb 2009 21:22:38 +0100
+
+libswingx-java (1:0.9.4-1) experimental; urgency=low
+
+ * New upstream release
+ * Move package to main because batik is in main now.
+ * Build with source=target=1.5 and change Depends accordingly.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Nov 2008 19:51:21 +0100
+
+libswingx-java (1:0.9.3-2) unstable; urgency=low
+
+ * Switch to OpenJDK for building the package.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 11 Aug 2008 21:03:43 +0200
+
+libswingx-java (1:0.9.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.8.0
+
+ -- Varun Hiremath <varun at debian.org> Tue, 08 Jul 2008 19:32:43 +0530
+
+libswingx-java (1:0.9.2-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Torsten Werner <twerner at debian.org> Sat, 08 Mar 2008 16:18:24 +0100
+
+libswingx-java (1:0.9.1-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * New upstream release
+ * Change Standards-Version: 3.7.3.
+
+ [ Varun Hiremath ]
+ * debian/rules: install versioned jar and create symlink
+
+ -- Varun Hiremath <varun at debian.org> Mon, 17 Dec 2007 03:12:34 +0530
+
+libswingx-java (20070722-2) unstable; urgency=low
+
+ * Include the *.properties files and images in the jars.
+ * debian/control: Add XS-Vcs-{Svn,Browser} headers.
+ * Add debian/README.Debian-source file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Wed, 08 Aug 2007 00:20:45 +0530
+
+libswingx-java (20070722-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: Add myself to Uploaders
+ * Update patches/swingworker.diff patch file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Sat, 04 Aug 2007 00:54:49 +0530
+
+libswingx-java (20070513-1) unstable; urgency=low
+
+ * Initial release (Closes: #420344)
+
+ -- Torsten Werner <twerner at debian.org> Sat, 21 Apr 2007 14:39:02 +0200
Added: trunk/libswingx1-java/debian/compat
===================================================================
--- trunk/libswingx1-java/debian/compat (rev 0)
+++ trunk/libswingx1-java/debian/compat 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1 @@
+7
Added: trunk/libswingx1-java/debian/control
===================================================================
--- trunk/libswingx1-java/debian/control (rev 0)
+++ trunk/libswingx1-java/debian/control 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,56 @@
+Source: libswingx1-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, maven-ant-helper, javahelper
+Build-Depends-Indep: libbatik-java, maven-repo-helper
+Standards-Version: 3.9.2
+Homepage: https://swingx.dev.java.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx1-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswingx1-java/
+
+Package: libswingx1-java
+Architecture: all
+Depends: ${misc:Depends}
+Description: extensions to the Swing GUI toolkit, version 1
+ This package contains extensions to the Swing GUI toolkit, including new and
+ enhanced components that provide functionality commonly required by rich
+ client applications. Highlights include:
+ - Sorting, filtering, highlighting for tables, trees, and lists
+ - Find/search
+ - Auto-completion
+ - Login/authentication framework
+ - TreeTable component
+ - Collapsible panel component
+ - Date picker component
+ - Tip-of-the-Day component
+ .
+ Many of these features will eventually be incorporated into the Swing toolkit,
+ although API compatibility will not be guaranteed. The SwingX project focuses
+ exclusively on the raw components themselves.
+
+Package: libswingx1-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libswingx-java
+Description: extensions to the Swing GUI toolkit, version 1 - documentation
+ This package contains extensions to the Swing GUI toolkit, including new and
+ enhanced components that provide functionality commonly required by rich
+ client applications. Highlights include:
+ - Sorting, filtering, highlighting for tables, trees, and lists
+ - Find/search
+ - Auto-completion
+ - Login/authentication framework
+ - TreeTable component
+ - Collapsible panel component
+ - Date picker component
+ - Tip-of-the-Day component
+ .
+ Many of these features will eventually be incorporated into the Swing toolkit,
+ although API compatibility will not be guaranteed. The SwingX project focuses
+ exclusively on the raw components themselves.
+ .
+ This package contains API documentation (Javadoc) of SwingX GUI Toolkit.
+
Added: trunk/libswingx1-java/debian/copyright
===================================================================
--- trunk/libswingx1-java/debian/copyright (rev 0)
+++ trunk/libswingx1-java/debian/copyright 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,73 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: SwingX
+Maintainer: SwingLabs SwingX Project
+Source: http://swinglabs.org/downloads.jsp
+
+Files: *
+Copyright: Copyright (c) 2005-2006 Sun Microsystems, Inc.
+License: LGPL-2.1+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+Files: src/test/org/jdesktop/swingx/JXTipOfTheDayTest.java
+Copyright: Copyright (c) 2007 L2FProd.com and
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+Files: src/java/org/jdesktop/swingx/image/*,
+ src/java/org/jdesktop/swingx/graphics/*,
+ src/java/org/jdesktop/swingx/geom/Star2D.java
+Copyright: Copyright 2005 Sun Microsystems, Inc.
+Copyright: Copyright (c) 2006 Romain Guy <romain.guy at mac.com>
+License: LPGL-2.1, BSD
+ Dual-licensed under LGPL (Sun and Romain Guy) and BSD (Romain Guy).
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: Copyright 2007, Torsten Werner <twerner at debian.org>
+Copyright: Copyright 2009, Damien Raude-Morvan <drazzib at debian.org>
+Licence: GPL-2+
+ Debian packaging is licensed under the GPL version 2 (or later),
+ see `/usr/share/common-licenses/GPL-2'.
+
Added: trunk/libswingx1-java/debian/libswingx1-java-doc.javadoc
===================================================================
--- trunk/libswingx1-java/debian/libswingx1-java-doc.javadoc (rev 0)
+++ trunk/libswingx1-java/debian/libswingx1-java-doc.javadoc 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1 @@
+build/api /usr/share/doc/libswingx1-java/api
Added: trunk/libswingx1-java/debian/libswingx1-java.jlibs
===================================================================
--- trunk/libswingx1-java/debian/libswingx1-java.jlibs (rev 0)
+++ trunk/libswingx1-java/debian/libswingx1-java.jlibs 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,2 @@
+swingx-beaninfo/build/swingx1-beaninfo-1.0.jar
+swingx-core/build/swingx1-1.0.jar
Added: trunk/libswingx1-java/debian/libswingx1-java.poms
===================================================================
--- trunk/libswingx1-java/debian/libswingx1-java.poms (rev 0)
+++ trunk/libswingx1-java/debian/libswingx1-java.poms 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,3 @@
+pom.xml --no-parent
+swingx-core/pom.xml --no-parent
+swingx-beaninfo/pom.xml --no-parent
Added: trunk/libswingx1-java/debian/orig-tar.exclude
===================================================================
--- trunk/libswingx1-java/debian/orig-tar.exclude (rev 0)
+++ trunk/libswingx1-java/debian/orig-tar.exclude 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,2 @@
+*.jar
+lib/*
Added: trunk/libswingx1-java/debian/orig-tar.sh
===================================================================
--- trunk/libswingx1-java/debian/orig-tar.sh (rev 0)
+++ trunk/libswingx1-java/debian/orig-tar.sh 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+
+TAR=../libswingx-java_$2.orig.tar.gz
+DIR=swingx-$2-src
+
+# clean up and repackage the upstream zip file
+unzip $3
+tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Property changes on: trunk/libswingx1-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libswingx1-java/debian/patches/pom.patch
===================================================================
--- trunk/libswingx1-java/debian/patches/pom.patch (rev 0)
+++ trunk/libswingx1-java/debian/patches/pom.patch 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,138 @@
+Update the version number in the poms.
+
+Index: libswingx1-java-1.0/pom.xml
+===================================================================
+--- libswingx1-java-1.0.orig/pom.xml 2011-08-28 11:13:18.572834324 +0100
++++ libswingx1-java-1.0/pom.xml 2011-08-28 11:13:25.412001021 +0100
+@@ -6,7 +6,7 @@
+ <artifactId>swingx</artifactId>
+ <packaging>jar</packaging>
+ <name>SwingX Main Project</name>
+- <version>0.9.5-SNAPSHOT</version>
++ <version>1.0</version>
+ <url>http://www.swinglabs.org/</url>
+ <licenses>
+ <license>
+Index: libswingx1-java-1.0/swingx-beaninfo/pom.xml
+===================================================================
+--- libswingx1-java-1.0.orig/swingx-beaninfo/pom.xml 2011-08-28 11:10:21.000000000 +0100
++++ libswingx1-java-1.0/swingx-beaninfo/pom.xml 2011-08-28 11:17:55.832000100 +0100
+@@ -3,39 +3,39 @@
+ <parent>
+ <artifactId>swingx-project</artifactId>
+ <groupId>org.swinglabs</groupId>
+- <version>0.9.3-SNAPSHOT</version>
++ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>swingx-beaninfo</artifactId>
+ <packaging>jar</packaging>
+ <name>SwingX Beaninfo</name>
+- <dependencies>
++ <dependencies>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>swingx-core</artifactId>
+ <version>${parent.version}</version>
+ </dependency>
+- <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>
++ <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>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.4.0</version>
+- <scope>test</scope>
++ <scope>test</scope>
+ </dependency-->
+- </dependencies>
++ </dependencies>
+ <build>
+ <sourceDirectory>../src/beaninfo</sourceDirectory>
+ <plugins>
+Index: libswingx1-java-1.0/swingx-core/pom.xml
+===================================================================
+--- libswingx1-java-1.0.orig/swingx-core/pom.xml 2011-08-28 11:10:21.000000000 +0100
++++ libswingx1-java-1.0/swingx-core/pom.xml 2011-08-28 11:18:11.892300032 +0100
+@@ -3,29 +3,29 @@
+ <parent>
+ <artifactId>swingx-project</artifactId>
+ <groupId>org.swinglabs</groupId>
+- <version>0.9.3-SNAPSHOT</version>
++ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>swingx-core</artifactId>
+ <packaging>jar</packaging>
+ <name>SwingX Core</name>
+- <dependencies>
+- <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>
+- <dependency>
+- <groupId>junit</groupId>
+- <artifactId>junit</artifactId>
++ <dependencies>
++ <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>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+@@ -36,9 +36,9 @@
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.4.0</version>
+- <scope>test</scope>
++ <scope>test</scope>
+ </dependency-->
+- </dependencies>
++ </dependencies>
+ <build>
+ <sourceDirectory>../src/java</sourceDirectory>
+ <testSourceDirectory>../src/test</testSourceDirectory>
Added: trunk/libswingx1-java/debian/patches/series
===================================================================
--- trunk/libswingx1-java/debian/patches/series (rev 0)
+++ trunk/libswingx1-java/debian/patches/series 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,2 @@
+swingworker.diff
+pom.patch
Added: trunk/libswingx1-java/debian/patches/swingworker.diff
===================================================================
--- trunk/libswingx1-java/debian/patches/swingworker.diff (rev 0)
+++ trunk/libswingx1-java/debian/patches/swingworker.diff 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,13 @@
+Use javax.swing.swingworker instead of org.jdesktop.swingworker.SwingWorker.
+
+--- 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
Added: trunk/libswingx1-java/debian/rules
===================================================================
--- trunk/libswingx1-java/debian/rules (rev 0)
+++ trunk/libswingx1-java/debian/rules 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE := swingx1
+VERSION := $(DEB_UPSTREAM_VERSION)
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+
+
+binary-post-install/lib$(PACKAGE)-java::
+ cp -f swingx-beaninfo/build/swingx-beaninfo-1.0.jar swingx-beaninfo/build/swingx1-beaninfo-1.0.jar
+ cp -f swingx-core/build/swingx-core-1.0.jar swingx-core/build/swingx1-1.0.jar
+ jh_installlibs
+ jh_installjavadoc
+
+clean::
+ jh_clean
+ rm -f ./swingx-beaninfo/pom.xml.save ./swingx-core/pom.xml.save
+
+get-orig-source:
+ uscan --upstream-version $(VERSION)
Property changes on: trunk/libswingx1-java/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libswingx1-java/debian/source/format
===================================================================
--- trunk/libswingx1-java/debian/source/format (rev 0)
+++ trunk/libswingx1-java/debian/source/format 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/libswingx1-java/debian/watch
===================================================================
--- trunk/libswingx1-java/debian/watch (rev 0)
+++ trunk/libswingx1-java/debian/watch 2011-08-28 10:34:23 UTC (rev 14515)
@@ -0,0 +1,3 @@
+version=3
+http://swinglabs.org/downloads.jsp .*/swingx-([\d.]+)-src.zip \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list