[gradle] 02/02: Merge branch 'master' from Kai-Chung Yan <seamlikok at gmail.com>

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 7f2b348e34c6272ba908cd90e86c83d72ae6db8e
Merge: 0a12435 2f872f8
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Jul 22 03:39:17 2015 +0800

    Merge branch 'master' from Kai-Chung Yan <seamlikok at gmail.com>
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                       | 11 +++++-
 debian/control                         |  4 +-
 debian/patches/series                  |  1 +
 debian/patches/use-bndlib-1.50.0.patch | 70 ++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 57ee8fc,b78a930..5e219f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
- gradle (2.5-2) UNRELEASED; urgency=low
++gradle (2.5-3) UNRELEASED; urgency=low
 +
 +  * New maven_builder_support.diff: maven-builder-support.jar is also needed
 +
 + -- Kai-Chung Yan <seamlikok at gmail.com>  Wed, 22 Jul 2015 03:04:50 +0800
 +
+ gradle (2.5-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add use-bndlib-1.50.0.patch and switch to bnd 1.50.0, so that Gradle can be
+     uploaded to unstable.
+   * debian/control: Remove versioned dependency of bnd.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Tue, 14 Jul 2015 14:01:30 +0200
+ 
  gradle (2.5-1) experimental; urgency=low
  
    * New upstream release (Closes: #754725)
diff --cc debian/patches/series
index 3eb5973,4b81d02..a3c3ea4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -22,4 -22,4 +22,5 @@@ disable_java9.dif
  maven_testng.diff
  eclipse-aether.diff
  maven-aether-provider.diff
 +maven_builder_support.diff
+ use-bndlib-1.50.0.patch

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