[pkg-java] r6830 - in trunk/simplyhtml/debian: . patches
ewl-guest at alioth.debian.org
ewl-guest at alioth.debian.org
Sun Aug 3 13:02:47 UTC 2008
Author: ewl-guest
Date: 2008-08-03 13:02:46 +0000 (Sun, 03 Aug 2008)
New Revision: 6830
Added:
trunk/simplyhtml/debian/watch
Removed:
trunk/simplyhtml/debian/README.Debian
trunk/simplyhtml/debian/docs
Modified:
trunk/simplyhtml/debian/changelog
trunk/simplyhtml/debian/control
trunk/simplyhtml/debian/copyright
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
trunk/simplyhtml/debian/simplyhtml-doc.docs
trunk/simplyhtml/debian/simplyhtml.sh
Log:
* New upstream release 0.12.2.
* Change default build JDK to OpenJDK 6, move SimplyHTML to main.
* Use default packaged javahelp2 instead of locally download one.
* Bump standard version from 3.7.2 to 3.8.0 (no changes).
Deleted: trunk/simplyhtml/debian/README.Debian
===================================================================
--- trunk/simplyhtml/debian/README.Debian 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/README.Debian 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,9 +0,0 @@
-simplyhtml for Debian
----------------------
-
-SimplyHTML will only compile and work if you download JavaHelp from
-http://java.sun.com/products/javahelp/ or http://javahelp.dev.java.net/
-and copy jhall.jar to /usr/local/share/java.
-This will stay like this until someone has packaged JavaHelp.
-
--- Eric Lavarde <deb at zorglub.s.bawue.de>, Wed, 15 Nov 2006 20:30:14 +0100
Modified: trunk/simplyhtml/debian/changelog
===================================================================
--- trunk/simplyhtml/debian/changelog 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/changelog 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,5 +1,20 @@
-simplyhtml (0.9.0~beta9-1) experimental; urgency=low
+simplyhtml (0.12.2-1) UNRELEASED; urgency=low
+ * New upstream release.
+ * Change default build JDK to OpenJDK 6, move SimplyHTML to main.
+ * Use default packaged javahelp2 instead of locally download one.
+ * Bump standard version from 3.7.2 to 3.8.0 (no changes).
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 03 Aug 2008 14:05:44 +0200
+
+simplyhtml (0.9.0~beta9-2) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Eric Lavarde <deb at zorglub.s.bawue.de> Tue, 13 Mar 2007 21:09:37 +0100
+
+simplyhtml (0.9.0~beta9-1) UNRELEASED; urgency=low
+
* Initial Release.
-- Eric Lavarde <deb at zorglub.s.bawue.de> Sun, 03 Mar 2007 14:05:55 +0100
Modified: trunk/simplyhtml/debian/control
===================================================================
--- trunk/simplyhtml/debian/control 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/control 2008-08-03 13:02:46 UTC (rev 6830)
@@ -3,13 +3,15 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8)
-Build-Depends-Indep: sun-j2sdk1.4 | blackdown-j2sdk1.4 | j2sdk1.4 | sun-java5-jdk, libgnu-regexp-java, ant, gjdoc
-Standards-Version: 3.7.2.2
+Build-Depends-Indep: openjdk-6-jdk, libgnu-regexp-java, javahelp2, ant, gjdoc, javahelp2
+Standards-Version: 3.8.0
Section: contrib/web
+Homepage: http://sf.net/projects/simplyhtml
Package: simplyhtml
Architecture: all
Depends: sun-java5-jre | sun-j2re1.4 | blackdown-j2re1.4 | j2re1.4, libgnu-regexp-java
+Recommends: javahelp2
Suggests: java-virtual-machine, simplyhtml-doc
Description: Java word processor based on HTML and CSS
SimplyHTML is an application built for working with text documents.
@@ -17,14 +19,11 @@
meant as a word processor rather than a code editor or web site builder.
.
SimplyHTML can be used standalone as well like a library/plugin.
- .
- Homepages are http://www.lightdev.com/page/3.htm and now
- http://sourceforge.net/projects/simplyhtml
Package: simplyhtml-doc
Architecture: all
Suggests: simplythml
-Recommends: mozilla | www-browser
+Recommends: iceweasel | firefox | www-browser
Section: contrib/doc
Description: API documentation for simplyhtml
The javadoc for SimplyHTML, a Java word processor based on HTML and CSS.
Modified: trunk/simplyhtml/debian/copyright
===================================================================
--- trunk/simplyhtml/debian/copyright 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/copyright 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,8 +1,10 @@
-This package was debianized by Eric Lavarde <deb at zorglub.s.bawue.de> on Sun, 12 Nov 2006 14:28:56 +0100.
+This package was debianized by Eric Lavarde <deb at zorglub.s.bawue.de>
+ on Sun, 12 Nov 2006 14:28:56 +0100.
It was downloaded from http://sourceforge.net/projects/simplyhtml (CVS)
-Copyright Holder: Ulrich Hilger <info at lightdev.com> and Dimitri Polivaev <dpolivaev at users.sourceforge.net>
+Copyright Holder: Ulrich Hilger <info at lightdev.com>
+ and Dimitri Polivaev <dpolivaev at users.sourceforge.net>
License:
Deleted: trunk/simplyhtml/debian/docs
===================================================================
--- trunk/simplyhtml/debian/docs 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/docs 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1 +0,0 @@
-readme.txt
Modified: trunk/simplyhtml/debian/install
===================================================================
--- trunk/simplyhtml/debian/install 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/install 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,3 +1,3 @@
-dist/lib/SimplyHTML-0.9.0.jar usr/share/java
-dist/lib/SimplyHTMLHelp-0.9.0.jar usr/share/java
+dist/lib/SimplyHTML-0.12.2.jar usr/share/java
+dist/lib/SimplyHTMLHelp-0.12.2.jar usr/share/java
simplyhtml usr/bin
Modified: trunk/simplyhtml/debian/links
===================================================================
--- trunk/simplyhtml/debian/links 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/links 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,2 +1,2 @@
-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
+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
Modified: trunk/simplyhtml/debian/patches/10_build_xml.patch
===================================================================
--- trunk/simplyhtml/debian/patches/10_build_xml.patch 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/patches/10_build_xml.patch 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,33 +1,20 @@
-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.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" />
- <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/local/share/java/jhall.jar:/usr/share/java/gnu-regexp.jar"/>
-
- <target name="build">
- <mkdir dir="${build}"/>
-@@ -50,9 +50,9 @@
- <include name="com/lightdev/app/shtm/help/**"/>
- </fileset>
- </jar>
-- <copy todir="${dist}/lib">
-+ <!-- copy todir="${dist}/lib">
- <fileset dir="${lib}" includes="*.jar"/>
-- </copy>
-+ </copy -->
- </target>
- <target name="clean">
- <!-- Eclipse target: -->
+--- 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.2.jar"/>
++ <property name="SimplyHTMLHelp.jar" value="${dist.lib}/SimplyHTMLHelp-0.12.2.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}"/>
Modified: trunk/simplyhtml/debian/patches/30_manifest.patch
===================================================================
--- trunk/simplyhtml/debian/patches/30_manifest.patch 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/patches/30_manifest.patch 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,9 +1,8 @@
-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
+--- 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-1.1.4.jar
+ Created-By: Dimitri Polivaev
+
Modified: trunk/simplyhtml/debian/rules
===================================================================
--- trunk/simplyhtml/debian/rules 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/rules 2008-08-03 13:02:46 UTC (rev 6830)
@@ -5,14 +5,14 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/jvm/java-1.5.0-sun
+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_BUILDDIR := src
LIBRARY=SimplyHTML
-VERSION=0.9.0
+VERSION=0.12.2
build:
/usr/bin/docbook-to-man debian/simplyhtml.sgml > simplyhtml.1
@@ -22,3 +22,14 @@
-rm -f simplyhtml.1
-rm -f simplyhtml
-rm -fr bin
+
+get-orig-source:
+ if [ -f $(CURDIR)/debian/changelog ]; then \
+ if [ -d $(CURDIR)/../tarballs ]; then \
+ uscan --destdir $(CURDIR)/../tarballs --repack --rename ;\
+ else \
+ uscan --repack --rename ;\
+ fi; \
+ else \
+ echo "The get-orig-source uses 'uscan' and works only if 'debian/changelog' is in the current directory.";\
+ fi
Modified: trunk/simplyhtml/debian/simplyhtml-doc.docs
===================================================================
--- trunk/simplyhtml/debian/simplyhtml-doc.docs 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/simplyhtml-doc.docs 2008-08-03 13:02:46 UTC (rev 6830)
@@ -1,2 +1 @@
-readme.txt
dist/api/
Modified: trunk/simplyhtml/debian/simplyhtml.sh
===================================================================
--- trunk/simplyhtml/debian/simplyhtml.sh 2008-08-02 10:16:42 UTC (rev 6829)
+++ trunk/simplyhtml/debian/simplyhtml.sh 2008-08-03 13:02:46 UTC (rev 6830)
@@ -54,10 +54,9 @@
then
"$JAVACMD" -version >&2
fi
- if (! "${JAVACMD}" -version 2>&1 | grep -qe \
- 'Java(TM) 2 Runtime Environment, Standard Edition')
+ if (! "${JAVACMD}" -version 2>&1 | grep -qe 'Java(TM)' -e OpenJDK)
then
- _error "Your Java virtual machine is neither Sun nor Blackdown," \
+ _error "Your Java virtual machine is not certified," \
"=======================================" \
"FREEMIND WILL MOST PROBABLY *NOT* WORK," \
"=======================================" \
@@ -92,11 +91,11 @@
if [ -x $(which dpkg) ]
then
_debug "The following DEB packages are installed:"
- COLUMNS=132 dpkg -l \*freemind\* \*j\* | grep -v '<none>' >&2
+ COLUMNS=132 dpkg -l \*simplyhtml\* \*j\* | grep -v '<none>' >&2
elif [ -x $(which rpm) ]
then
_debug "The following RPM packages are installed:"
- rpm -qa | grep -i -e freemind -e j >&2
+ rpm -qa | grep -i -e simplyhtml -e j >&2
else
_debug "Neither dpkg nor rpm is installed."
fi
@@ -115,7 +114,7 @@
#
CLASSPATH="${ADD_JARS}:${CLASSPATH}:\
/usr/share/java/gnu-regexp.jar:\
-/usr/local/share/java/jhall.jar:\
+/usr/share/java/jhall.jar:\
/usr/share/java/SimplyHTMLHelp.jar:\
/usr/share/java/SimplyHTML.jar:"
Added: trunk/simplyhtml/debian/watch
===================================================================
--- trunk/simplyhtml/debian/watch (rev 0)
+++ trunk/simplyhtml/debian/watch 2008-08-03 13:02:46 UTC (rev 6830)
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/_/./g; \
+ http://sf.net/simplyhtml/shtml_(\d+[._]\d+[._]\d+)\.zip
More information about the pkg-java-commits
mailing list