[pkg-java] r14451 - in trunk/flute-1.3-jfree/debian: . patches source
Andrew Ross
rockclimb-guest at alioth.debian.org
Wed Aug 24 20:20:55 UTC 2011
Author: rockclimb-guest
Date: 2011-08-24 20:20:54 +0000 (Wed, 24 Aug 2011)
New Revision: 14451
Added:
trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.javadoc
trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.jlibs
trunk/flute-1.3-jfree/debian/patches/01_libdir.patch
trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.patch
trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.patch
trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.patch
trunk/flute-1.3-jfree/debian/patches/series
trunk/flute-1.3-jfree/debian/source/
trunk/flute-1.3-jfree/debian/source/format
Removed:
trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.docs
trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.install
trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.links
trunk/flute-1.3-jfree/debian/patches/00list
trunk/flute-1.3-jfree/debian/patches/01_libdir.dpatch
trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.dpatch
trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.dpatch
trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.dpatch
Modified:
trunk/flute-1.3-jfree/debian/changelog
trunk/flute-1.3-jfree/debian/control
trunk/flute-1.3-jfree/debian/rules
Log:
Initial updates to use javahelper.
Modified: trunk/flute-1.3-jfree/debian/changelog
===================================================================
--- trunk/flute-1.3-jfree/debian/changelog 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/changelog 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,3 +1,13 @@
+flute-1.3-jfree (20061107-8) unstable; urgency=low
+
+ * Adopt package by Debian Java Maintainers
+ <pkg-java-maintainers at lists.alioth.debian.org>
+ * Switch to source format 3 (quilt)
+ * Bump standards version to 3.9.2 (no changes required).
+ * Fix lintian warnings.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Wed, 24 Aug 2011 20:54:36 +0100
+
flute-1.3-jfree (20061107-7) unstable; urgency=low
* Team upload.
Modified: trunk/flute-1.3-jfree/debian/control
===================================================================
--- trunk/flute-1.3-jfree/debian/control 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/control 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,13 +1,18 @@
Source: flute-1.3-jfree
Section: java
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 7), default-jdk, libsac-java, javacc (>= 5.0), dpatch, ant-optional
-Standards-Version: 3.8.3
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
+Build-Depends: debhelper (>= 7.0.50~), default-jdk, libsac-java,
+ javacc (>= 5.0), ant-optional, javahelper
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/flute-1.3-jfree
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/flute-1.3-jfree/
Package: libflute-1.3-jfree-java
Architecture: all
-Depends: default-jre-headless | java2-runtime
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
Suggests: libflute-1.3-jfree-java-doc
Description: Java CSS parser using SAC (JFree version)
Flute is a CSS2 parser written in Java that implements SAC.
@@ -17,8 +22,10 @@
This package contains the library.
Package: libflute-1.3-jfree-java-doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
Section: doc
-Architecture: all
Description: Java CSS parser using SAC (JFree version) -- documentation
Flute is a CSS2 parser written in Java that implements SAC.
SAC is a standard event-based API for CSS parsers, closely
Deleted: trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.docs
===================================================================
--- trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.docs 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.docs 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1 +0,0 @@
-javadoc
Added: trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.javadoc
===================================================================
--- trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.javadoc (rev 0)
+++ trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java-doc.javadoc 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1 @@
+javadoc /usr/share/doc/libflute-1.3-jfree-java/api
Deleted: trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.install
===================================================================
--- trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.install 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.install 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1 +0,0 @@
-flute-1.3-jfree-20061107.jar usr/share/java
Added: trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.jlibs
===================================================================
--- trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.jlibs (rev 0)
+++ trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.jlibs 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1 @@
+flute-1.3-jfree-20061107.jar
Deleted: trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.links
===================================================================
--- trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.links 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/libflute-1.3-jfree-java.links 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1 +0,0 @@
-usr/share/java/flute-1.3-jfree-20061107.jar usr/share/java/flute-1.3-jfree.jar
Deleted: trunk/flute-1.3-jfree/debian/patches/00list
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/00list 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/patches/00list 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,4 +0,0 @@
-01_libdir
-02_javacc_dir
-03_target-source-1.5
-04_javacc-5.0
Deleted: trunk/flute-1.3-jfree/debian/patches/01_libdir.dpatch
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/01_libdir.dpatch 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/patches/01_libdir.dpatch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_libdir.dpatch by Rene Engelhard <rene at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
---- flute-1.3-jfree-20061107~/ant/build.properties 2006-12-03 18:56:06.000000000 +0100
-+++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 01:29:22.000000000 +0200
-@@ -21,8 +21,8 @@
- # All path settings are relative to the project root directory
- # (..)
- #
--libdir=lib
--junit-dir=lib
-+libdir=/usr/share/java
-+junit-dir=/usr/share/java
-
- #
- # If you specify a non-empty string, then dont forget the
Copied: trunk/flute-1.3-jfree/debian/patches/01_libdir.patch (from rev 14450, trunk/flute-1.3-jfree/debian/patches/01_libdir.dpatch)
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/01_libdir.patch (rev 0)
+++ trunk/flute-1.3-jfree/debian/patches/01_libdir.patch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_libdir.dpatch by Rene Engelhard <rene at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
+--- flute-1.3-jfree-20061107~/ant/build.properties 2006-12-03 18:56:06.000000000 +0100
++++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 01:29:22.000000000 +0200
+@@ -21,8 +21,8 @@
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
+-junit-dir=lib
++libdir=/usr/share/java
++junit-dir=/usr/share/java
+
+ #
+ # If you specify a non-empty string, then dont forget the
Deleted: trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.dpatch
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.dpatch 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.dpatch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_javacc_dir.dpatch by Rene Engelhard <rene at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
---- flute-1.3-jfree-20061107~/ant/build.properties 2006-12-03 18:56:06.000000000 +0100
-+++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 01:29:49.000000000 +0200
-@@ -45,7 +45,7 @@
- #
- # You have to override or change this property to your JavaCC installation
- # in case you want to regnerate the parser from the grammar file.
--javacchome=/home/src/ext/javacc
-+javacchome=/usr/share/java
-
- ##############################################################
- #
Copied: trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.patch (from rev 14450, trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.dpatch)
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.patch (rev 0)
+++ trunk/flute-1.3-jfree/debian/patches/02_javacc_dir.patch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_javacc_dir.dpatch by Rene Engelhard <rene at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
+--- flute-1.3-jfree-20061107~/ant/build.properties 2006-12-03 18:56:06.000000000 +0100
++++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 01:29:49.000000000 +0200
+@@ -45,7 +45,7 @@
+ #
+ # You have to override or change this property to your JavaCC installation
+ # in case you want to regnerate the parser from the grammar file.
+-javacchome=/home/src/ext/javacc
++javacchome=/usr/share/java
+
+ ##############################################################
+ #
Deleted: trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.dpatch
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.dpatch 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.dpatch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_target-source-1.3.dpatch by Rene Engelhard <rene at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
---- flute-1.3-jfree-20061107~/ant/build.properties 2007-08-27 23:40:58.000000000 +0200
-+++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 23:42:38.000000000 +0200
-@@ -14,8 +14,8 @@
-
- #
- # Make sure that JDK 1.2 compatible class files are generated
--build.target=1.2
--build.source=1.2
-+build.target=1.5
-+build.source=1.5
-
- #
- # All path settings are relative to the project root directory
Copied: trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.patch (from rev 14450, trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.dpatch)
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.patch (rev 0)
+++ trunk/flute-1.3-jfree/debian/patches/03_target-source-1.5.patch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_target-source-1.3.dpatch by Rene Engelhard <rene at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad flute-1.3-jfree-20061107~/ant/build.properties flute-1.3-jfree-20061107/ant/build.properties
+--- flute-1.3-jfree-20061107~/ant/build.properties 2007-08-27 23:40:58.000000000 +0200
++++ flute-1.3-jfree-20061107/ant/build.properties 2007-08-27 23:42:38.000000000 +0200
+@@ -14,8 +14,8 @@
+
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.2
+-build.source=1.2
++build.target=1.5
++build.source=1.5
+
+ #
+ # All path settings are relative to the project root directory
Deleted: trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.dpatch
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.dpatch 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.dpatch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_javacc-5.0.dpatch by Michael Koch <konqueror at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- flute-1.3-jfree-20061107.orig/source/org/w3c/flute/parser/Parser.jj
-+++ flute-1.3-jfree-20061107/source/org/w3c/flute/parser/Parser.jj
-@@ -52,7 +52,7 @@
- public class Parser implements org.w3c.css.sac.Parser {
-
- // replaces all \t, \n, etc with this StringBuffer.
-- static final StringBuffer SPACE = new StringBuffer(" ");
-+ static final StringBuilder SPACE = new StringBuilder(" ");
-
- // the document handler for the parser
- protected DocumentHandler documentHandler;
Copied: trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.patch (from rev 14450, trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.dpatch)
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.patch (rev 0)
+++ trunk/flute-1.3-jfree/debian/patches/04_javacc-5.0.patch 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_javacc-5.0.dpatch by Michael Koch <konqueror at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- flute-1.3-jfree-20061107.orig/source/org/w3c/flute/parser/Parser.jj
++++ flute-1.3-jfree-20061107/source/org/w3c/flute/parser/Parser.jj
+@@ -52,7 +52,7 @@
+ public class Parser implements org.w3c.css.sac.Parser {
+
+ // replaces all \t, \n, etc with this StringBuffer.
+- static final StringBuffer SPACE = new StringBuffer(" ");
++ static final StringBuilder SPACE = new StringBuilder(" ");
+
+ // the document handler for the parser
+ protected DocumentHandler documentHandler;
Copied: trunk/flute-1.3-jfree/debian/patches/series (from rev 14450, trunk/flute-1.3-jfree/debian/patches/00list)
===================================================================
--- trunk/flute-1.3-jfree/debian/patches/series (rev 0)
+++ trunk/flute-1.3-jfree/debian/patches/series 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1,4 @@
+01_libdir.patch
+02_javacc_dir.patch
+03_target-source-1.5.patch
+04_javacc-5.0.patch
Modified: trunk/flute-1.3-jfree/debian/rules
===================================================================
--- trunk/flute-1.3-jfree/debian/rules 2011-08-24 19:53:36 UTC (rev 14450)
+++ trunk/flute-1.3-jfree/debian/rules 2011-08-24 20:20:54 UTC (rev 14451)
@@ -3,64 +3,25 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
export JAVA_HOME=/usr/lib/jvm/default-java
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- touch configure-stamp
+%:
+ dh $@ --with javahelper
+override_dh_auto_build:
+ cd ant && ant compile-jj compile javadoc
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- cd source/org/w3c/flute/parser && javacc Parser.jj
- cd ant && ant compile-jj
- cd ant && ant compile
- cd ant && ant javadoc
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
+override_dh_auto_clean:
for i in TokenMgrError.java Token.java CharStream.java \
Parser.java ParserConstants.java ParserTokenManager.java \
- Token.java TokenMgrError.java; do \
+ Token.java TokenMgrError.java ParseException.java; do \
rm -f source/org/w3c/flute/parser/$$i; \
done
rm -f flute-1.3-jfree-20061107.jar
rm -rf javadoc
rm -rf build
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- dh_install
+get-orig-source:
+ uscan --verbose --rename --force-download
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i
- dh_installdocs -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Added: trunk/flute-1.3-jfree/debian/source/format
===================================================================
--- trunk/flute-1.3-jfree/debian/source/format (rev 0)
+++ trunk/flute-1.3-jfree/debian/source/format 2011-08-24 20:20:54 UTC (rev 14451)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list