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

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-22 22:53:00 +0000 (Thu, 22 Dec 2011)
New Revision: 15579

Added:
   trunk/simplyhtml/debian/patches/series
   trunk/simplyhtml/debian/source/
   trunk/simplyhtml/debian/source/format
Modified:
   trunk/simplyhtml/debian/changelog
   trunk/simplyhtml/debian/control
   trunk/simplyhtml/debian/rules
Log:
* Team upload.
* Replace B-D on openjdk-6-jdk with default-jdk. (Closes: #652803).
* Add optional Depends on openjdk-7-jre and drop obsolete Suggests on java-virtual-machine.
* Bump Standards-Version to 3.9.2. No changes were required.
* Switch to source format 3.0 (quilt).
* Remove usage of deprecated simple-patchsys patch management.
* Add missing Vcs-Browser field and use recommended URL scheme with Vcs-Svn.


Modified: trunk/simplyhtml/debian/changelog
===================================================================
--- trunk/simplyhtml/debian/changelog	2011-12-22 22:48:08 UTC (rev 15578)
+++ trunk/simplyhtml/debian/changelog	2011-12-22 22:53:00 UTC (rev 15579)
@@ -1,3 +1,16 @@
+simplyhtml (0.13.1-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Replace B-D on openjdk-6-jdk with default-jdk. (Closes: #652803).
+  * Add optional Depends on openjdk-7-jre and drop obsolete Suggests on
+    java-virtual-machine.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Switch to source format 3.0 (quilt).
+  * Remove usage of deprecated simple-patchsys patch management.
+  * Add missing Vcs-Browser field and use recommended URL scheme with Vcs-Svn.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 22 Dec 2011 18:26:02 -0430
+
 simplyhtml (0.13.1-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/simplyhtml/debian/control
===================================================================
--- trunk/simplyhtml/debian/control	2011-12-22 22:48:08 UTC (rev 15578)
+++ trunk/simplyhtml/debian/control	2011-12-22 22:53:00 UTC (rev 15579)
@@ -3,17 +3,18 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
 Build-Depends: debhelper (>= 5.0.40), cdbs (>= 0.4.28)
-Build-Depends-Indep: openjdk-6-jdk, libgnu-regexp-java, javahelp2, ant, docbook-to-man
-Standards-Version: 3.8.1
+Build-Depends-Indep: default-jdk, libgnu-regexp-java, javahelp2, ant, docbook-to-man
+Standards-Version: 3.9.2
 Section: web
 Homepage: http://sf.net/projects/simplyhtml
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/simplyhtml
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/simplyhtml
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/simplyhtml/
 
 Package: simplyhtml
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libgnu-regexp-java, ${misc:Depends}
+Depends: openjdk-6-jre | openjdk-7-jre | java2-runtime, libgnu-regexp-java, ${misc:Depends}
 Recommends: javahelp2
-Suggests: java-virtual-machine, simplyhtml-doc
+Suggests: simplyhtml-doc
 Description: Java word processor based on HTML and CSS
  SimplyHTML is an application built for working with text documents.
  Text documents are stored in HTML and CSS format, but the application is
@@ -24,7 +25,7 @@
 Package: simplyhtml-doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: simplythml
+Suggests: simplythml, default-jdk-doc
 Section: doc
 Description: API documentation for simplyhtml
  The javadoc for SimplyHTML, a Java word processor based on HTML and CSS.

Added: trunk/simplyhtml/debian/patches/series
===================================================================
--- trunk/simplyhtml/debian/patches/series	                        (rev 0)
+++ trunk/simplyhtml/debian/patches/series	2011-12-22 22:53:00 UTC (rev 15579)
@@ -0,0 +1,2 @@
+10_build_xml.patch
+30_manifest.patch

Modified: trunk/simplyhtml/debian/rules
===================================================================
--- trunk/simplyhtml/debian/rules	2011-12-22 22:48:08 UTC (rev 15578)
+++ trunk/simplyhtml/debian/rules	2011-12-22 22:53:00 UTC (rev 15579)
@@ -3,9 +3,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_ANT_BUILD_TARGET := full-dist
 DEB_BUILDDIR         := src

Added: trunk/simplyhtml/debian/source/format
===================================================================
--- trunk/simplyhtml/debian/source/format	                        (rev 0)
+++ trunk/simplyhtml/debian/source/format	2011-12-22 22:53:00 UTC (rev 15579)
@@ -0,0 +1 @@
+3.0 (quilt)