[pkg-java] r10967 - in trunk/libswingx-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Nov 1 23:17:24 UTC 2009
Author: drazzib
Date: 2009-11-01 23:17:24 +0000 (Sun, 01 Nov 2009)
New Revision: 10967
Added:
trunk/libswingx-java/debian/build.properties
trunk/libswingx-java/debian/libswingx-java-doc.doc-base
trunk/libswingx-java/debian/libswingx-java-doc.install
trunk/libswingx-java/debian/libswingx-java.poms
trunk/libswingx-java/debian/maven.rules
trunk/libswingx-java/debian/patches/pom.diff
Removed:
trunk/libswingx-java/debian/ant.properties
trunk/libswingx-java/debian/docs
Modified:
trunk/libswingx-java/debian/README.source
trunk/libswingx-java/debian/build.xml
trunk/libswingx-java/debian/changelog
trunk/libswingx-java/debian/control
trunk/libswingx-java/debian/patches/series
trunk/libswingx-java/debian/patches/swingworker.diff
trunk/libswingx-java/debian/rules
Log:
* New "libswingx-java-doc" package:
- contains API javadoc documentation
- Describe quilt patch system in debian/README.source
* 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
Modified: trunk/libswingx-java/debian/README.source
===================================================================
--- trunk/libswingx-java/debian/README.source 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/README.source 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,6 +1,16 @@
-libswingx-java
-==============
+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
Deleted: trunk/libswingx-java/debian/ant.properties
===================================================================
--- trunk/libswingx-java/debian/ant.properties 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/ant.properties 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,4 +0,0 @@
-installdir=/usr/share/java
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
-
Added: trunk/libswingx-java/debian/build.properties
===================================================================
--- trunk/libswingx-java/debian/build.properties (rev 0)
+++ trunk/libswingx-java/debian/build.properties 2009-11-01 23:17:24 UTC (rev 10967)
@@ -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
Modified: trunk/libswingx-java/debian/build.xml
===================================================================
--- trunk/libswingx-java/debian/build.xml 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/build.xml 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,47 +1,49 @@
<project name="swingx" basedir=".." default="build">
- <property name="jarfile" value="${ant.project.name}.jar"/>
+ <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"/>
- <patternset id="compiler.resources">
- <include name="**/?*.properties" />
- <include name="**/?*.xml" />
- <include name="**/?*.gif" />
- <include name="**/?*.png" />
- <include name="**/?*.jpeg" />
- <include name="**/?*.jpg" />
- <include name="**/?*.html" />
- <include name="**/?*.dtd" />
- <include name="**/?*.tld" />
- <include name="**/?*.ttf" />
- </patternset>
+ <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>
- <target name="build"
- description="build the jar file">
- <mkdir dir="build"/>
- <javac destdir="build">
- <src path="src/beaninfo"/>
- <src path="src/java"/>
- </javac>
- <copy todir="build">
- <fileset dir="src/beaninfo">
- <patternset refid="compiler.resources" />
- </fileset>
- <fileset dir="src/java">
- <patternset refid="compiler.resources" />
- </fileset>
- </copy>
- <jar destfile="${jarfile}" basedir="build" index="yes"/>
+ <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="install" depends="build"
- description="installs the jar file">
- <copy file="${jarfile}" todir="${destdir}${installdir}"/>
+ <target name="package">
+ <packagemodule dir="swingx-core" src="../src/java/"/>
+ <packagemodule dir="swingx-beaninfo" src="../src/beaninfo/"/>
</target>
- <target name="clean"
- description="clean up the build dir">
- <delete dir="build"/>
- <delete file="${jarfile}"/>
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="src/java/"/>
+ <packageset dir="src/beaninfo/"/>
+ </javadoc>
</target>
+
</project>
Modified: trunk/libswingx-java/debian/changelog
===================================================================
--- trunk/libswingx-java/debian/changelog 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/changelog 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,18 +1,30 @@
-libswingx-java (1:1.0-1) UNRELEASED; urgency=low
+libswingx-java (1:1.0-1) 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
+ * 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> Sun, 01 Nov 2009 00:40:37 +0100
+ -- 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
Modified: trunk/libswingx-java/debian/control
===================================================================
--- trunk/libswingx-java/debian/control 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/control 2009-11-01 23:17:24 UTC (rev 10967)
@@ -4,8 +4,8 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant
-Build-Depends-Indep: libbatik-java
+Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant, maven-ant-helper
+Build-Depends-Indep: libbatik-java, maven-repo-helper
Standards-Version: 3.8.3
Homepage: https://swingx.dev.java.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx-java/
@@ -14,7 +14,6 @@
Package: libswingx-java
Architecture: all
Depends: ${misc:Depends}, default-jre | java5-runtime
-Suggests: java-virtual-machine
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
@@ -31,3 +30,28 @@
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: libswingx-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libswingx-java
+Description: extensions to the Swing GUI toolkit - 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.
+
Deleted: trunk/libswingx-java/debian/docs
===================================================================
--- trunk/libswingx-java/debian/docs 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/docs 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,2 +0,0 @@
-docs/*
-
Added: trunk/libswingx-java/debian/libswingx-java-doc.doc-base
===================================================================
--- trunk/libswingx-java/debian/libswingx-java-doc.doc-base (rev 0)
+++ trunk/libswingx-java/debian/libswingx-java-doc.doc-base 2009-11-01 23:17:24 UTC (rev 10967)
@@ -0,0 +1,9 @@
+Document: libswingx-java-doc
+Title: API Javadoc for SwingX
+Author: SwingX developers
+Abstract: This is the API Javadoc provided by the SwingX library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libswingx-java/api/index.html
+Files: /usr/share/doc/libswingx-java/api/*
Added: trunk/libswingx-java/debian/libswingx-java-doc.install
===================================================================
--- trunk/libswingx-java/debian/libswingx-java-doc.install (rev 0)
+++ trunk/libswingx-java/debian/libswingx-java-doc.install 2009-11-01 23:17:24 UTC (rev 10967)
@@ -0,0 +1 @@
+build/api /usr/share/doc/libswingx-java/
Added: trunk/libswingx-java/debian/libswingx-java.poms
===================================================================
--- trunk/libswingx-java/debian/libswingx-java.poms (rev 0)
+++ trunk/libswingx-java/debian/libswingx-java.poms 2009-11-01 23:17:24 UTC (rev 10967)
@@ -0,0 +1,3 @@
+pom.xml --no-parent
+swingx-core/pom.xml --no-parent
+swingx-beaninfo/pom.xml --no-parent
Added: trunk/libswingx-java/debian/maven.rules
===================================================================
--- trunk/libswingx-java/debian/maven.rules (rev 0)
+++ trunk/libswingx-java/debian/maven.rules 2009-11-01 23:17:24 UTC (rev 10967)
@@ -0,0 +1,4 @@
+commons-collections commons-collections jar s/3\..*/3.x/
+junit junit jar s/3\..*/3.x/
+jmock jmock jar s/.*/1.x/
+
Added: trunk/libswingx-java/debian/patches/pom.diff
===================================================================
--- trunk/libswingx-java/debian/patches/pom.diff (rev 0)
+++ trunk/libswingx-java/debian/patches/pom.diff 2009-11-01 23:17:24 UTC (rev 10967)
@@ -0,0 +1,55 @@
+--- 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>
+ <!-- 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>
+ </dependency>
+--- a/pom.xml
++++ b/pom.xml
+@@ -113,18 +113,6 @@
+ <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>
+- <artifactId>multiplegradientpaint</artifactId>
+- <version>1.0</version>
+- <scope>compile</scope>
+- </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-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/patches/series 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1 +1,2 @@
swingworker.diff
+pom.diff
Modified: trunk/libswingx-java/debian/patches/swingworker.diff
===================================================================
--- trunk/libswingx-java/debian/patches/swingworker.diff 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/patches/swingworker.diff 2009-11-01 23:17:24 UTC (rev 10967)
@@ -1,6 +1,5 @@
-diff -urN swingx-2007_07_22-src.orig/src/java/org/jdesktop/swingx/auth/LoginService.java swingx-2007_07_22-src/src/java/org/jdesktop/swingx/auth/LoginService.java
---- swingx-2007_07_22-src.orig/src/java/org/jdesktop/swingx/auth/LoginService.java 2007-08-04 00:35:55.000000000 +0530
-+++ swingx-2007_07_22-src/src/java/org/jdesktop/swingx/auth/LoginService.java 2007-08-04 00:37:57.000000000 +0530
+--- 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;
Modified: trunk/libswingx-java/debian/rules
===================================================================
--- trunk/libswingx-java/debian/rules 2009-11-01 22:55:52 UTC (rev 10966)
+++ trunk/libswingx-java/debian/rules 2009-11-01 23:17:24 UTC (rev 10967)
@@ -4,15 +4,23 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
+PACKAGE := swingx
+VERSION := $(DEB_UPSTREAM_VERSION)
-# it was batik.jar up to version 1.6 and is is now batik-all.jar
-DEB_JARS := batik batik-all
+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)
-install/libswingx-java::
- install -m 644 -D swingx.jar $(DEB_DESTDIR)/usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/swingx.jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l -nswingx swingx-core/pom.xml swingx-core/build/swingx-core-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l swingx-beaninfo/pom.xml swingx-beaninfo/build/swingx-beaninfo-$(VERSION).jar
+
+clean::
+ -rm -rf debian/tmp
+
get-orig-source:
uscan --upstream-version 0
More information about the pkg-java-commits
mailing list