[pkg-java] r3062 - in trunk/simplyhtml/debian: . patches

[Eric Lavarde]

Author: ewl-guest
Date: 2007-03-12 12:43:16 +0000 (Mon, 12 Mar 2007)
New Revision: 3062

Removed:
   trunk/simplyhtml/debian/patches/20_build_xml_javadoc.patch
Modified:
   trunk/simplyhtml/debian/install
   trunk/simplyhtml/debian/links
   trunk/simplyhtml/debian/patches/10_build_xml.patch
   trunk/simplyhtml/debian/patches/30_manifest.patch
   trunk/simplyhtml/debian/rules
Log:
Removed javadoc patch integrated by upstream.
Fix version number.


Modified: trunk/simplyhtml/debian/install
===================================================================
--- trunk/simplyhtml/debian/install	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/install	2007-03-12 12:43:16 UTC (rev 3062)
@@ -1,3 +1,3 @@
-bin/dist/lib/SimplyHTML-0.12.2.jar usr/share/java
-bin/dist/lib/SimplyHTMLHelp-0.12.2.jar usr/share/java
+bin/dist/lib/SimplyHTML-0.9.0.jar usr/share/java
+bin/dist/lib/SimplyHTMLHelp-0.9.0.jar usr/share/java
 simplyhtml usr/bin

Modified: trunk/simplyhtml/debian/links
===================================================================
--- trunk/simplyhtml/debian/links	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/links	2007-03-12 12:43:16 UTC (rev 3062)
@@ -1,2 +1,2 @@
-usr/share/java/SimplyHTML-0.12.2.jar usr/share/java/SimplyHTML.jar
-usr/share/java/SimplyHTMLHelp-0.12.2.jar usr/share/java/SimplyHTMLHelp.jar
+usr/share/java/SimplyHTML-0.9.0.jar usr/share/java/SimplyHTML.jar
+usr/share/java/SimplyHTMLHelp-0.9.0.jar usr/share/java/SimplyHTMLHelp.jar

Modified: trunk/simplyhtml/debian/patches/10_build_xml.patch
===================================================================
--- trunk/simplyhtml/debian/patches/10_build_xml.patch	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/patches/10_build_xml.patch	2007-03-12 12:43:16 UTC (rev 3062)
@@ -1,14 +1,14 @@
-diff -Nur simplyhtml-0.12.2~beta1/src/build.xml simplyhtml-0.12.2~beta1.new/src/build.xml
---- simplyhtml-0.12.2~beta1/src/build.xml	2006-11-15 13:20:12.000000000 +0100
-+++ simplyhtml-0.12.2~beta1.new/src/build.xml	2006-11-15 13:20:45.000000000 +0100
+diff -Nur simplyhtml-0.9.0~beta9/src/build.xml simplyhtml-0.9.0~beta9.new/src/build.xml
+--- simplyhtml-0.9.0~beta9/src/build.xml	2006-11-15 13:20:12.000000000 +0100
++++ simplyhtml-0.9.0~beta9.new/src/build.xml	2006-11-15 13:20:45.000000000 +0100
 @@ -5,14 +5,14 @@
  	<property name="build" value="../bin/classes" />
  	<property name="dist" value="../bin/dist" />
  	<property name="dist.lib" value="${dist}/lib" />
 -	<property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML.jar"/>
 -	<property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp.jar"/>
-+	<property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.12.2.jar"/>
-+	<property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.12.2.jar"/>
++	<property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.9.0.jar"/>
++	<property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.9.0.jar"/>
  	<property name="post" value="../post" />
  	<property name="debug" value="on" />
  	<property name="java_source_version" value="1.4" />

Deleted: trunk/simplyhtml/debian/patches/20_build_xml_javadoc.patch
===================================================================
--- trunk/simplyhtml/debian/patches/20_build_xml_javadoc.patch	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/patches/20_build_xml_javadoc.patch	2007-03-12 12:43:16 UTC (rev 3062)
@@ -1,36 +0,0 @@
-diff -Nur simplyhtml-0.12.2~beta1/src/build.xml simplyhtml-0.12.2~beta1.new/src/build.xml
---- simplyhtml-0.12.2~beta1/src/build.xml	2006-11-15 13:13:58.000000000 +0100
-+++ simplyhtml-0.12.2~beta1.new/src/build.xml	2006-11-15 13:14:10.000000000 +0100
-@@ -4,6 +4,7 @@
- 	<property name="src_base_for_post" value="../" />
- 	<property name="build" value="../bin/classes" />
- 	<property name="dist" value="../bin/dist" />
-+	<property name="dist.api" value="${dist}/api" />
- 	<property name="dist.lib" value="${dist}/lib" />
- 	<property name="SimplyHTML.jar" value="${dist.lib}/SimplyHTML-0.12.2.jar"/>
- 	<property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp.jar"/>
-@@ -30,7 +31,7 @@
- 		</javac>
- 	</target>
- 
--	<target name="dist" depends="jar">
-+	<target name="dist" depends="jar,doc">
- 
- 	</target>
- 	<target name="jar" depends="build">
-@@ -62,6 +63,15 @@
- 			<fileset defaultexcludes="no" dir="${src}" includes="**/*~"/>
- 		</delete>
- 	</target>
-+	<target name="doc">
-+		<mkdir dir="${dist.api}" />
-+		<javadoc
-+			sourcepath="${src}"
-+			destdir="${dist.api}"
-+			packagenames="com.lightdev.*,de.calcom.*"
-+			classpath="${classpath}"
-+		/>
-+	</target>
- 
- </project>
- 

Modified: trunk/simplyhtml/debian/patches/30_manifest.patch
===================================================================
--- trunk/simplyhtml/debian/patches/30_manifest.patch	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/patches/30_manifest.patch	2007-03-12 12:43:16 UTC (rev 3062)
@@ -1,6 +1,6 @@
-diff -Nur simplyhtml-0.12.2~beta1/src/MANIFEST.MF simplyhtml-0.12.2~beta1.new/src/MANIFEST.MF
---- simplyhtml-0.12.2~beta1/src/MANIFEST.MF	2006-08-11 22:28:27.000000000 +0200
-+++ simplyhtml-0.12.2~beta1.new/src/MANIFEST.MF	2006-11-15 21:25:10.000000000 +0100
+diff -Nur simplyhtml-0.9.0~beta9/src/MANIFEST.MF simplyhtml-0.9.0~beta9.new/src/MANIFEST.MF
+--- simplyhtml-0.9.0~beta9/src/MANIFEST.MF	2006-08-11 22:28:27.000000000 +0200
++++ simplyhtml-0.9.0~beta9.new/src/MANIFEST.MF	2006-11-15 21:25:10.000000000 +0100
 @@ -1,5 +1,4 @@
  Manifest-Version: 1.0
  Main-Class: com.lightdev.app.shtm.App

Modified: trunk/simplyhtml/debian/rules
===================================================================
--- trunk/simplyhtml/debian/rules	2007-03-12 12:33:23 UTC (rev 3061)
+++ trunk/simplyhtml/debian/rules	2007-03-12 12:43:16 UTC (rev 3062)
@@ -12,7 +12,7 @@
 DEB_BUILDDIR         := src
 
 LIBRARY=SimplyHTML
-VERSION=0.12.2
+VERSION=0.9.0
 
 build:
 	/usr/bin/docbook-to-man debian/simplyhtml.sgml > simplyhtml.1