[nekohtml] 39/46: Prepare 1.9.21-2 upload

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository nekohtml.

commit 9df8ae0519c51ff9a997ff829e84bf4e6caa0530
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Nov 12 20:33:58 2014 +0000

    Prepare 1.9.21-2 upload
---
 debian/changelog | 9 +++++++++
 debian/control   | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 434fa83..aefca88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 6294729..195bb04 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 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 @@ Homepage: http://nekohtml.sourceforge.net
 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 @@ Architecture: all
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nekohtml.git