[DRE-commits] [SCM] ruby-cairo.git branch, master, updated. debian/1.10.0-3-12-g8a824e9

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 60452c2ffbd4c8291e59a39190b9f8f1ddbb16b8
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon May 7 23:20:53 2012 +0200

    move single-debian-patch setting to usual quilt queue

diff --git a/debian/patches/clean_run_test_rb.patch b/debian/patches/clean_run_test_rb.patch
new file mode 100644
index 0000000..bdbfd7f
--- /dev/null
+++ b/debian/patches/clean_run_test_rb.patch
@@ -0,0 +1,27 @@
+This patch contains all the Debian-specific changes mixed together. To review
+them separately, please inspect the VCS history at
+http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-cairo.git;a=summary
+--- ruby-cairo-1.12.1.orig/test/run-test.rb
++++ ruby-cairo-1.12.1/test/run-test.rb
+@@ -5,14 +5,14 @@ ext_dir = File.join(base_dir, "ext", "ca
+ lib_dir = File.join(base_dir, "lib")
+ test_dir = File.join(base_dir, "test")
+ 
+-if system("which make >/dev/null 2>&1")
+-  Dir.chdir(base_dir) do
+-    system("make > /dev/null") or exit(1)
+-  end
+-end
++#if system("which make >/dev/null 2>&1")
++#  Dir.chdir(base_dir) do
++#    system("make > /dev/null") or exit(1)
++#  end
++#end
+ 
+-require 'rubygems'
+-require 'bundler/setup'
++#require 'rubygems'
++#require 'bundler/setup'
+ require 'test/unit'
+ 
+ $LOAD_PATH.unshift(base_dir)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3fc2789
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+clean_run_test_rb.patch
diff --git a/debian/source/options b/debian/source/options
index 7423a2d..4aceb10 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
-single-debian-patch
+unapply-patches

-- 
ruby-cairo.git