[joptsimple] 04/04: Merge branch 'master' of ssh://git.debian.org/git/pkg-java/joptsimple

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository joptsimple.

commit 5fb7df7e39370cfd219bcdcfc680810f7b88065c
Merge: 30ad01d fe553a9
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Sat Oct 24 17:55:37 2015 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/joptsimple

 debian/changelog         | 10 ++++++++++
 debian/maven.ignoreRules |  1 +
 2 files changed, 11 insertions(+)

diff --cc debian/changelog
index 4b32aaa,0ad923f..a67b18a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
 +joptsimple (4.9-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot.
 +  * Bump Standards-Version to 3.9.6 (no changes).
 +
 + -- Samuel Thibault <sthibault at debian.org>  Fri, 01 May 2015 21:43:37 +0200
 +
+ joptsimple (4.5-2) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * Bump Standards-Version to 3.9.6 (no changes).
+ 
+   [ Emmanuel Bourg ]
+   * Ignore the dependency on maven-scm (Closes: #797447)
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 01 Sep 2015 10:22:07 +0200
+ 
  joptsimple (4.5-1) unstable; urgency=low
  
    [ Samuel Thibault ]

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