Author: ebourg-guest Date: 2013-05-27 13:09:07 +0000 (Mon, 27 May 2013) New Revision: 16755
Removed: trunk/hsqldb/debian/README.maintainer Modified: trunk/hsqldb/debian/control trunk/hsqldb/debian/patches/hsqldb-demos.patch trunk/hsqldb/debian/rules trunk/hsqldb/debian/watch Log: Added a get-orig-source target to debian/rules Removed the jar files and the generated Javadoc from the upstream tarball Use the Servlet API in /usr/share/java to compile the project Deleted: trunk/hsqldb/debian/README.maintainer =================================================================== --- trunk/hsqldb/debian/README.maintainer 2013-05-27 12:17:31 UTC (rev 16754) +++ trunk/hsqldb/debian/README.maintainer 2013-05-27 13:09:07 UTC (rev 16755) @@ -1,7 +0,0 @@ -Steps to produce a .orig tarball from the upstream distribution zips: - -unzip hsqldb_1_7_3_2.zip -rm hsqldb/lib/hsqldb.jar -rm hsqldb/lib/servlet.jar -tar -c -f hsqldb_1.7.3.2.orig.tar hsqldb/ -gzip --best hsqldb_1.7.3.2.orig.tar Modified: trunk/hsqldb/debian/control =================================================================== --- trunk/hsqldb/debian/control 2013-05-27 12:17:31 UTC (rev 16754) +++ trunk/hsqldb/debian/control 2013-05-27 13:09:07 UTC (rev 16755) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Rene Engelhard <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet2.5-java, maven-repo-helper +Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper Standards-Version: 3.9.4 Homepage: http://hsqldb.org Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/hsqldb Modified: trunk/hsqldb/debian/patches/hsqldb-demos.patch =================================================================== --- trunk/hsqldb/debian/patches/hsqldb-demos.patch 2013-05-27 12:17:31 UTC (rev 16754) +++ trunk/hsqldb/debian/patches/hsqldb-demos.patch 2013-05-27 13:09:07 UTC (rev 16755) @@ -1,45 +1,45 @@ Description: Adjust the path to the hsqldb.jar file for the demo applications. ---- hsqldb-1.8.0.0.orig/demo/localhost_clientserver.html -+++ hsqldb-1.8.0.0/demo/localhost_clientserver.html +--- a/demo/localhost_clientserver.html ++++ b/demo/localhost_clientserver.html @@ -2,7 +2,7 @@ - <head><title>HSQL Database Engine</title></head> - <body bgcolor=#FFFFFF> - <h2>HSQL Database Engine Client/Server Demo</h2> --<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> -+<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> - <param name="database" value="http://localhost";> - </applet> - ---- hsqldb-1.8.0.0.orig/demo/memorydbmanager.html -+++ hsqldb-1.8.0.0/demo/memorydbmanager.html + <head><title>HSQL Database Engine</title></head> + <body bgcolor=#FFFFFF> + <h2>HSQL Database Engine Client/Server Demo</h2> +-<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> ++<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> + <param name="database" value="http://localhost";> + </applet> + +--- a/demo/memorydbmanager.html ++++ b/demo/memorydbmanager.html @@ -2,7 +2,7 @@ - <head><title>HSQL Database Engine</title></head> - <body bgcolor=#FFFFFF> - <h2>In-Memory Applet: Database Manager</h2> --<applet code="org.hsqldb.util.DatabaseManager" archive="hsqldb.jar" width="0" height="0" codebase="../lib/"> -+<applet code="org.hsqldb.util.DatabaseManager" archive="hsqldb.jar" width="0" height="0" codebase="."> - <param name="database" value="."> - </applet> - <p> ---- hsqldb-1.8.0.0.orig/demo/memoryquery.html -+++ hsqldb-1.8.0.0/demo/memoryquery.html + <head><title>HSQL Database Engine</title></head> + <body bgcolor=#FFFFFF> + <h2>In-Memory Applet: Database Manager</h2> +-<applet code="org.hsqldb.util.DatabaseManager" archive="hsqldb.jar" width="0" height="0" codebase="../lib/"> ++<applet code="org.hsqldb.util.DatabaseManager" archive="hsqldb.jar" width="0" height="0" codebase="."> + <param name="database" value="."> + </applet> + <p> +--- a/demo/memoryquery.html ++++ b/demo/memoryquery.html @@ -2,7 +2,7 @@ - <head><title>HSQL Database Engine</title></head> - <body bgcolor=#FFFFFF> - <h2>In-Memory Applet: QueryTool</h2> --<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> -+<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> - <param name="database" value="."> - </applet> - <p> ---- hsqldb-1.8.0.0.orig/demo/servletdemo.html -+++ hsqldb-1.8.0.0/demo/servletdemo.html + <head><title>HSQL Database Engine</title></head> + <body bgcolor=#FFFFFF> + <h2>In-Memory Applet: QueryTool</h2> +-<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> ++<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> + <param name="database" value="."> + </applet> + <p> +--- a/demo/servletdemo.html ++++ b/demo/servletdemo.html @@ -2,7 +2,7 @@ - <head><title>HSQL Database Engine</title></head> - <body bgcolor=#FFFFFF> - <h2>HSQL Database Engine Servlet Demo</h2> --<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> -+<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> - <param name="database" value="http://localhost:8080/examples/servlet/hsqlServlet";> - </applet> - <p> + <head><title>HSQL Database Engine</title></head> + <body bgcolor=#FFFFFF> + <h2>HSQL Database Engine Servlet Demo</h2> +-<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="../lib/"> ++<applet code="org.hsqldb.util.QueryTool" archive="hsqldb.jar" width="460" height="400" codebase="."> + <param name="database" value="http://localhost:8080/examples/servlet/hsqlServlet";> + </applet> + <p> Modified: trunk/hsqldb/debian/rules =================================================================== --- trunk/hsqldb/debian/rules 2013-05-27 12:17:31 UTC (rev 16754) +++ trunk/hsqldb/debian/rules 2013-05-27 13:09:07 UTC (rev 16755) @@ -4,9 +4,9 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME = /usr/lib/jvm/default-java -DEB_JARS = servlet-api +DEB_JARS = servlet-api-2.5 DEB_ANT_BUILDFILE = build/build.xml -DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil +DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil javadoc DEB_ANT_ARGS += -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5 DEB_INSTALL_DOCS_ALL = -X .cvsignore @@ -69,3 +69,6 @@ rm -f changelog.combined NEWS rm -f debian/hsqldb-server.init mh_clean + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack Modified: trunk/hsqldb/debian/watch =================================================================== --- trunk/hsqldb/debian/watch 2013-05-27 12:17:31 UTC (rev 16754) +++ trunk/hsqldb/debian/watch 2013-05-27 13:09:07 UTC (rev 16755) @@ -1,4 +1,3 @@ version=3 opts=uversionmangle=s/_/./g \ -http://sf.net/hsqldb/hsqldb(?:-|_)([\d\._]+).zip -#http://sf.net/hsqldb/hsqldb_([0-9])_([0-9])_([0-9])_([0-9]).zip +http://sf.net/hsqldb/hsqldb(?:-|_)([\d\._]+).zip debian jh_repack _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
