[libnetlib-java] 23/23: Merge branch 'master' into experimental

[Markus Koschany]

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

apo pushed a commit to branch experimental
in repository libnetlib-java.

commit e194c27b838aa24045b10ffd7a9b1628d4595d82
Merge: ba89830 4ebade0
Author: Markus Koschany <apo at debian.org>
Date:   Mon May 9 00:23:30 2016 +0200

    Merge branch 'master' into experimental

 debian/changelog                             |  11 +-
 debian/control                               |  41 +++---
 debian/copyright                             |   1 -
 debian/docs                                  |   0
 debian/libnetlib-java.jlibs                  |   1 -
 debian/libnetlib-java.poms                   |   6 +-
 debian/maven.cleanIgnoreRules                |   1 -
 debian/maven.ignoreRules                     |   1 +
 debian/maven.publishedRules                  |   1 -
 debian/patches/fix_version_mismatch.patch    | 182 ---------------------------
 debian/patches/lombok-version.patch          |  20 +++
 debian/patches/series                        |   3 +-
 debian/patches/suppress_native_plugins.patch |  13 ++
 debian/rules                                 |   8 +-
 debian/watch                                 |   2 +-
 15 files changed, 73 insertions(+), 218 deletions(-)

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