[pkg-java] r13027 - in trunk/libsqljet-java/debian: . patches

[Morten Sørensen]

Author: starswifter-guest
Date: 2010-10-14 22:49:37 +0000 (Thu, 14 Oct 2010)
New Revision: 13027

Removed:
   trunk/libsqljet-java/debian/libsqljet-java.changelog
Modified:
   trunk/libsqljet-java/debian/changelog
   trunk/libsqljet-java/debian/libsqljet-java.jlibs
   trunk/libsqljet-java/debian/patches/build_fix.patch
   trunk/libsqljet-java/debian/rules
Log:
Updated timestamp in changelog (newer Standards-Version)
Added more to build_fix.patch
Moved the work from debian/libsqljet-java.changelog to debian/rules
Changed the name of the resulting jar in debian/libsqljet-java.jlibs


Modified: trunk/libsqljet-java/debian/changelog
===================================================================
--- trunk/libsqljet-java/debian/changelog	2010-10-12 22:35:37 UTC (rev 13026)
+++ trunk/libsqljet-java/debian/changelog	2010-10-14 22:49:37 UTC (rev 13027)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: #563123)
 
- -- Morten Sørensen <starswifter at gmail.com>  Wed, 30 Dec 2009 14:29:37 +0100
+ -- Morten Sørensen <starswifter at gmail.com>  Wed, 15 Oct 2010 00:27:37 +0100

Deleted: trunk/libsqljet-java/debian/libsqljet-java.changelog
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java.changelog	2010-10-12 22:35:37 UTC (rev 13026)
+++ trunk/libsqljet-java/debian/libsqljet-java.changelog	2010-10-14 22:49:37 UTC (rev 13027)
@@ -1 +0,0 @@
-CHANGES

Modified: trunk/libsqljet-java/debian/libsqljet-java.jlibs
===================================================================
--- trunk/libsqljet-java/debian/libsqljet-java.jlibs	2010-10-12 22:35:37 UTC (rev 13026)
+++ trunk/libsqljet-java/debian/libsqljet-java.jlibs	2010-10-14 22:49:37 UTC (rev 13027)
@@ -1 +1 @@
-build/sqljet.1.0.3.b914.jar
+build/sqljet.jar

Modified: trunk/libsqljet-java/debian/patches/build_fix.patch
===================================================================
--- trunk/libsqljet-java/debian/patches/build_fix.patch	2010-10-12 22:35:37 UTC (rev 13026)
+++ trunk/libsqljet-java/debian/patches/build_fix.patch	2010-10-14 22:49:37 UTC (rev 13027)
@@ -1,7 +1,7 @@
 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
++++ b/build.xml	2010-10-13 18:23:57.907817477 +0200
 @@ -1,7 +1,7 @@
  <project name="sqljet" default="deploy" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
  
@@ -20,7 +20,7 @@
                  <pathelement path="${java.class.path}"/>
              </classpath>
          </java>
-@@ -185,7 +185,7 @@
+@@ -185,10 +185,10 @@
  		</tar>
  	</target>
  
@@ -28,7 +28,11 @@
 +	<target name="deploy" depends="clean, init-build.number, compile, javadoc">
  		<mkdir dir="build" />
  
- 		<jar destfile="build/sqljet.${build.number}.jar">
+-		<jar destfile="build/sqljet.${build.number}.jar">
++		<jar destfile="build/sqljet.jar">
+             <fileset dir="sqljet/bin">
+                 <include name="**/**"/>
+             </fileset>
 @@ -196,7 +196,7 @@
                  <include name="sqljet.build.properties"/>
              </fileset>

Modified: trunk/libsqljet-java/debian/rules
===================================================================
--- trunk/libsqljet-java/debian/rules	2010-10-12 22:35:37 UTC (rev 13026)
+++ trunk/libsqljet-java/debian/rules	2010-10-14 22:49:37 UTC (rev 13027)
@@ -18,3 +18,7 @@
 
 override_dh_auto_test:
 	dh_auto_build -- test test-stress
+
+override_dh_installchangelogs:
+	# Somehow I can't get debian/libsqljet-java.changelog to work ... I must have misunderstood the format, but this works
+	dh_installchangelogs CHANGES