[pkg-java] r8306 - in trunk/simplyhtml/debian: . patches
Eric Lavarde
ewl-guest at alioth.debian.org
Sun May 31 19:49:16 UTC 2009
Author: ewl-guest
Date: 2009-05-31 19:49:16 +0000 (Sun, 31 May 2009)
New Revision: 8306
Modified:
trunk/simplyhtml/debian/changelog
trunk/simplyhtml/debian/control
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:
New Upstream Release.
Bump standard version from 3.8.0 to 3.8.1 (add ${misc:Depends}).
Modified: trunk/simplyhtml/debian/changelog
===================================================================
--- trunk/simplyhtml/debian/changelog 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/changelog 2009-05-31 19:49:16 UTC (rev 8306)
@@ -1,3 +1,10 @@
+simplyhtml (0.13.1-1) unstable; urgency=low
+
+ * New Upstream Release.
+ * Bump standard version from 3.8.0 to 3.8.1 (add ${misc:Depends}).
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 24 May 2009 21:22:31 +0200
+
simplyhtml (0.12.3+dfsg-3) unstable; urgency=low
* Build package with source=1.4 and target=1.4. (Closes: #503803)
Modified: trunk/simplyhtml/debian/control
===================================================================
--- trunk/simplyhtml/debian/control 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/control 2009-05-31 19:49:16 UTC (rev 8306)
@@ -4,14 +4,14 @@
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>,
Torsten Werner <twerner at debian.org>
Build-Depends: debhelper (>= 5.0.40), cdbs (>= 0.4.28)
-Build-Depends-Indep: openjdk-6-jdk, libgnu-regexp-java, javahelp2, ant, gjdoc, docbook-to-man
-Standards-Version: 3.8.0
+Build-Depends-Indep: openjdk-6-jdk, libgnu-regexp-java, javahelp2, ant, docbook-to-man
+Standards-Version: 3.8.1
Section: web
Homepage: http://sf.net/projects/simplyhtml
Package: simplyhtml
Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libgnu-regexp-java
+Depends: openjdk-6-jre | java2-runtime, libgnu-regexp-java, ${misc:Depends}
Recommends: javahelp2
Suggests: java-virtual-machine, simplyhtml-doc
Description: Java word processor based on HTML and CSS
@@ -23,6 +23,7 @@
Package: simplyhtml-doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: simplythml
Section: doc
Description: API documentation for simplyhtml
Modified: trunk/simplyhtml/debian/install
===================================================================
--- trunk/simplyhtml/debian/install 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/install 2009-05-31 19:49:16 UTC (rev 8306)
@@ -1,3 +1,3 @@
-dist/lib/SimplyHTML-0.12.3.jar usr/share/java
-dist/lib/SimplyHTMLHelp-0.12.3.jar usr/share/java
+dist/lib/SimplyHTML-0.13.1.jar usr/share/java
+dist/lib/SimplyHTMLHelp-0.13.1.jar usr/share/java
simplyhtml usr/bin
Modified: trunk/simplyhtml/debian/links
===================================================================
--- trunk/simplyhtml/debian/links 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/links 2009-05-31 19:49:16 UTC (rev 8306)
@@ -1,2 +1,2 @@
-usr/share/java/SimplyHTML-0.12.3.jar usr/share/java/SimplyHTML.jar
-usr/share/java/SimplyHTMLHelp-0.12.3.jar usr/share/java/SimplyHTMLHelp.jar
+usr/share/java/SimplyHTML-0.13.1.jar usr/share/java/SimplyHTML.jar
+usr/share/java/SimplyHTMLHelp-0.13.1.jar usr/share/java/SimplyHTMLHelp.jar
Modified: trunk/simplyhtml/debian/patches/10_build_xml.patch
===================================================================
--- trunk/simplyhtml/debian/patches/10_build_xml.patch 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/patches/10_build_xml.patch 2009-05-31 19:49:16 UTC (rev 8306)
@@ -1,20 +1,23 @@
---- simplyhtml-0.12.2.obsolete.0.734595390343205/src/build.xml 2008-06-14 12:53:12.000000000 +0200
-+++ simplyhtml-0.12.2/src/build.xml 2008-08-03 14:19:41.000000000 +0200
-@@ -9,14 +9,14 @@
- <property name="dist.src" value="${dist}/src" />
- <property name="dist.doc" value="${dist}/doc" />
- <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.3.jar"/>
-+ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.12.3.jar"/>
- <property name="post" value="../post" />
- <property name="debug" value="on" />
- <property name="java_source_version" value="1.4" />
- <property name="java_target_version" value="1.4" />
- <property name="build.compiler" value="modern" />
-- <property name="classpath" value="..\lib\jhall.jar:..\lib\gnu-regexp-1.1.4.jar"/>
-+ <property name="classpath" value="/usr/share/java/jhall.jar:/usr/share/java/gnu-regexp.jar"/>
-
- <target name="build">
- <mkdir dir="${build}"/>
+diff -Nur -x '*.orig' -x '*~' simplyhtml-0.13.1/src/build.xml simplyhtml-0.13.1.new/src/build.xml
+--- simplyhtml-0.13.1/src/build.xml 2009-05-24 20:45:15.000000000 +0200
++++ simplyhtml-0.13.1.new/src/build.xml 2009-05-31 21:21:17.000000000 +0200
+@@ -10,15 +10,15 @@
+ <property name="dist.src" value="${dist}/src" />
+ <property name="dist.help" value="${dist}/help" />
+ <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.13.1.jar"/>
++ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.13.1.jar"/>
+ <property name="post" value="../post" />
+ <property name="debug" value="on" />
+ <property name="java_source_version" value="1.4" />
+ <property name="java_target_version" value="1.4" />
+ <property name="build.compiler" value="modern" />
+- <property name="jhall.jar" value="..\lib\jhall.jar" />
+- <property name="gnu-regexp.jar" value="..\lib\gnu-regexp-1.1.4.jar" />
++ <property name="jhall.jar" value="/usr/share/java/jhall.jar" />
++ <property name="gnu-regexp.jar" value="/usr/share/java/gnu-regexp.jar" />
+ <property name="classpath" value="${jhall.jar}:${gnu-regexp.jar}"/>
+
+ <target name="build">
Modified: trunk/simplyhtml/debian/patches/30_manifest.patch
===================================================================
--- trunk/simplyhtml/debian/patches/30_manifest.patch 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/patches/30_manifest.patch 2009-05-31 19:49:16 UTC (rev 8306)
@@ -1,8 +1,8 @@
--- simplyhtml-0.12.2.obsolete.0.734595390343205/src/MANIFEST.MF 2008-06-14 12:53:12.000000000 +0200
+++ simplyhtml-0.12.2/src/MANIFEST.MF 2008-08-03 14:21:44.000000000 +0200
@@ -1,5 +1,4 @@
- Manifest-Version: 1.0
- Main-Class: com.lightdev.app.shtm.App
--Class-Path: SimplyHTML.jar jhall.jar SimplyHTMLHelp.jar gnu-regexp-1.1.4.jar
- Created-By: Dimitri Polivaev
-
+ Manifest-Version: 1.0
+ Main-Class: com.lightdev.app.shtm.App
+-Class-Path: SimplyHTML.jar jhall.jar SimplyHTMLHelp.jar gnu-regexp.jar
+ Created-By: Dimitri Polivaev
+
Modified: trunk/simplyhtml/debian/rules
===================================================================
--- trunk/simplyhtml/debian/rules 2009-05-30 22:25:19 UTC (rev 8305)
+++ trunk/simplyhtml/debian/rules 2009-05-31 19:49:16 UTC (rev 8306)
@@ -7,12 +7,11 @@
JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
ANT_HOME := /usr/share/ant
-# DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar gnu-classpath-tools-gjdoc com-sun-javadoc com-sun-tools-doclets-Taglet
-DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_BUILD_TARGET := full-dist
DEB_BUILDDIR := src
LIBRARY=SimplyHTML
-VERSION=0.12.3
+VERSION=0.13.1
build:
/usr/bin/docbook-to-man debian/simplyhtml.sgml > simplyhtml.1
@@ -31,7 +30,7 @@
uscan --repack --rename ;\
fi; \
echo "Use a command like the following to create a binary free (DFSG) source file:";\
- echo "gunzip -c simplyhtml_0.12.3.orig.tar.gz | tar --delete --wildcards -vf - ./lib/\* ./api | gzip -c > simplyhtml_0.12.3+dfsg.orig.tar.gz";\
+ echo "gunzip -c simplyhtml_0.13.1.orig.tar.gz | tar --delete --wildcards -vf - ./lib/\* ./api | gzip -c > simplyhtml_0.13.1+dfsg.orig.tar.gz";\
else \
echo "The get-orig-source uses 'uscan' and works only if 'debian/changelog' is in the current directory.";\
fi
More information about the pkg-java-commits
mailing list