[pkg-java] r5045 - in trunk/jericho-html: . debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Dec 16 10:24:11 UTC 2007
Author: twerner
Date: 2007-12-16 10:24:11 +0000 (Sun, 16 Dec 2007)
New Revision: 5045
Added:
trunk/jericho-html/debian/ant.properties
trunk/jericho-html/debian/build.xml
Removed:
trunk/jericho-html/build.properties
trunk/jericho-html/build.xml
Modified:
trunk/jericho-html/debian/
trunk/jericho-html/debian/changelog
trunk/jericho-html/debian/control
trunk/jericho-html/debian/rules
Log:
UNRELEASED (needs slf4j first)
* new upstream version
* Move package to Alioth.
* Add Vcs and Homepage headers.
* Move build.xml to debian directory.
* Switch to java-gcj-compat-dev from kaffe.
* Bump up Standards-Version: 3.7.3 (no changes needed).
* Add missing Build-Depends.
Deleted: trunk/jericho-html/build.properties
===================================================================
--- trunk/jericho-html/build.properties 2007-12-16 10:09:44 UTC (rev 5044)
+++ trunk/jericho-html/build.properties 2007-12-16 10:24:11 UTC (rev 5045)
@@ -1,4 +0,0 @@
-project.version=2.3
-installdir=/usr/share/java
-installdocdir=/usr/share/doc/libjericho-html-java
-
Deleted: trunk/jericho-html/build.xml
===================================================================
--- trunk/jericho-html/build.xml 2007-12-16 10:09:44 UTC (rev 5044)
+++ trunk/jericho-html/build.xml 2007-12-16 10:24:11 UTC (rev 5045)
@@ -1,51 +0,0 @@
-<project name="jericho-html" basedir="." default="build">
-
- <property file="./build.properties"/>
- <property name="jarfile"
- value="${ant.project.name}-${project.version}.jar"/>
-
- <target name="build"
- description="build the jar file">
- <mkdir dir="build"/>
- <javac srcdir="src" destdir="build"/>
- <jar destfile="${jarfile}" basedir="build" index="yes"/>
- </target>
-
- <target name="doc"
- description="create documentation">
- <javadoc Windowtitle="Jericho HTML Parser ${project.version}"
- Use="true" stylesheetfile="src/css/javadoc.css"
- packagenames="au.id.jericho.lib.html"
- group="Core Package au.id.jericho.lib.html"
- sourcepath="src/java" destdir="doc/api"/>
- </target>
-
- <target name="buildsamples" depends="build"
- description="build the samples">
- <mkdir dir="samples/CommandLine/bin"/>
- <javac srcdir="samples/CommandLine/src" destdir="samples/CommandLine/bin"
- classpath="${jarfile}"/>
- </target>
-
- <target name="runsample" depends="buildsamples"
- description="run a sample, the property 'sample' must be set">
- <java classname="${sample}" fork="yes" dir="samples/CommandLine"
- classpath="${jarfile}:samples/CommandLine/bin"/>
- </target>
-
- <target name="install" depends="build,doc"
- description="installs the jar file and documentation">
- <copy file="${jarfile}" todir="${destdir}${installdir}"/>
- <copy todir="${destdir}${installdocdir}">
- <fileset dir="doc/api" includes="**"/>
- </copy>
- </target>
-
- <target name="clean"
- description="clean up the build dir">
- <delete dir="build"/>
- <delete dir="doc"/>
- <delete dir="samples/CommandLine/bin"/>
- </target>
-
-</project>
Property changes on: trunk/jericho-html/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Copied: trunk/jericho-html/debian/ant.properties (from rev 5044, trunk/jericho-html/build.properties)
===================================================================
--- trunk/jericho-html/debian/ant.properties (rev 0)
+++ trunk/jericho-html/debian/ant.properties 2007-12-16 10:24:11 UTC (rev 5045)
@@ -0,0 +1,4 @@
+project.version=2.3
+installdir=/usr/share/java
+installdocdir=/usr/share/doc/libjericho-html-java
+
Copied: trunk/jericho-html/debian/build.xml (from rev 5044, trunk/jericho-html/build.xml)
===================================================================
--- trunk/jericho-html/debian/build.xml (rev 0)
+++ trunk/jericho-html/debian/build.xml 2007-12-16 10:24:11 UTC (rev 5045)
@@ -0,0 +1,50 @@
+<project name="jericho-html" basedir=".." default="build">
+
+ <property name="jarfile"
+ value="${ant.project.name}-${project.version}.jar"/>
+
+ <target name="build"
+ description="build the jar file">
+ <mkdir dir="build"/>
+ <javac srcdir="src" destdir="build"/>
+ <jar destfile="${jarfile}" basedir="build" index="yes"/>
+ </target>
+
+ <target name="doc"
+ description="create documentation">
+ <javadoc Windowtitle="Jericho HTML Parser ${project.version}"
+ Use="true" stylesheetfile="src/css/javadoc.css"
+ packagenames="au.id.jericho.lib.html"
+ group="Core Package au.id.jericho.lib.html"
+ sourcepath="src/java" destdir="doc/api"/>
+ </target>
+
+ <target name="buildsamples" depends="build"
+ description="build the samples">
+ <mkdir dir="samples/CommandLine/bin"/>
+ <javac srcdir="samples/CommandLine/src" destdir="samples/CommandLine/bin"
+ classpath="${jarfile}"/>
+ </target>
+
+ <target name="runsample" depends="buildsamples"
+ description="run a sample, the property 'sample' must be set">
+ <java classname="${sample}" fork="yes" dir="samples/CommandLine"
+ classpath="${jarfile}:samples/CommandLine/bin"/>
+ </target>
+
+ <target name="install" depends="build,doc"
+ description="installs the jar file and documentation">
+ <copy file="${jarfile}" todir="${destdir}${installdir}"/>
+ <copy todir="${destdir}${installdocdir}">
+ <fileset dir="doc/api" includes="**"/>
+ </copy>
+ </target>
+
+ <target name="clean"
+ description="clean up the build dir">
+ <delete dir="build"/>
+ <delete dir="doc"/>
+ <delete dir="samples/CommandLine/bin"/>
+ </target>
+
+</project>
Modified: trunk/jericho-html/debian/changelog
===================================================================
--- trunk/jericho-html/debian/changelog 2007-12-16 10:09:44 UTC (rev 5044)
+++ trunk/jericho-html/debian/changelog 2007-12-16 10:24:11 UTC (rev 5045)
@@ -1,3 +1,16 @@
+jericho-html (2.5-1) unstable; urgency=low
+
+ UNRELEASED (needs slf4j first)
+ * new upstream version
+ * Move package to Alioth.
+ * Add Vcs and Homepage headers.
+ * Move build.xml to debian directory.
+ * Switch to java-gcj-compat-dev from kaffe.
+ * Bump up Standards-Version: 3.7.3 (no changes needed).
+ * Add missing Build-Depends.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 16 Dec 2007 11:23:44 +0100
+
jericho-html (2.3-1) unstable; urgency=low
* Initial release (Closes: #352591)
Modified: trunk/jericho-html/debian/control
===================================================================
--- trunk/jericho-html/debian/control 2007-12-16 10:09:44 UTC (rev 5044)
+++ trunk/jericho-html/debian/control 2007-12-16 10:24:11 UTC (rev 5045)
@@ -1,10 +1,14 @@
Source: jericho-html
Section: libs
Priority: optional
-Maintainer: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), kaffe
-Standards-Version: 3.7.2
-X-XS-Vcs-Svn: http://bollin.googlecode.com/svn/jericho-html/trunk
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev,
+ libcommons-logging-java, liblog4j1.2-java
+Standards-Version: 3.7.3
+Homepage: http://jerichohtml.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jericho-html/
+Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/jericho-html
Package: libjericho-html-java
Architecture: all
@@ -18,6 +22,3 @@
unrecognised or invalid HTML.
.
It also provides high-level HTML form manipulation functions.
- .
- Homepage: http://jerichohtml.sourceforge.net
-
Modified: trunk/jericho-html/debian/rules
===================================================================
--- trunk/jericho-html/debian/rules 2007-12-16 10:09:44 UTC (rev 5044)
+++ trunk/jericho-html/debian/rules 2007-12-16 10:24:11 UTC (rev 5045)
@@ -3,11 +3,11 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME = /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_INSTALL_TARGET := install -Ddestdir=$(DEB_DESTDIR)
+DEB_JARS := commons-logging log4j-1.2
-DEB_ANT_INSTALL_TARGET = install -Ddestdir=$(DEB_DESTDIR)
-DEB_ANT_CLEAN_TARGET = clean
-
install/libjericho-html-java::
dh_link /usr/share/java/jericho-html-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java/jericho-html.jar
More information about the pkg-java-commits
mailing list