[DRE-commits] [SCM] ruby-gir-ffi.git branch, master, updated. debian/0.3.1-2-4-gc394f5b

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit c394f5ba44a38096a455b537e0fc31428636de9a
Merge: 6057f69763adb451d6caad3511917a4718364ce0 e55c120e08b4b1b56be91a55817a0c4e9771bec7
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Mon May 6 11:46:51 2013 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-gir-ffi
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index e98e9ef,c5ca1a7..78a3534
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,20 @@@
 +ruby-gir-ffi (0.5.2-1) unstable; urgency=low
 +
 +  * Imported Upstream version 0.5.2
 +
 + -- TANIGUCHI Takaki <takaki at debian.org>  Mon, 06 May 2013 11:28:23 +0900
++=======
+ ruby-gir-ffi (0.3.1-2) unstable; urgency=low
+ 
+   * Team upload.
+   * debian/control:
+     - Bumped the build-dependency on gem2deb to >= 0.3.0~.
+     - Added build-depends on libtool, autoconf, automake, gir1.2-gtk-3.0
+       for the tests.
+   * debian/ruby-tests.rake: run the tests except for the integration
+     tests which need $DISPLAY (closes: #673432).
+ 
+  -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 22:20:12 +0200
  
  ruby-gir-ffi (0.3.1-1) unstable; urgency=low
  

-- 
ruby-gir-ffi.git