[jackson-annotations] 202/207: Merge branch 'master' into master-n

[Timo Aaltonen]

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

tjaalton pushed a commit to branch master
in repository jackson-annotations.

commit ba10c444a0e97bfcabd1c82c17d0ad655c39f127
Merge: 9b6812a 51b0ce3
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Sat Sep 6 11:40:27 2014 +0300

    Merge branch 'master' into master-n

 debian/README.source                               |  9 +++
 debian/changelog                                   |  5 ++
 debian/compat                                      |  1 +
 debian/control                                     | 65 ++++++++++++++++++++++
 debian/copyright                                   | 32 +++++++++++
 .../libjackson2-annotations-java-doc.doc-base.api  | 10 ++++
 debian/libjackson2-annotations-java-doc.install    |  1 +
 debian/libjackson2-annotations-java.poms           | 28 ++++++++++
 debian/maven.cleanIgnoreRules                      |  1 +
 debian/maven.ignoreRules                           |  1 +
 debian/maven.properties                            |  5 ++
 debian/maven.publishedRules                        |  2 +
 debian/maven.rules                                 |  2 +
 debian/rules                                       |  9 +++
 debian/source/format                               |  1 +
 debian/stamp-maven-doc                             |  0
 debian/watch                                       |  2 +
 17 files changed, 174 insertions(+)

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