[saxonhe] 03/03: Merge exp branch

[Eugene Zhukov]

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

eugene pushed a commit to branch master
in repository saxonhe.

commit 0a837d9c5529c2b32a94a602c7d9b971f097535c
Merge: 432465f dfbaad3
Author: Eugene Zhukov <eugene at debian.org>
Date:   Fri Feb 16 08:54:26 2018 +0000

    Merge exp branch

 debian/changelog               | 16 +++++++++++++++-
 debian/compat                  |  2 +-
 debian/control                 |  8 +++++---
 debian/copyright               |  4 ++--
 debian/patches/pom_added.patch | 12 +++++++++++-
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 18c20be,41fa660..192a556
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- saxonhe (9.8.0.8+dfsg+1-1.1) UNRELEASED; urgency=medium
++saxonhe (9.8.0.8+dfsg+1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
++  * Remove d/README.Debian, net/sf/saxon/xqj is gone
 +
 + -- Eugene Zhukov <eugene at debian.org>  Fri, 16 Feb 2018 07:42:40 +0000
 +
+ saxonhe (9.8.0.2+dfsg+1-1) experimental; urgency=medium
+ 
+   * Team upload
+   * New upstream release 9.8.0.2
+   * Update SVN export site in debian/orig-tar.sh
+   * Update version in Debian-provided pom.xml
+   * Add build-dep on libintellij-annotations-java and libicu4j-java
+   * Bump Standards-Version to 4.1.3
+   * Use debhelper 11
+   * Address lintian error in debian/copyright for W3C license
+ 
+  -- tony mancill <tmancill at debian.org>  Sun, 11 Feb 2018 20:43:05 -0800
+ 
  saxonhe (9.7.0.10+dfsg+1-1) unstable; urgency=medium
  
    * Include upstream resources (dfsg+1)
diff --cc debian/patches/pom_added.patch
index c6aa7ce,05c0299..dfad6e0
--- a/debian/patches/pom_added.patch
+++ b/debian/patches/pom_added.patch
@@@ -5,7 -5,7 +5,7 @@@ Last-Update: 2014-09-1
  
  --- /dev/null
  +++ b/pom.xml
- @@ -0,0 +1,166 @@
 -@@ -0,0 +1,174 @@
++@@ -0,0 +1,176 @@
  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  +  <modelVersion>4.0.0</modelVersion>

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