Commit 6a1961fd3a9e48421f3aded28b21115263fd1ff0 - libswingx-java

* 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 Damien Raude-Morvan 14 years ago

15 changed file(s) with 188 addition(s) and 60 deletion(s). Raw diff Collapse all Expand all

+12

-2

debian/README.source less more

0		libswingx-java
1		==============
	0	Patch system
	1	============
	2
	3	This package uses quilt to manage all modifications to the upstream
	4	source. Changes are stored in the source package as diffs in
	5	debian/patches and applied during the build.
	6
	7	See /usr/share/doc/quilt/README.source for a detailed explanation.
	8
	9
	10	Orig tarball repack
	11	===================
2	12
3	13	The upstream supplied source package contains binary jar files.
4	14	Currently no clean source distribution exists. Therefore, the upstream

-4

~~debian/ant.properties~~ less more

0		installdir=/usr/share/java
1		ant.build.javac.source=1.5
2		ant.build.javac.target=1.5
3

-0

debian/build.properties less more

	0	javadoc.dir=build/api
	1	maven.test.skip=true
	2	build.javaVersion=1.5
	3	classpath.compile = \
	4	/usr/share/java/batik-all.jar:\
	5	${basedir}/swingx-core/build/swingx-core-${version}.jar

+38

-36

debian/build.xml less more

0	0	<project name="swingx" basedir=".." default="build">
1	1
2		<property name="jarfile" value="${ant.project.name}.jar"/>
	2	<property file="debian/build.properties"/>
	3	<property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
	4	<property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
3	5
4		<patternset id="compiler.resources">
5		<include name="*/?.properties" />
6		<include name="*/?.xml" />
7		<include name="*/?.gif" />
8		<include name="*/?.png" />
9		<include name="*/?.jpeg" />
10		<include name="*/?.jpg" />
11		<include name="*/?.html" />
12		<include name="*/?.dtd" />
13		<include name="*/?.tld" />
14		<include name="*/?.ttf" />
15		</patternset>
	6	<macrodef name="cleanmodule">
	7	<attribute name="dir"/>
	8	<sequential>
	9	<ant target="clean" antfile="${maven.build}" dir="@{dir}">
	10	<property name="debian.dir" location="debian" />
	11	<property name="project.dir" value="@{dir}" />
	12	</ant>
	13	</sequential>
	14	</macrodef>
16	15
17		<target name="build"
18		description="build the jar file">
19		<mkdir dir="build"/>
20		<javac destdir="build">
21		<src path="src/beaninfo"/>
22		<src path="src/java"/>
23		</javac>
24		<copy todir="build">
25		<fileset dir="src/beaninfo">
26		<patternset refid="compiler.resources" />
27		</fileset>
28		<fileset dir="src/java">
29		<patternset refid="compiler.resources" />
30		</fileset>
31		</copy>
32		<jar destfile="${jarfile}" basedir="build" index="yes"/>
	16	<macrodef name="packagemodule">
	17	<attribute name="dir"/>
	18	<attribute name="src"/>
	19	<sequential>
	20	<ant target="package" antfile="${maven.build}" dir="@{dir}">
	21	<property name="debian.dir" location="debian" />
	22	<property name="project.dir" value="@{dir}" />
	23	<property name="build.sourceDirectory" value="@{src}"/>
	24	</ant>
	25	</sequential>
	26	</macrodef>
	27
	28
	29	<target name="clean">
	30	<delete dir="build"/>
	31	<cleanmodule dir="swingx-core"/>
	32	<cleanmodule dir="swingx-beaninfo"/>
33	33	</target>
34	34
35		<target name="install" depends="build"
36		description="installs the jar file">
37		<copy file="${jarfile}" todir="${destdir}${installdir}"/>
	35	<target name="package">
	36	<packagemodule dir="swingx-core" src="../src/java/"/>
	37	<packagemodule dir="swingx-beaninfo" src="../src/beaninfo/"/>
38	38	</target>
39	39
40		<target name="clean"
41		description="clean up the build dir">
42		<delete dir="build"/>
43		<delete file="${jarfile}"/>
	40	<target name="javadoc">
	41	<javadoc destdir="${javadoc.dir}">
	42	<packageset dir="src/java/"/>
	43	<packageset dir="src/beaninfo/"/>
	44	</javadoc>
44	45	</target>
45	46
	47
46	48	</project>

+15

-3

debian/changelog less more

0		libswingx-java (1:1.0-1) UNRELEASED; urgency=low
	0	libswingx-java (1:1.0-1) unstable; urgency=low
1	1
2	2	* New upstream release.
	3	* New "libswingx-java-doc" package:
	4	- contains API javadoc documentation
3	5	* Bump Standards-Version to 3.8.3
4	6	- Change section to "java"
5	7	- Rename debian/README.Debian-source to debian/README.source
	8	- Describe quilt patch system in debian/README.source
6	9	* Bump debhelper version to >= 7
7	10	* Remove unused Depends on ${shlibs:Depends}
8	11	* Default JRE:
9	12	- Build-Depends on default-jdk
10	13	- Use /usr/lib/jvm/default-java as JAVA_HOME
11	14	* Add myself to Uploaders
12		* Use DEP5 format for debian/copyright
	15	* Use DEP5 format for debian/copyright
	16	* Maven POMs:
	17	- Add a Build-Depends-Indep dependency on maven-repo-helper
	18	- Use mh_installpoms and mh_installjar to install the POM and the jar to the
	19	Maven repository
	20	- Remove unneeded dependencies in pom.diff patch
	21	* Maven ant helper (build system):
	22	- Add a Build-Depends dependency on maven-ant-helper
	23	- Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
	24	- Build classpath is now defined in debian/build.properties
13	25
14		-- Damien Raude-Morvan <drazzib@debian.org> Sun, 01 Nov 2009 00:40:37 +0100
	26	-- Damien Raude-Morvan <drazzib@debian.org> Mon, 02 Nov 2009 00:17:00 +0100
15	27
16	28	libswingx-java (1:0.9.5-1) unstable; urgency=low
17	29

+27

-3

debian/control less more

3	3	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
4	4	Uploaders: Varun Hiremath <varun@debian.org>, Torsten Werner <twerner@debian.org>,
5	5	Damien Raude-Morvan <drazzib@debian.org>
6		Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant
7		Build-Depends-Indep: libbatik-java
	6	Build-Depends: cdbs, debhelper (>= 7), quilt, default-jdk, ant, maven-ant-helper
	7	Build-Depends-Indep: libbatik-java, maven-repo-helper
8	8	Standards-Version: 3.8.3
9	9	Homepage: https://swingx.dev.java.net/
10	10	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libswingx-java/

13	13	Package: libswingx-java
14	14	Architecture: all
15	15	Depends: ${misc:Depends}, default-jre \| java5-runtime
16		Suggests: java-virtual-machine
17	16	Description: extensions to the Swing GUI toolkit
18	17	This package contains extensions to the Swing GUI toolkit, including new and
19	18	enhanced components that provide functionality commonly required by rich

30	29	Many of these features will eventually be incorporated into the Swing toolkit,
31	30	although API compatibility will not be guaranteed. The SwingX project focuses
32	31	exclusively on the raw components themselves.
	32
	33	Package: libswingx-java-doc
	34	Architecture: all
	35	Section: doc
	36	Depends: ${misc:Depends}
	37	Suggests: libswingx-java
	38	Description: extensions to the Swing GUI toolkit - documentation
	39	This package contains extensions to the Swing GUI toolkit, including new and
	40	enhanced components that provide functionality commonly required by rich
	41	client applications. Highlights include:
	42	- Sorting, filtering, highlighting for tables, trees, and lists
	43	- Find/search
	44	- Auto-completion
	45	- Login/authentication framework
	46	- TreeTable component
	47	- Collapsible panel component
	48	- Date picker component
	49	- Tip-of-the-Day component
	50	.
	51	Many of these features will eventually be incorporated into the Swing toolkit,
	52	although API compatibility will not be guaranteed. The SwingX project focuses
	53	exclusively on the raw components themselves.
	54	.
	55	This package contains API documentation (Javadoc) of SwingX GUI Toolkit.
	56

-2

~~debian/docs~~ less more

0		docs/*
1

-0

debian/libswingx-java-doc.doc-base less more

	0	Document: libswingx-java-doc
	1	Title: API Javadoc for SwingX
	2	Author: SwingX developers
	3	Abstract: This is the API Javadoc provided by the SwingX library.
	4	Section: Programming
	5
	6	Format: HTML
	7	Index: /usr/share/doc/libswingx-java/api/index.html
	8	Files: /usr/share/doc/libswingx-java/api/*

-0

debian/libswingx-java-doc.install less more

build/api /usr/share/doc/libswingx-java/

-0

debian/libswingx-java.poms less more

	0	pom.xml --no-parent
	1	swingx-core/pom.xml --no-parent
	2	swingx-beaninfo/pom.xml --no-parent

-0

debian/maven.rules less more

	0	commons-collections commons-collections jar s/3\..*/3.x/
	1	junit junit jar s/3\..*/3.x/
	2	jmock jmock jar s/.*/1.x/
	3

+55

-0

debian/patches/pom.diff less more

	0	--- a/swingx-beaninfo/pom.xml
	1	+++ b/swingx-beaninfo/pom.xml
	2	@@ -20,14 +20,6 @@
	3	<groupId>com.jhlabs</groupId>
	4	<artifactId>filters</artifactId>
	5	</dependency>
	6	- <dependency>
	7	- <groupId>org.swinglabs</groupId>
	8	- <artifactId>swing-worker</artifactId>
	9	- </dependency>
	10	- <dependency>
	11	- <groupId>org.swinglabs</groupId>
	12	- <artifactId>multiplegradientpaint</artifactId>
	13	- </dependency>
	14	<!-- Preferably we should use this jmock configuration with junit 4 -->
	15	<!--dependency>
	16	<groupId>org.jmock</groupId>
	17	--- a/swingx-core/pom.xml
	18	+++ b/swingx-core/pom.xml
	19	@@ -16,14 +16,6 @@
	20	<artifactId>filters</artifactId>
	21	</dependency>
	22	<dependency>
	23	- <groupId>org.swinglabs</groupId>
	24	- <artifactId>swing-worker</artifactId>
	25	- </dependency>
	26	- <dependency>
	27	- <groupId>org.swinglabs</groupId>
	28	- <artifactId>multiplegradientpaint</artifactId>
	29	- </dependency>
	30	- <dependency>
	31	<groupId>junit</groupId>
	32	<artifactId>junit</artifactId>
	33	</dependency>
	34	--- a/pom.xml
	35	+++ b/pom.xml
	36	@@ -113,18 +113,6 @@
	37	<scope>compile</scope>
	38	</dependency>
	39	<dependency>
	40	- <groupId>org.swinglabs</groupId>
	41	- <artifactId>swing-worker</artifactId>
	42	- <version>1.1</version>
	43	- <!--scope>compile</scope-->
	44	- </dependency>
	45	- <dependency>
	46	- <groupId>org.swinglabs</groupId>
	47	- <artifactId>multiplegradientpaint</artifactId>
	48	- <version>1.0</version>
	49	- <scope>compile</scope>
	50	- </dependency>
	51	- <dependency>
	52	<groupId>junit</groupId>
	53	<artifactId>junit</artifactId>
	54	<version>4.5</version>

-0

debian/patches/series less more

0	0	swingworker.diff
	1	pom.diff

-3

debian/patches/swingworker.diff less more

0		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
1		--- swingx-2007_07_22-src.orig/src/java/org/jdesktop/swingx/auth/LoginService.java 2007-08-04 00:35:55.000000000 +0530
2		+++ swingx-2007_07_22-src/src/java/org/jdesktop/swingx/auth/LoginService.java 2007-08-04 00:37:57.000000000 +0530
	0	--- a/src/java/org/jdesktop/swingx/auth/LoginService.java
	1	+++ b/src/java/org/jdesktop/swingx/auth/LoginService.java
3	2	@@ -27,7 +27,7 @@
4	3	import javax.swing.event.EventListenerList;
5	4

+15

-7

debian/rules less more

3	3	include /usr/share/cdbs/1/class/ant.mk
4	4	include /usr/share/cdbs/1/rules/patchsys-quilt.mk
5	5
6		JAVA_HOME := /usr/lib/jvm/default-java
7		DEB_ANT_BUILDFILE := debian/build.xml
	6	PACKAGE := swingx
	7	VERSION := $(DEB_UPSTREAM_VERSION)
8	8
9		# it was batik.jar up to version 1.6 and is is now batik-all.jar
10		DEB_JARS := batik batik-all
	9	JAVA_HOME := /usr/lib/jvm/default-java
	10	DEB_JARS := ant-nodeps
	11	DEB_ANT_BUILD_TARGET := package javadoc
	12	DEB_ANT_BUILDFILE := debian/build.xml
	13	DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
11	14
12		install/libswingx-java::
13		install -m 644 -D swingx.jar $(DEB_DESTDIR)/usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar
14		dh_link /usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/swingx.jar
	15
	16	binary-post-install/lib$(PACKAGE)-java::
	17	mh_installpoms -plib$(PACKAGE)-java
	18	mh_installjar -plib$(PACKAGE)-java -l -nswingx swingx-core/pom.xml swingx-core/build/swingx-core-$(VERSION).jar
	19	mh_installjar -plib$(PACKAGE)-java -l swingx-beaninfo/pom.xml swingx-beaninfo/build/swingx-beaninfo-$(VERSION).jar
	20
	21	clean::
	22	-rm -rf debian/tmp
15	23
16	24	get-orig-source:
17	25	uscan --upstream-version 0