[pkg-java] r18590 - trunk/nekohtml/debian

[Miguel Landaeta]

Author: nomadium
Date: 2014-11-12 20:33:58 +0000 (Wed, 12 Nov 2014)
New Revision: 18590

Modified:
   trunk/nekohtml/debian/changelog
   trunk/nekohtml/debian/control
Log:
Prepare 1.9.21-2 upload

Modified: trunk/nekohtml/debian/changelog
===================================================================
--- trunk/nekohtml/debian/changelog	2014-11-02 16:53:58 UTC (rev 18589)
+++ trunk/nekohtml/debian/changelog	2014-11-12 20:33:58 UTC (rev 18590)
@@ -1,3 +1,12 @@
+nekohtml (1.9.21-2) UNRELEASED; urgency=medium
+
+  * Team upload
+  * Allow to upgrade from 'wheezy' by avoiding to overwrite documentation
+    files. (Closes: #768210).
+  * Bump Standards-Version to 3.9.6. No changes were required.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Wed, 12 Nov 2014 17:29:27 -0300
+
 nekohtml (1.9.21-1) unstable; urgency=medium
 
   * Team upload

Modified: trunk/nekohtml/debian/control
===================================================================
--- trunk/nekohtml/debian/control	2014-11-02 16:53:58 UTC (rev 18589)
+++ trunk/nekohtml/debian/control	2014-11-12 20:33:58 UTC (rev 18590)
@@ -5,7 +5,7 @@
 Uploaders: Marcus Better <marcus at better.se>
 Build-Depends: debhelper (>= 9), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1), libjaxp1.3-java (>> 1.3.04-3)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/nekohtml
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/nekohtml/
 Homepage: http://nekohtml.sourceforge.net
@@ -13,7 +13,7 @@
 Package: libnekohtml-java
 Architecture: all
 Depends: ${misc:Depends}, libxerces2-java (>= 2.9.1), libjaxp1.3-java (>> 1.3.04-3)
-Suggests: libnekohtml-java-doc
+Suggests: libnekohtml-java-doc (>= 1.9.21-2)
 Description: NekoHTML - HTML parser for Java
  NekoHTML is a simple HTML scanner and tag balancer that enables
  application programmers to parse HTML documents and access the
@@ -29,6 +29,8 @@
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libnekohtml-java
+Replaces: libnekohtml-java (<< 1.9.21-2)
+Breaks: libnekohtml-java (<< 1.9.21-2)
 Description: NekoHTML - HTML parser for Java (Documentation)
  NekoHTML is a simple HTML scanner and tag balancer that enables
  application programmers to parse HTML documents and access the