[pkg-java] r11007 - in trunk/liblaf-widget-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Nov 4 21:50:48 UTC 2009
Author: drazzib
Date: 2009-11-04 21:50:48 +0000 (Wed, 04 Nov 2009)
New Revision: 11007
Added:
trunk/liblaf-widget-java/debian/README.source
trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.doc-base
trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.install
trunk/liblaf-widget-java/debian/patches/build.diff
trunk/liblaf-widget-java/debian/watch
Removed:
trunk/liblaf-widget-java/debian/README.Debian-source
trunk/liblaf-widget-java/debian/build.xml
trunk/liblaf-widget-java/debian/doc-base
trunk/liblaf-widget-java/debian/docs
Modified:
trunk/liblaf-widget-java/debian/ant.properties
trunk/liblaf-widget-java/debian/changelog
trunk/liblaf-widget-java/debian/compat
trunk/liblaf-widget-java/debian/control
trunk/liblaf-widget-java/debian/orig-tar.sh
trunk/liblaf-widget-java/debian/patches/Drop_EDT_checks.diff
trunk/liblaf-widget-java/debian/patches/series
trunk/liblaf-widget-java/debian/rules
Log:
* New upstream release.
- Minimal JDK version is now >= 6
* New "liblaf-widget-java-doc" package:
- contains API javadoc documentation
* Bump debhelper version to >= 7
* Remove unused Depends on ${shlibs:Depends}
* Add myself to Uploaders
* Bump Standards-Version to 3.8.3
- Rename debian/README.Debian-source to debian/README.source
- Describe quilt patch system in debian/README.source
* 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)
* Add debian/watch to indicate that upstream uses a distribution mechanism
that cannot be meaningfully monitored by uscan
Deleted: trunk/liblaf-widget-java/debian/README.Debian-source
===================================================================
--- trunk/liblaf-widget-java/debian/README.Debian-source 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/README.Debian-source 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,13 +0,0 @@
-liblaf-widget-java
-==================
-
-The upstream supplied source package contains binary jar files and
-pre-built documentation. 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
Copied: trunk/liblaf-widget-java/debian/README.source (from rev 10973, trunk/liblaf-widget-java/debian/README.Debian-source)
===================================================================
--- trunk/liblaf-widget-java/debian/README.source (rev 0)
+++ trunk/liblaf-widget-java/debian/README.source 2009-11-04 21:50:48 UTC (rev 11007)
@@ -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 and
+pre-built documentation. 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
Modified: trunk/liblaf-widget-java/debian/ant.properties
===================================================================
--- trunk/liblaf-widget-java/debian/ant.properties 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/ant.properties 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,4 +1 @@
-class.dir=build
-source.dir=src
-doc.dir=docs/api
-jar.name=laf-widget.jar
+jdk.home=/usr/lib/jvm/default-java
Deleted: trunk/liblaf-widget-java/debian/build.xml
===================================================================
--- trunk/liblaf-widget-java/debian/build.xml 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/build.xml 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="laf-widget" basedir="..">
- <property file="build.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>
-
- <target name="clean" description="Clean up">
- <delete dir="${class.dir}"/>
- <delete file="${jar.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}" basedir="${class.dir}"/>
- </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/liblaf-widget-java/debian/changelog
===================================================================
--- trunk/liblaf-widget-java/debian/changelog 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/changelog 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,3 +1,28 @@
+liblaf-widget-java (4.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Minimal JDK version is now >= 6
+ * New "liblaf-widget-java-doc" package:
+ - contains API javadoc documentation
+ * Bump debhelper version to >= 7
+ * Remove unused Depends on ${shlibs:Depends}
+ * Add myself to Uploaders
+ * Bump Standards-Version to 3.8.3
+ - Rename debian/README.Debian-source to debian/README.source
+ - Describe quilt patch system in debian/README.source
+ * 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)
+ * Add debian/watch to indicate that upstream uses a distribution mechanism
+ that cannot be meaningfully monitored by uscan
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 04 Nov 2009 22:23:02 +0100
+
liblaf-widget-java (4.2-2) unstable; urgency=low
* Add patches/Drop_EDT_checks.diff patch to disable EDT violations to
Modified: trunk/liblaf-widget-java/debian/compat
===================================================================
--- trunk/liblaf-widget-java/debian/compat 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/compat 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1 +1 @@
-5
+7
Modified: trunk/liblaf-widget-java/debian/control
===================================================================
--- trunk/liblaf-widget-java/debian/control 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/control 2009-11-04 21:50:48 UTC (rev 11007)
@@ -2,17 +2,30 @@
Section: java
Priority: optional
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>
-Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, openjdk-6-jdk, libasm2-java
-Standards-Version: 3.8.1
+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, ant, default-jdk
+Build-Depends-Indep: libasm2-java
+Standards-Version: 3.8.3
Homepage: https://laf-widget.dev.java.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/liblaf-widget-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/liblaf-widget-java
Package: liblaf-widget-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre
+Depends: ${misc:Depends}, default-jre | java6-runtime
Description: support for common feel widgets in look-and-feel libraries
The goal of this project is to provide support for and base set of
additional behaviour and widgets in look-and-feels.
+
+Package: liblaf-widget-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: liblaf-widget-java
+Description: support for common feel widgets in look-and-feel libraries - doc
+ The goal of this project is to provide support for and base set of
+ additional behaviour and widgets in look-and-feels.
+ .
+ This package contains API documentation (Javadoc) for liblaf-widget-java.
+
Deleted: trunk/liblaf-widget-java/debian/doc-base
===================================================================
--- trunk/liblaf-widget-java/debian/doc-base 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/doc-base 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,9 +0,0 @@
-Document: liblaf-widget-java
-Title: Programmer API for liblaf-widget-java
-Author: Kirill Grouchnikov
-Abstract: support for common feel widgets in look-and-feel libraries
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/liblaf-widget-java/api/index.html
-Files: /usr/share/doc/liblaf-widget-java/api/*.html
Deleted: trunk/liblaf-widget-java/debian/docs
===================================================================
--- trunk/liblaf-widget-java/debian/docs 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/docs 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,2 +0,0 @@
-docs/*
-www/*
Copied: trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.doc-base (from rev 10973, trunk/liblaf-widget-java/debian/doc-base)
===================================================================
--- trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.doc-base (rev 0)
+++ trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.doc-base 2009-11-04 21:50:48 UTC (rev 11007)
@@ -0,0 +1,9 @@
+Document: liblaf-widget-java
+Title: Programmer API for liblaf-widget-java
+Author: Kirill Grouchnikov
+Abstract: support for common feel widgets in look-and-feel libraries
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liblaf-widget-java/api/index.html
+Files: /usr/share/doc/liblaf-widget-java/api/*.html
Copied: trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.install (from rev 10973, trunk/liblaf-widget-java/debian/docs)
===================================================================
--- trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.install (rev 0)
+++ trunk/liblaf-widget-java/debian/liblaf-widget-java-doc.install 2009-11-04 21:50:48 UTC (rev 11007)
@@ -0,0 +1 @@
+drop/api /usr/share/doc/liblaf-widget-java/
Modified: trunk/liblaf-widget-java/debian/orig-tar.sh
===================================================================
--- trunk/liblaf-widget-java/debian/orig-tar.sh 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/orig-tar.sh 2009-11-04 21:50:48 UTC (rev 11007)
@@ -4,9 +4,11 @@
TAR=../liblaf-widget-java_$1.orig.tar.gz
DIR=liblaf-widget-java-$1.orig
ZIP=laf-widget-all.zip
+# version 4.3
+RELEASE_ID=135952
# download sources
-wget https://laf-widget.dev.java.net/files/documents/5097/130576/$ZIP
+wget https://laf-widget.dev.java.net/files/documents/5097/$RELEASE_ID/$ZIP
# clean up the upstream tarball
unzip -d $DIR $ZIP
Modified: trunk/liblaf-widget-java/debian/patches/Drop_EDT_checks.diff
===================================================================
--- trunk/liblaf-widget-java/debian/patches/Drop_EDT_checks.diff 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/patches/Drop_EDT_checks.diff 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1,10 +1,11 @@
-Author: Varun Hiremath
Description: Disable EDT violation checks to enable Jajuk work properly.
-Index: liblaf-widget-java-4.2/src/org/jvnet/lafwidget/LafWidgetUtilities.java
-===================================================================
---- liblaf-widget-java-4.2.orig/src/org/jvnet/lafwidget/LafWidgetUtilities.java 2009-05-25 03:17:16.000000000 -0400
-+++ liblaf-widget-java-4.2/src/org/jvnet/lafwidget/LafWidgetUtilities.java 2009-05-25 03:17:33.000000000 -0400
-@@ -586,10 +586,10 @@
+ Should be dropped when packaging Jajuk 1.9 branch.
+Bug: http://trac.jajuk.info/ticket/1422
+Last-Update: 2009-05-25
+Author: Varun Hiremath <varun at debian.org>
+--- a/src/org/jvnet/lafwidget/LafWidgetUtilities.java
++++ b/src/org/jvnet/lafwidget/LafWidgetUtilities.java
+@@ -590,10 +590,10 @@
*/
public static void testComponentStateChangeThreadingViolation(Component comp) {
if (!SwingUtilities.isEventDispatchThread()) {
@@ -18,4 +19,4 @@
+// throw uiThreadingViolationError;
}
}
- }
+
Added: trunk/liblaf-widget-java/debian/patches/build.diff
===================================================================
--- trunk/liblaf-widget-java/debian/patches/build.diff (rev 0)
+++ trunk/liblaf-widget-java/debian/patches/build.diff 2009-11-04 21:50:48 UTC (rev 11007)
@@ -0,0 +1,45 @@
+Description: - Add a new "javadoc" target in build.xml using
+ laf-widget.src.dir as source dir.
+ - Delete laf-widget.drop.dir in "clean" target
+ - Don't try to copy built JAR in parent dir
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-11-04
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -122,6 +122,7 @@
+
+ <target name="clean.module.laf-widget" description="cleanup module">
+ <delete dir="${laf-widget.output.dir}" />
++ <delete dir="${laf-widget.drop.dir}" />
+ </target>
+
+ <target name="init" description="Build initialization">
+@@ -139,7 +140,6 @@
+ <attribute name="Laf-Widget-BuildStamp" value="${build.time}" />
+ </manifest>
+ </jar>
+- <copy file="${laf-widget.drop.dir}/laf-widget.jar" todir="${module.laf-widget.basedir}/../substance/lib/" />
+ </target>
+
+ <target name="jar-bin-tst" description="create test runtime jar">
+@@ -186,4 +186,17 @@
+ <target name="clean" depends="clean.module.laf-widget" description="cleanup all" />
+
+ <target name="all" depends="timestamp, init, clean, compile.module.laf-widget, jar" description="build all" />
+-</project>
+\ No newline at end of file
++
++
++ <target name="javadoc" description="Creates Javadoc documentation">
++ <mkdir dir="${laf-widget.drop.dir}/api"/>
++ <javadoc packagenames="*"
++ destdir="${laf-widget.drop.dir}/api">
++ <fileset dir="${laf-widget.src.dir}" defaultexcludes="yes">
++ <include name="org/jvnet/lafwidget/**/*.java" />
++ <include name="contrib/**/*.java" />
++ </fileset>
++ </javadoc>
++ </target>
++
++</project>
Modified: trunk/liblaf-widget-java/debian/patches/series
===================================================================
--- trunk/liblaf-widget-java/debian/patches/series 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/patches/series 2009-11-04 21:50:48 UTC (rev 11007)
@@ -1 +1,2 @@
Drop_EDT_checks.diff
+build.diff
Modified: trunk/liblaf-widget-java/debian/rules
===================================================================
--- trunk/liblaf-widget-java/debian/rules 2009-11-04 21:50:41 UTC (rev 11006)
+++ trunk/liblaf-widget-java/debian/rules 2009-11-04 21:50:48 UTC (rev 11007)
@@ -4,13 +4,13 @@
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
install/liblaf-widget-java::
- install -m 644 -D laf-widget.jar $(DEB_DESTDIR)/usr/share/java/laf-widget-$(DEB_UPSTREAM_VERSION).jar
+ mv drop/laf-widget.jar drop/laf-widget-$(DEB_UPSTREAM_VERSION).jar
+ dh_install drop/laf-widget-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
dh_link /usr/share/java/laf-widget-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/laf-widget.jar
get-orig-source:
Added: trunk/liblaf-widget-java/debian/watch
===================================================================
--- trunk/liblaf-widget-java/debian/watch (rev 0)
+++ trunk/liblaf-widget-java/debian/watch 2009-11-04 21:50:48 UTC (rev 11007)
@@ -0,0 +1,3 @@
+# laf-plugin is hosted at https://laf-plugin.dev.java.net/ but there is
+# no way to track the upstream tarballs using uscan.
+
More information about the pkg-java-commits
mailing list