[yecht] 01/01: Upload to unstable

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository yecht.

commit 94a4336eeff6fcdb3725976705f206e3b41f98a3
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Nov 8 22:36:49 2016 +0000

    Upload to unstable
---
 debian/changelog | 7 +++++++
 debian/control   | 5 +++--
 debian/rules     | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c19611..3cb311e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+yecht (1.1-2) unstable; urgency=medium
+
+  * Remove YechtService class from yecht jar to fix a FTBFS in jruby.
+  * Bump Standards-Version to 3.9.8. No changes were required.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Tue, 08 Nov 2016 22:19:34 +0000
+
 yecht (1.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0534828..f08456f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,9 @@ Build-Depends:
  default-jdk,
  jruby,
  libbuild-helper-maven-plugin-java,
- maven-debian-helper
-Standards-Version: 3.9.7
+ maven-debian-helper,
+ zip
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/yecht.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/yecht.git
 Homepage: https://github.com/jruby/yecht
diff --git a/debian/rules b/debian/rules
index 1779706..f05b25d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,15 @@ include /usr/share/dpkg/default.mk
 %:
 	dh $@ --buildsystem=maven
 
+override_dh_auto_build:
+	dh_auto_build
+	# This is just a hack to get jruby building with yecht >= 1.1.
+	# Since 1.1, yecht puts a YetchService class in the root package
+	# and that doesn't work with maven-bundle-plugin 2.5.x and bnd 2.4.x.
+	# This should be removed probably when we transition to jruby 9k and
+	# bnd 3.x.
+	zip -d ./target/yecht-$(DEB_VERSION_UPSTREAM).jar YechtService.class
+
 override_dh_install:
 	dh_install
 	dh_install target/yecht-$(DEB_VERSION_UPSTREAM)-jruby.jar \

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