[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 9a4c247ef0e22963bdd7c9799e0ed847f6c19158
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Thu Sep 22 00:15:38 2011 +0530

    remove patch (merged upstream)

diff --git a/debian/changelog b/debian/changelog
index 3c799e0..32ea365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 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
 
diff --git a/debian/patches/0001-Fix-installation-path-of-native-extension.patch b/debian/patches/0001-Fix-installation-path-of-native-extension.patch
deleted file mode 100644
index 4cf8690..0000000
--- a/debian/patches/0001-Fix-installation-path-of-native-extension.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 240afe9b14a886f14f48163251073f433406d730 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Tue, 19 Apr 2011 21:19:27 -0700
-Subject: [PATCH 1/2] Fix installation path of native extension
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621500
----
- ext/yajl/extconf.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ext/yajl/extconf.rb b/ext/yajl/extconf.rb
-index 9db2689..09edd51 100644
---- a/ext/yajl/extconf.rb
-+++ b/ext/yajl/extconf.rb
-@@ -5,4 +5,4 @@ require 'rbconfig'
- $CFLAGS << ' -Wall -funroll-loops'
- $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
- 
--create_makefile("yajl")
-+create_makefile("yajl/yajl")
--- 
-1.7.4.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cba057a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-installation-path-of-native-extension.patch

-- 
ruby-yajl.git