[DRE-commits] [SCM] ruby-yajl.git branch, master, updated. debian/0.8.3-2-7-ga16d1ab

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 0c22ca50711abbd32bbb5880f7db97d037574ef8
Merge: 9a4c247ef0e22963bdd7c9799e0ed847f6c19158 dcb56cddb4f4fd0f60b64422707c6ff9e183ea71
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Thu Sep 22 00:17:26 2011 +0530

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

diff --combined debian/changelog
index 32ea365,448d3e1..ea5e1bd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +ruby-yajl (1.0.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Remove 0001-Fix-installation-path-of-native-extension.patch (merged upstream)
 +
 + -- Praveen Arimbrathodiyil <pravi.a at gmail.com>  Thu, 22 Sep 2011 00:07:45 +0530
+ ruby-yajl (0.8.3-2) unstable; urgency=low
+ 
+   * Add myself to Uploaders
+   * Add missing Build-Depends on ruby-rspec (Closes: #640744)
+ 
+  -- Antonio Terceiro <terceiro at debian.org>  Wed, 07 Sep 2011 11:21:23 -0700
  
  ruby-yajl (0.8.3-1) unstable; urgency=low
  

-- 
ruby-yajl.git