Author: drazzib
Date: 2009-11-04 21:50:41 +0000 (Wed, 04 Nov 2009)
New Revision: 11006
Added:
trunk/substance/debian/patches/build.diff
trunk/substance/debian/substance-doc.doc-base
trunk/substance/debian/substance-doc.install
Removed:
trunk/substance/debian/build.xml
trunk/substance/debian/doc-base
trunk/substance/debian/docs
Modified:
trunk/substance/debian/ant.properties
trunk/substance/debian/changelog
trunk/substance/debian/compat
trunk/substance/debian/control
trunk/substance/debian/orig-tar.sh
trunk/substance/debian/patches/Drop_EDT_Check.diff
trunk/substance/debian/patches/series
trunk/substance/debian/rules
Log:
* New upstream release.
- Minimal JDK version is now >= 6
* New "substance-doc" package:
- contains API javadoc documentation
* Bump debhelper version to >= 7
* Remove unused Depends on ${shlibs:Depends}
* Bump Standards-Version to 3.8.3 (no changes needed)
* Default JDK:
- Build-Depends on default-jdk
- Use /usr/lib/jvm/default-java as JAVA_HOME in debian/rules
- Depends on default-jre | java6-runtime
* Use upstream build system:
- Remove debian/build.xml
- Define jdk.home in debian/ant.properties
- Patch upstream build.xml to generate javadoc (build.diff)
* Update my email address
Modified: trunk/substance/debian/ant.properties
===================================================================
--- trunk/substance/debian/ant.properties 2009-11-04 20:13:18 UTC (rev
11005)
+++ trunk/substance/debian/ant.properties 2009-11-04 21:50:41 UTC (rev
11006)
@@ -1,8 +1 @@
-class.dir=build
-source.dir=src
-doc.dir=docs/api
-jar.name=substance.jar
-jar-lite.name=substance-lite.jar
-jar-lite-feel.name=substance-lite-feel.jar
-jar-tst.name=substance-tst.jar
-jar-tst-lite.name=substance-tst-lite.jar
+jdk.home=/usr/lib/jvm/default-java
Deleted: trunk/substance/debian/build.xml
===================================================================
--- trunk/substance/debian/build.xml 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/build.xml 2009-11-04 21:50:41 UTC (rev 11006)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="substance" basedir="..">
- <property file="build.properties"/>
- <patternset id="compiler.resources">
- <include name="**/?*.properties" />
- <include name="**/?*.colorscheme" />
- <include name="**/?*.colorschemes" />
- <include name="**/?*.form" />
- <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>
-
- <target name="clean" description="Clean up">
- <delete dir="${class.dir}"/>
- <delete file="${jar.name}"/>
- <delete file="${jar-lite.name}"/>
- <delete file="${jar-lite-feel.name}"/>
- <delete file="${jar-tst.name}"/>
- <delete file="${jar-tst-lite.name}"/>
- </target>
-
- <target name="compile" description="Compile the sources">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- deprecation="true" debug="true" optimize="false"/>
- <copy todir="${class.dir}">
- <fileset dir="${source.dir}">
- <patternset refid="compiler.resources" />
- </fileset>
- </copy>
- </target>
-
- <target name="javadoc" description="Creates Javadoc documentation">
- <mkdir dir="${doc.dir}"/>
- <javadoc packagenames="*"
- sourcepath="${source.dir}" destdir="${doc.dir}"/>
- </target>
-
- <target name="jar" description="Create the jar" depends="compile">
- <jar jarfile="${jar.name}">
- <fileset dir="${class.dir}/" excludes="docrobot/** test/**" />
- <fileset dir="${source.dir}/" includes="resources/**" />
- </jar>
-
- <jar jarfile="${jar-lite.name}">
- <fileset dir="${class.dir}/" excludes="docrobot/** test/**
contrib/com/blogofbug/** contrib/ch/** contrib/net/xoetrope/**
org/jvnet/substance/SubstanceColorChooserUI* org/jvnet/substance/Labels_*" />
- <fileset dir="${class.dir}/"
includes="contrib/ch/randelshofer/quaqua/Labels_*" />
- <fileset dir="${source.dir}/" includes="resources/**" />
- </jar>
-
- <jar jarfile="${jar-lite-feel.name}">
- <fileset dir="${class.dir}/" excludes="docrobot/** test/**
contrib/com/blogofbug/** contrib/ch/** contrib/net/xoetrope/**
org/jvnet/substance/SubstanceColorChooserUI* org/jvnet/substance/Labels_*" />
- <fileset dir="${class.dir}/"
includes="contrib/ch/randelshofer/quaqua/Labels_*" />
- <fileset dir="${source.dir}/" includes="resources/**" />
- </jar>
-
- <jar jarfile="${jar-tst.name}">
- <fileset dir="${class.dir}/" includes="test/** docrobot/**" />
- </jar>
-
- <jar jarfile="${jar-tst-lite.name}">
- <fileset dir="${class.dir}/" includes="test/**" />
- <fileset dir="${source.dir}/" includes="test/resource/**" />
- </jar>
- </target>
-
- <target name="install" depends="jar">
- <mkdir dir="${destdir}/usr/share/java/" />
- <copy file="${jar.name}" todir="${destdir}/usr/share/java/"/>
- </target>
-</project>
Modified: trunk/substance/debian/changelog
===================================================================
--- trunk/substance/debian/changelog 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/changelog 2009-11-04 21:50:41 UTC (rev 11006)
@@ -1,3 +1,24 @@
+substance (5.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Minimal JDK version is now >= 6
+ * New "substance-doc" package:
+ - contains API javadoc documentation
+ * Bump debhelper version to >= 7
+ * Remove unused Depends on ${shlibs:Depends}
+ * Bump Standards-Version to 3.8.3 (no changes needed)
+ * Default JDK:
+ - Build-Depends on default-jdk
+ - Use /usr/lib/jvm/default-java as JAVA_HOME in debian/rules
+ - Depends on default-jre | java6-runtime
+ * Use upstream build system:
+ - Remove debian/build.xml
+ - Define jdk.home in debian/ant.properties
+ - Patch upstream build.xml to generate javadoc (build.diff)
+ * Update my email address
+
+ -- Damien Raude-Morvan <[email protected]> Wed, 04 Nov 2009 22:35:08 +0100
+
substance (5.2-3) unstable; urgency=low
[ Damien Raude-Morvan ]
Modified: trunk/substance/debian/compat
===================================================================
--- trunk/substance/debian/compat 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/compat 2009-11-04 21:50:41 UTC (rev 11006)
@@ -1 +1 @@
-5
+7
Modified: trunk/substance/debian/control
===================================================================
--- trunk/substance/debian/control 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/control 2009-11-04 21:50:41 UTC (rev 11006)
@@ -2,18 +2,32 @@
Section: java
Priority: optional
Maintainer: Debian Java maintainers
<[email protected]>
-Uploaders: Torsten Werner <[email protected]>, Varun Hiremath
<[email protected]>, Damien Raude-Morvan <[email protected]>
-Build-Depends: ant, cdbs, debhelper (>= 5), libasm2-java, liblaf-plugin-java,
- liblaf-widget-java, openjdk-6-jdk, libswingx-java, libjgoodies-forms-java,
quilt
-Standards-Version: 3.8.2
-Homepage: https://substance.dev.java.net
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/substance
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/substance/debian/
+Uploaders: Torsten Werner <[email protected]>, Varun Hiremath
<[email protected]>,
+ Damien Raude-Morvan <[email protected]>
+Build-Depends: ant, cdbs, debhelper (>= 7), quilt, default-jdk,
+ liblaf-plugin-java, liblaf-widget-java (>= 4.3), libasm2-java,
+ libswingx-java, libjgoodies-forms-java
+Standards-Version: 3.8.3
+Homepage: https://substance.dev.java.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/substance/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/substance/
Package: substance
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre
+Depends: ${misc:Depends}, default-jre | java6-runtime
Description: cross-platform look & feel for Swing applications
The goal of this project is to provide a configurable and
customizable production-quality Java look and feel library for Swing
applications. This Java look and feel is available for JDK 5.0+ only.
+
+Package: substance-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: substance
+Description: cross-platform look & feel for Swing applications - documentation
+ The goal of this project is to provide a configurable and
+ customizable production-quality Java look and feel library for Swing
+ applications. This Java look and feel is available for JDK 5.0+ only.
+ .
+ This package contains API documentation (Javadoc) for substance.
Deleted: trunk/substance/debian/doc-base
===================================================================
--- trunk/substance/debian/doc-base 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/doc-base 2009-11-04 21:50:41 UTC (rev 11006)
@@ -1,9 +0,0 @@
-Document: substance
-Title: Programmer API for Substance Java look & feel
-Author: Kirill Grouchnikov
-Abstract: cross-platform look & feel for Swing applications
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/substance/api/index.html
-Files: /usr/share/doc/substance/api/*.html
Deleted: trunk/substance/debian/docs
===================================================================
--- trunk/substance/debian/docs 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/docs 2009-11-04 21:50:41 UTC (rev 11006)
@@ -1 +0,0 @@
-docs/*
Modified: trunk/substance/debian/orig-tar.sh
===================================================================
--- trunk/substance/debian/orig-tar.sh 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/orig-tar.sh 2009-11-04 21:50:41 UTC (rev 11006)
@@ -4,8 +4,10 @@
TAR=../substance_$1.orig.tar.gz
ZIP=substance-all.zip
DIR=substance-$1.orig
+# version 5.3 (Reykjavik)
+RELEASE_ID=135950
-wget https://substance.dev.java.net/files/documents/3294/127670/$ZIP
+wget https://substance.dev.java.net/files/documents/3294/$RELEASE_ID/$ZIP
# clean up the upstream tarball
unzip -d $DIR $ZIP
Modified: trunk/substance/debian/patches/Drop_EDT_Check.diff
===================================================================
--- trunk/substance/debian/patches/Drop_EDT_Check.diff 2009-11-04 20:13:18 UTC
(rev 11005)
+++ trunk/substance/debian/patches/Drop_EDT_Check.diff 2009-11-04 21:50:41 UTC
(rev 11006)
@@ -1,10 +1,12 @@
-Author: Varun Hiremath
-Description: Disable EDT checks to enable Jajuk work properly.
-Index: substance-5.2/src/org/jvnet/substance/utils/SubstanceCoreUtilities.java
-===================================================================
----
substance-5.2.orig/src/org/jvnet/substance/utils/SubstanceCoreUtilities.java
2009-05-25 03:01:14.000000000 -0400
-+++ substance-5.2/src/org/jvnet/substance/utils/SubstanceCoreUtilities.java
2009-05-25 03:01:38.000000000 -0400
-@@ -2364,12 +2364,12 @@
+Description: Disable EDT violation checks to enable Jajuk work properly.
+ Should be dropped when packaging Jajuk 1.9 branch.
+Bug: http://trac.jajuk.info/ticket/1422
+Last-Update: 2009-11-04
+Author: Varun Hiremath <[email protected]>
+Author: Damien Raude-Morvan <[email protected]>
+--- a/src/org/jvnet/substance/utils/SubstanceCoreUtilities.java
++++ b/src/org/jvnet/substance/utils/SubstanceCoreUtilities.java
+@@ -2363,12 +2363,12 @@
* If the component is created off Event Dispatch Thread.
*/
public static void testComponentCreationThreadingViolation(Component
comp) {
@@ -23,7 +25,7 @@
}
/**
-@@ -2382,12 +2382,12 @@
+@@ -2381,12 +2381,12 @@
* If the component is changing state off Event Dispatch
Thread.
*/
public static void testComponentStateChangeThreadingViolation(Component
comp) {
@@ -42,3 +44,20 @@
}
public static void traceSubstanceApiUsage(Component comp, String
message) {
+--- a/src/org/jvnet/substance/SubstanceLookAndFeel.java
++++ b/src/org/jvnet/substance/SubstanceLookAndFeel.java
+@@ -1950,10 +1950,10 @@
+ @SubstanceApi
+ private static boolean setSkin(SubstanceSkin newSkin,
+ boolean toUpdateWindows) {
+- if (!SwingUtilities.isEventDispatchThread()) {
+- throw new IllegalStateException(
+- "This method must be called on the
Event Dispatch Thread");
+- }
++ //if (!SwingUtilities.isEventDispatchThread()) {
++ // throw new IllegalStateException(
++ // "This method must be called on the
Event Dispatch Thread");
++ //}
+
+ if (!newSkin.isValid())
+ return false;
Added: trunk/substance/debian/patches/build.diff
===================================================================
--- trunk/substance/debian/patches/build.diff (rev 0)
+++ trunk/substance/debian/patches/build.diff 2009-11-04 21:50:41 UTC (rev
11006)
@@ -0,0 +1,118 @@
+Decription: - Add a new "javadoc" target in build.xml using
+ substance.src.dir as source dir.
+ - Delete substance.drop.dir in "clean" target
+ - Don't try to copy built JAR in www/webstart/
+ - Don't build substance-tools JAR (Swing Fest is not yet in
+ Debian)
+ - Don't explode laf-widget and laf-plugin JAR inside substance
+ own JAR but add those in Manifest's Class-Path
+Last-Update: 2009-11-04
+Author: Damien Raude-Morvan <[email protected]>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -96,7 +96,7 @@
+ </dirset>
+ </path>
+
+- <target name="compile.module.substance"
depends="compile.module.substance.production,compile.module.substance.tests,compile.module.substance.tools"
description="compile module substance" />
++ <target name="compile.module.substance"
depends="compile.module.substance.production,compile.module.substance.tests"
description="compile module substance" />
+
+ <target name="compile.module.substance.production" description="compile
module substance production classes">
+ <mkdir dir="${substance.output.dir}" />
+@@ -154,6 +154,7 @@
+
+ <target name="clean.module.substance" description="cleanup module">
+ <delete dir="${substance.output.dir}" />
++ <delete dir="${substance.drop.dir}" />
+ </target>
+
+ <target name="init" description="Build initialization">
+@@ -172,8 +173,8 @@
+ <delete file="${substance.drop.dir}/substance.jar" />
+
+ <!-- Explode laf-plugin and laf-widget -->
+- <unjar src="${substance.lib.dir}/laf-plugin-50.jar"
dest="${substance.output.dir}/" />
+- <unjar src="${substance.lib.dir}/laf-widget.jar"
dest="${substance.output.dir}/" />
++ <!-- <unjar src="${substance.lib.dir}/laf-plugin-50.jar"
dest="${substance.output.dir}/" /> -->
++ <!-- <unjar src="${substance.lib.dir}/laf-widget.jar"
dest="${substance.output.dir}/" /> -->
+
+ <!-- LAF augmentation -->
+ <laf-augment verbose="true"
mainlafclassname="org.jvnet.substance.SubstanceLookAndFeel">
+@@ -211,16 +212,17 @@
+ <attribute name="Substance-Distribution"
value="Full" />
+ <attribute name="Substance-Version"
value="${substance.versionKey}" />
+ <attribute name="Substance-BuildStamp"
value="${build.time}" />
++ <attribute name="Class-Path"
value="laf-widget.jar laf-plugin.jar" />
+ </manifest>
+ </jar>
+- <copy file="${substance.drop.dir}/substance.jar"
todir="${module.substance.basedir}/www/webstart" />
++ <!-- <copy file="${substance.drop.dir}/substance.jar"
todir="${module.substance.basedir}/www/webstart" /> -->
+ </target>
+
+ <target name="jar-bin-lite" description="create runtime jar with no
custom color choosers">
+ <mkdir dir="${substance.drop.dir}" />
+ <delete file="${substance.drop.dir}/substance-lite.jar" />
+- <unjar src="${substance.lib.dir}/laf-plugin-50.jar"
dest="${substance.output.dir}/" />
+- <unjar src="${substance.lib.dir}/laf-widget.jar"
dest="${substance.output.dir}/" />
++ <!-- <unjar src="${substance.lib.dir}/laf-plugin-50.jar"
dest="${substance.output.dir}/" /> -->
++ <!-- <unjar src="${substance.lib.dir}/laf-widget.jar"
dest="${substance.output.dir}/" /> -->
+
+ <jar compress="true"
destfile="${substance.drop.dir}/substance-lite.jar">
+ <fileset dir="${substance.output.dir}/"
excludes="tools/** test/** contrib/com/blogofbug/** contrib/ch/**
contrib/net/xoetrope/** org/jvnet/substance/SubstanceColorChooserUI*
org/jvnet/lafwidget/** org/jvnet/substance/Labels_*" />
+@@ -230,6 +232,7 @@
+ <attribute name="Substance-Distribution"
value="Lite" />
+ <attribute name="Substance-Version"
value="${substance.versionKey}" />
+ <attribute name="Substance-BuildStamp"
value="${build.time}" />
++ <attribute name="Class-Path"
value="laf-widget.jar laf-plugin.jar" />
+ </manifest>
+ </jar>
+ <copy file="${substance.drop.dir}/substance-lite.jar"
todir="${module.substance.basedir}/www/webstart" />
+@@ -257,7 +260,7 @@
+ <attribute name="Substance-Version"
value="${substance.versionKey}" />
+ <attribute name="Substance-BuildStamp"
value="${build.time}" />
+ <attribute name="Main-Class" value="test.Check"
/>
+- <attribute name="Class-Path"
value="substance.jar ../lib/forms-1.2.0.jar ../lib/swingx.jar
../lib/substance-swingx.jar" />
++ <attribute name="Class-Path"
value="substance.jar forms.jar swingx.jar" />
+ </manifest>
+ </jar>
+ <copy file="${substance.drop.dir}/substance-tst.jar"
todir="${module.substance.basedir}/www/webstart" />
+@@ -289,7 +292,7 @@
+ <attribute name="Substance-Version"
value="${substance.versionKey}" />
+ <attribute name="Substance-BuildStamp"
value="${build.time}" />
+ <attribute name="Main-Class" value="test.Check"
/>
+- <attribute name="Class-Path"
value="substance-lite.jar ../lib/forms-1.2.0.jar ../lib/swingx.jar
../lib/substance-swingx.jar" />
++ <attribute name="Class-Path"
value="substance-lite.jar forms.jar swingx.jar" />
+ </manifest>
+ </jar>
+ </target>
+@@ -305,7 +308,7 @@
+ <echo message="JavaC home: ${jdk.home}" />
+ </target>
+
+- <target name="jar" depends="jar-bin-lite, jar-bin, jar-bin-lite-feel,
jar-bin-tst, jar-bin-tst-lite, jar-bin-tools" description="create all jars" />
++ <target name="jar" depends="jar-bin-lite, jar-bin, jar-bin-lite-feel,
jar-bin-tst, jar-bin-tst-lite" description="create all jars" />
+
+ <target name="distro" description="create distribution">
+ <delete file="${module.substance.basedir}/substance-all.zip" />
+@@ -347,4 +350,18 @@
+ </target>
+
+ <target name="all" depends="timestamp, init, clean,
compile.module.substance, jar" description="build all" />
+-</project>
+\ No newline at end of file
++
++
++ <target name="javadoc" description="Creates Javadoc documentation">
++ <mkdir dir="${substance.drop.dir}/api"/>
++ <javadoc packagenames="*"
++ destdir="${substance.drop.dir}/api">
++ <fileset dir="${substance.src.dir}" defaultexcludes="yes">
++ <include name="org/jvnet/**/*.java" />
++ <include name="contrib/**/*.java" />
++ </fileset>
++ </javadoc>
++ </target>
++
++
++</project>
Modified: trunk/substance/debian/patches/series
===================================================================
--- trunk/substance/debian/patches/series 2009-11-04 20:13:18 UTC (rev
11005)
+++ trunk/substance/debian/patches/series 2009-11-04 21:50:41 UTC (rev
11006)
@@ -1 +1,2 @@
Drop_EDT_Check.diff
+build.diff
Modified: trunk/substance/debian/rules
===================================================================
--- trunk/substance/debian/rules 2009-11-04 20:13:18 UTC (rev 11005)
+++ trunk/substance/debian/rules 2009-11-04 21:50:41 UTC (rev 11006)
@@ -4,21 +4,24 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar javadoc
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := all javadoc
DEB_JARS := asm2 asm2-xml asm2-util asm2-tree asm2-commons
asm2-analysis asm2-attrs \
- laf-widget laf-plugin swingx forms
+ laf-widget laf-plugin swingx forms
+ALL_JARS := $(wildcard drop/*.jar)
+
clean::
$(RM) -r drop www/webstart
install/substance::
- for i in substance.jar substance-lite.jar substance-tst-lite.jar \
- substance-lite-feel.jar substance-tst.jar; \
+ for i in $(ALL_JARS); \
do \
- install -m 644 -D $$i $(DEB_DESTDIR)/usr/share/java/`basename
$$i .jar`-$(DEB_UPSTREAM_VERSION).jar; \
- dh_link /usr/share/java/`basename $$i
.jar`-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$$i; \
+ FILENAME=`basename $$i .jar`-$(DEB_UPSTREAM_VERSION).jar; \
+ LINKBASE=`basename $$i .jar`; \
+ mv $$i $$FILENAME; \
+ dh_install $$FILENAME /usr/share/java/; \
+ dh_link /usr/share/java/$$FILENAME
/usr/share/java/$$LINKBASE.jar; \
done
get-orig-source:
Copied: trunk/substance/debian/substance-doc.doc-base (from rev 10973,
trunk/substance/debian/doc-base)
===================================================================
--- trunk/substance/debian/substance-doc.doc-base
(rev 0)
+++ trunk/substance/debian/substance-doc.doc-base 2009-11-04 21:50:41 UTC
(rev 11006)
@@ -0,0 +1,9 @@
+Document: substance
+Title: Programmer API for Substance Java look & feel
+Author: Kirill Grouchnikov
+Abstract: cross-platform look & feel for Swing applications
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/substance/api/index.html
+Files: /usr/share/doc/substance/api/*.html
Copied: trunk/substance/debian/substance-doc.install (from rev 10973,
trunk/substance/debian/docs)
===================================================================
--- trunk/substance/debian/substance-doc.install
(rev 0)
+++ trunk/substance/debian/substance-doc.install 2009-11-04 21:50:41 UTC
(rev 11006)
@@ -0,0 +1 @@
+drop/api /usr/share/doc/substance/
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
