[pkg-java] r13026 - in trunk/libsqljet-java/debian: . patches source
Morten Sørensen
starswifter-guest at alioth.debian.org
Tue Oct 12 22:35:38 UTC 2010
Author: starswifter-guest
Date: 2010-10-12 22:35:37 +0000 (Tue, 12 Oct 2010)
New Revision: 13026
Added:
trunk/libsqljet-java/debian/libsqljet-java-doc.javadoc
trunk/libsqljet-java/debian/libsqljet-java.changelog
trunk/libsqljet-java/debian/libsqljet-java.examples
trunk/libsqljet-java/debian/libsqljet-java.jlibs
trunk/libsqljet-java/debian/patches/
trunk/libsqljet-java/debian/patches/build_fix.patch
trunk/libsqljet-java/debian/patches/series
trunk/libsqljet-java/debian/source/
trunk/libsqljet-java/debian/source/format
Removed:
trunk/libsqljet-java/debian/linkjars
Modified:
trunk/libsqljet-java/debian/changelog
trunk/libsqljet-java/debian/control
trunk/libsqljet-java/debian/rules
Log:
Bumped the Standards-Version
Set source format
Added several files for DH/JH to handle installation of stuff
Removed debian/linkjars (currently not needed, might return some day)
Added patch to fix the build process
Set distribution in debian/changes
Updated debian/rules
The package should be release-ready
Modified: trunk/libsqljet-java/debian/changelog
===================================================================
--- trunk/libsqljet-java/debian/changelog 2010-10-10 18:13:38 UTC (rev 13025)
+++ trunk/libsqljet-java/debian/changelog 2010-10-12 22:35:37 UTC (rev 13026)
@@ -1,4 +1,4 @@
-libsqljet-java (1.0.2.b885-1) unstable; urgency=low
+libsqljet-java (1.0.3.b914-1) unstable; urgency=low
* Initial release. (Closes: #563123)
Modified: trunk/libsqljet-java/debian/control
===================================================================
--- trunk/libsqljet-java/debian/control 2010-10-10 18:13:38 UTC (rev 13025)
+++ trunk/libsqljet-java/debian/control 2010-10-12 22:35:37 UTC (rev 13026)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Morten Sørensen <starswifter at gmail.com>
-Build-Depends: ant, antlr3, debhelper (>= 7.0.50), default-jdk, javahelper (>= 0.27)
-Standards-Version: 3.8.3
+Build-Depends: ant, ant-optional, antlr3, debhelper (>= 7.0.50), default-jdk, javahelper (>= 0.27), junit4, libantlr-java, libeasymock-java
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsqljet-java
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libsqljet-java
Homepage: http://sqljet.com/
Added: trunk/libsqljet-java/debian/libsqljet-java-doc.javadoc
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java-doc.javadoc (rev 0)
+++ trunk/libsqljet-java/debian/libsqljet-java-doc.javadoc 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+build/javadoc usr/share/doc/libsqljet-java/api
Added: trunk/libsqljet-java/debian/libsqljet-java.changelog
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java.changelog (rev 0)
+++ trunk/libsqljet-java/debian/libsqljet-java.changelog 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+CHANGES
Added: trunk/libsqljet-java/debian/libsqljet-java.examples
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java.examples (rev 0)
+++ trunk/libsqljet-java/debian/libsqljet-java.examples 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+sqljet-examples/simple/src/org/tmatesoft/sqljet/examples/tutorial/Tutorial.java
Added: trunk/libsqljet-java/debian/libsqljet-java.jlibs
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java.jlibs (rev 0)
+++ trunk/libsqljet-java/debian/libsqljet-java.jlibs 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+build/sqljet.1.0.3.b914.jar
Deleted: trunk/libsqljet-java/debian/linkjars
===================================================================
--- trunk/libsqljet-java/debian/linkjars 2010-10-10 18:13:38 UTC (rev 13025)
+++ trunk/libsqljet-java/debian/linkjars 2010-10-12 22:35:37 UTC (rev 13026)
@@ -1 +0,0 @@
-/usr/share/java/antlr.jar tools/antlr-3.1.3.jar
Added: trunk/libsqljet-java/debian/patches/build_fix.patch
===================================================================
--- trunk/libsqljet-java/debian/patches/build_fix.patch (rev 0)
+++ trunk/libsqljet-java/debian/patches/build_fix.patch 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1,99 @@
+Description: This patch makes several small changes to build.xml and sqljet.build.properties. The changes in sqljet.build.properties is only version numbers. The changes in build.xml is includes during the use of antlr, dependencies for the target deploy (removing those which is not interesting) and commenting out large parts of deploy target (it is compressing stuff which would be generated during the targets which is no longer executed, and removing everything which is not compressed in a specific .zip file). The dependency for deploy in test and test-stress have been removed, such that the entire .jar file not have to be recompiled every time.
+
+--- a/build.xml 2010-01-08 22:21:07.000000000 +0100
++++ b/build.xml 2010-10-12 22:47:48.104440571 +0200
+@@ -1,7 +1,7 @@
+ <project name="sqljet" default="deploy" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <property file="sqljet.build.properties" />
+- <property name="build.vcs.number.1" value="local" />
++ <property name="build.vcs.number.1" value="914" />
+ <property name="build.number" value="${sqljet.version.major}.${sqljet.version.minor}.${sqljet.version.micro}.b${build.vcs.number.1}"/>
+ <property name="version.number" value="${sqljet.version.major}.${sqljet.version.minor}.${sqljet.version.micro}" />
+
+@@ -50,7 +50,7 @@
+ <arg value="sqljet/src/org/tmatesoft/sqljet/core/internal/lang"/>
+ <arg value="sqljet/src/Sql.g"/>
+ <classpath>
+- <pathelement location="tools/antlr-${antlr.version}.jar"/>
++ <fileset dir="tools" includes="*.jar"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </java>
+@@ -185,7 +185,7 @@
+ </tar>
+ </target>
+
+- <target name="deploy" depends="clean, init-build.number, compile, compile-examples, generate-key, osgi, tarball, javadoc">
++ <target name="deploy" depends="clean, init-build.number, compile, javadoc">
+ <mkdir dir="build" />
+
+ <jar destfile="build/sqljet.${build.number}.jar">
+@@ -196,7 +196,7 @@
+ <include name="sqljet.build.properties"/>
+ </fileset>
+ </jar>
+-
++<!--
+ <zip destfile="build/sqljet.${build.number}.src.zip">
+ <zipfileset dir="sqljet/src" prefix="src">
+ <exclude name="**/.*"/>
+@@ -208,9 +208,9 @@
+ <include name="CHANGES" />
+ </zipfileset>
+ </zip>
+-
++-->
+ <!-- examples (browser) -->
+- <manifest file="build/MANIFEST.MF">
++<!-- <manifest file="build/MANIFEST.MF">
+ <attribute name="Built-By" value="TMate Software"/>
+ <attribute name="Main-Class" value="org.tmatesoft.sqljet.browser.DBBrowser"/>
+ <attribute name="Class-Path" value="sqljet.${build.number}.jar antlr-runtime-${antlr.version}.jar"/>
+@@ -304,7 +304,7 @@
+ </delete>
+ <delete dir="build/javadoc" includeemptydirs="true">
+ <include name="**/**" />
+- </delete>
++ </delete>-->
+ </target>
+
+ <target name="deploy-maven" depends="clean,compile">
+@@ -366,7 +366,7 @@
+ <delete dir="build/maven-deploy/org.tmatesoft.sqljet-${version.number}" />
+ </target>
+
+- <target name="test" depends="deploy">
++ <target name="test">
+ <echoproperties prefix="os."/>
+ <echoproperties prefix="java.vm."/>
+ <junit>
+@@ -395,7 +395,7 @@
+ </junit>
+ </target>
+
+- <target name="test-stress" depends="deploy">
++ <target name="test-stress">
+ <echoproperties prefix="os." />
+ <echoproperties prefix="java.vm." />
+ <junit>
+@@ -423,4 +423,4 @@
+ <sysproperty key="SqlJetBtreeTableTest.REPEATS_COUNT" value="100" />
+ </junit>
+ </target>
+-</project>
+\ No newline at end of file
++</project>
+
+--- a/sqljet.build.properties 2010-05-05 11:13:53.000000000 +0200
++++ b/sqljet.build.properties 2010-10-12 22:16:25.958876607 +0200
+@@ -1,7 +1,7 @@
+ sqljet.version.major=1
+ sqljet.version.minor=0
+ sqljet.version.micro=3
+-sqljet.version.build=local
++sqljet.version.build=914
+
+-antlr.version=3.1.3
++antlr.version=3.2
+ sqlite.version=3.6.10
Added: trunk/libsqljet-java/debian/patches/series
===================================================================
--- trunk/libsqljet-java/debian/patches/series (rev 0)
+++ trunk/libsqljet-java/debian/patches/series 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+build_fix.patch
Modified: trunk/libsqljet-java/debian/rules
===================================================================
--- trunk/libsqljet-java/debian/rules 2010-10-10 18:13:38 UTC (rev 13025)
+++ trunk/libsqljet-java/debian/rules 2010-10-12 22:35:37 UTC (rev 13026)
@@ -1,18 +1,20 @@
#!/usr/bin/make -f
-#include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/class/javahelper.mk
-
%:
dh $@ --with javahelper
-override_jh_linkjars:
+override_dh_auto_build:
mkdir tools
- jh_linkjars -n
+ ln -s /usr/share/java/antlr3.jar tools/
+ ln -s /usr/share/java/antlr.jar tools/
+ ln -s /usr/share/java/stringtemplate.jar tools/
+ ln -s /usr/share/maven-repo/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar tools/
+ ln -s /usr/share/maven-repo/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar lib/
+ mkdir sqljet-test/lib
+ ln -s /usr/share/java/junit4.jar sqljet-test/lib/
+ ln -s /usr/share/java/easymock.jar sqljet-test/lib/
+ ln -s /usr/share/java/hamcrest-core.jar sqljet-test/lib/
+ dh_auto_build
-override_dh_auto_build:
- dh_auto_build -- -lib /usr/share/java -v
-# mkdir tools
-# ln -s /usr/share/java/antlr.jar tools/antlr-3.1.3.jar
-# ln -s /usr/share/java/antlr.jar lib/antlr-runtime-3.1.3.jar
-# dh_auto_build -- -lib /usr/share/java -v
+override_dh_auto_test:
+ dh_auto_build -- test test-stress
Added: trunk/libsqljet-java/debian/source/format
===================================================================
--- trunk/libsqljet-java/debian/source/format (rev 0)
+++ trunk/libsqljet-java/debian/source/format 2010-10-12 22:35:37 UTC (rev 13026)
@@ -0,0 +1 @@
+3.0 (quilt)
Property changes on: trunk/libsqljet-java/debian/source/format
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list