[jmapviewer] 01/02: Merge tag 'debian/2.0+dfsg-2' into jessie-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository jmapviewer.

commit a890538dca6e89aa2b966afb4498c4653db23c82
Merge: 98c0b6c 3655eca
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 18 07:26:59 2017 +0100

    Merge tag 'debian/2.0+dfsg-2' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                      |  8 ++++++++
 debian/control                                        |  5 ++---
 debian/jmapviewer.lintian-overrides                   |  3 ---
 debian/patches/series                                 |  4 ++++
 ...32821_Use-visitor-pattern-for-painting-tiles.patch | 15 +++++++++++++++
 ...spracency-for-placeholders-loaded-from-cache.patch | 16 ++++++++++++++++
 .../svn-r33079_Fix-NarrowingCompoundAssignment.patch  | 19 +++++++++++++++++++
 ...-r33081_Use-TimeUnit-instead-of-combinations.patch | 16 ++++++++++++++++
 8 files changed, 80 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 9b422da,d780a77..9804131
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ jmapviewer (2.0+dfsg-2) unstable; urgency=medium
+ 
+   * Include epoch in default-jdk version requirement.
+   * Add patches from upstream SVN repository.
+   * Drop unused override for incompatible-java-bytecode-format.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 07 Jan 2017 23:13:15 +0100
+ 
 +jmapviewer (2.0+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Use OpenJDK 8 for jessie-backports
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 18 Aug 2016 10:08:21 +0200
 +
  jmapviewer (2.0+dfsg-1) unstable; urgency=medium
  
    * Move from experimental to unstable.

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