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

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository jruby-joni.

commit d9fed72d558ae2cb9d4c0d2b381f3122b5d12ce8
Merge: 28d9c2a 0c53893
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Sep 13 00:20:12 2014 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/jruby-joni
    
    Conflicts:
    	debian/changelog

 debian/changelog                  | 7 +++++++
 debian/control                    | 3 ++-
 debian/libjruby-joni-java.install | 1 -
 debian/libjruby-joni-java.links   | 2 +-
 debian/libjruby-joni-java.poms    | 1 +
 debian/maven.rules                | 3 +++
 debian/rules                      | 9 +++++++++
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index af57cdf,9038bc9..94e724f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +jruby-joni (2.1.2-1) unstable; urgency=medium
 +
 +  * New upstream release 
 +
 + -- Hideki Yamane <henrich at debian.org>  Sat, 13 Sep 2014 00:16:58 +0900
 +
+ jruby-joni (2.1.0-2) unstable; urgency=low
+ 
+   * Team upload.
+   * Provide Maven artifacts. (Closes: #742505).
+ 
+  -- Miguel Landaeta <nomadium at debian.org>  Mon, 24 Mar 2014 12:00:16 -0300
+ 
  jruby-joni (2.1.0-1) unstable; urgency=medium
  
    * New upstream release

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