[DRE-commits] [SCM] org-ruby.git branch, master, updated. upstream/0.8.1_git.20130317.f632268-4-gf0d33f6

[Per Andersson]

The following commit has been merged in the master branch:
commit 847548aca4907ba8f21236beae1989640a1d63d4
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Mar 20 17:04:03 2013 +0100

    Use UTF-8 locale for test case to work

diff --git a/debian/patches/0001-Replace-illegal-US-ASCII-character-from-spec-data.patch b/debian/patches/0001-Replace-illegal-US-ASCII-character-from-spec-data.patch
deleted file mode 100644
index 550cdd0..0000000
--- a/debian/patches/0001-Replace-illegal-US-ASCII-character-from-spec-data.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Mon, 18 Mar 2013 21:00:32 +0100
-Subject: Replace illegal US-ASCII character from spec data
-
----
- spec/data/remember.org |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/data/remember.org b/spec/data/remember.org
-index da3616a..359b6ee 100644
---- a/spec/data/remember.org
-+++ b/spec/data/remember.org
-@@ -12,7 +12,7 @@
- 
-    So, I added a User Variable for my account called http_proxy with
-    the value of http://<proxyserveraddress>:8080, rebooted, ran plan
--   old vanillia gem install rails –include-dependencies, and magically,
-+   old vanillia gem install rails -include-dependencies, and magically,
-    it worked
- ** Hyper-V technical info
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 550a338..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Replace-illegal-US-ASCII-character-from-spec-data.patch
diff --git a/debian/rules b/debian/rules
index 05e924e..8ec4b9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ override_dh_auto_build:
 	rdoc --main README.rdoc lib
 
 override_dh_auto_install:
-	dh_auto_install
+	# use utf-8 locale so test cases work
+	LC_ALL=C.UTF-8 dh_auto_install
 	# remove bundled jquery.js
 	rm -f debian/org-ruby-doc/usr/share/doc/org-ruby-doc/html/js/jquery.js

-- 
org-ruby.git