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

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jffi.

commit 39872e3f5ca2e9b6ca3ea22c577b12ae4cf14fc7
Merge: 58ffbb5 61c2673
Author: tony mancill <tmancill at debian.org>
Date:   Fri Jul 3 11:26:31 2015 -0700

    Merge branch 'master' of git://git.debian.org/git/pkg-java/jffi
    
    Conflicts:
    	debian/changelog

 debian/changelog | 15 ++++++++++++---
 debian/rules     |  7 +++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 8dcf476,be93f3f..777d91c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,18 @@@
- jffi (1.2.7-4) UNRELEASED; urgency=medium
++jffi (1.2.7-5) UNRELEASED; urgency=medium
 +
 +  * Team upload.
-   * Add disable-MODEL-in-makefiles.patch.
++  * Add disable-MODEL-in-makefiles.patch.  This addresses FTBFS for arm64 (and
++    possibly other architectures), although there are still some issues with
++    while running tests.
 +
-  -- tony mancill <tmancill at debian.org>  Thu, 18 Jun 2015 22:25:24 -0700
++ -- tony mancill <tmancill at debian.org>  Fri, 03 Jul 2015 11:24:33 -0700
++
+ jffi (1.2.7-4) unstable; urgency=medium
+ 
+   * Re-enable OSGi metadata generation.
+     - Lost during package update.
+ 
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 20 Jun 2015 21:21:55 +0200
  
  jffi (1.2.7-3) unstable; urgency=medium
  

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