[DRE-commits] [SCM] ruby-bluefeather.git branch, master, updated. upstream/0.40-8-gbc9dd1f
Youhei SASAKI
uwabami at gfd-dennou.org
Sat Feb 9 06:22:26 UTC 2013
The following commit has been merged in the master branch:
commit d90b58808e31589e767c3e0274d108817ef47b5d
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Sat Feb 9 14:32:29 2013 +0900
Import upstream bzr head, add patch tag
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
diff --git a/debian/patches/bzr_r50.patch b/debian/patches/0001-Import-Upstream-HEAD-bzr-r50.patch
similarity index 66%
rename from debian/patches/bzr_r50.patch
rename to debian/patches/0001-Import-Upstream-HEAD-bzr-r50.patch
index 2eb2286..f369c47 100644
--- a/debian/patches/bzr_r50.patch
+++ b/debian/patches/0001-Import-Upstream-HEAD-bzr-r50.patch
@@ -1,6 +1,27 @@
-=== modified file 'Rakefile.rb'
---- ruby-bluefeather-0.40.orig/Rakefile.rb
-+++ ruby-bluefeather-0.40/Rakefile.rb
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sat, 9 Feb 2013 14:04:44 +0900
+Subject: Import Upstream HEAD: bzr r50
+Forwarded: not-needed
+Applied-Upstream: http://bazaar.launchpad.net/~tetradice1011/bluefeather/master/revision/50
+
+---
+ Rakefile.rb | 115 ++++++++++++++++++++++-------------
+ lib/bluefeather.rb | 2 +-
+ original-tests/00_Class.tests.rb | 15 +----
+ original-tests/05_Markdown.tests.rb | 5 +-
+ original-tests/10_Bug.tests.rb | 5 +-
+ original-tests/15_Contrib.tests.rb | 5 +-
+ original-tests/bftestcase.rb | 4 +-
+ original-tests/some_prob.tests.rb | 5 +-
+ spec/table.rb | 4 ++
+ spec/win32.rb | 4 +-
+ 10 files changed, 98 insertions(+), 66 deletions(-)
+
+diff --git a/Rakefile.rb b/Rakefile.rb
+index e17d2e2..bd242e0 100644
+--- a/Rakefile.rb
++++ b/Rakefile.rb
@@ -13,9 +13,26 @@
require 'rake/testtask'
@@ -29,7 +50,7 @@
$KCODE = 'u' unless defined?(Encoding)
$LOAD_PATH.unshift './lib'
require 'bluefeather'
-@@ -123,48 +140,64 @@
+@@ -123,48 +140,64 @@ Rake::TestTask.new('original-test') do |tasklib|
end
@@ -135,9 +156,11 @@
-desc '= spec + original-test'
-task 'test-all' => [:spec, 'original-test']
\ No newline at end of file
---- ruby-bluefeather-0.40.orig/lib/bluefeather.rb
-+++ ruby-bluefeather-0.40/lib/bluefeather.rb
-@@ -737,9 +737,9 @@
+diff --git a/lib/bluefeather.rb b/lib/bluefeather.rb
+index ece5d94..5bc0106 100644
+--- a/lib/bluefeather.rb
++++ b/lib/bluefeather.rb
+@@ -737,9 +737,9 @@ module BlueFeather
text = transform_definition_lists( text, rs ) # BlueFeather Extension
text = transform_code_blocks( text, rs )
text = transform_block_quotes( text, rs )
@@ -148,8 +171,10 @@
text = form_paragraphs( text, rs )
rs.block_transform_depth -= 1
---- ruby-bluefeather-0.40.orig/original-tests/00_Class.tests.rb
-+++ ruby-bluefeather-0.40/original-tests/00_Class.tests.rb
+diff --git a/original-tests/00_Class.tests.rb b/original-tests/00_Class.tests.rb
+index 4de17c2..2143940 100644
+--- a/original-tests/00_Class.tests.rb
++++ b/original-tests/00_Class.tests.rb
@@ -8,8 +8,9 @@
# Changes: [2009-02-14] adapt to BlueFeather
@@ -162,7 +187,7 @@
end
-@@ -18,14 +19,6 @@
+@@ -18,14 +19,6 @@ class BlueFeatherClassTestCase < BlueFeather::TestCase
TestString = "foo"
@@ -177,7 +202,7 @@
def test_01_instantiation
printTestHeader "BlueFeather: Instantiation"
rval = nil
-@@ -36,7 +29,5 @@
+@@ -36,7 +29,5 @@ class BlueFeatherClassTestCase < BlueFeather::TestCase
}
end
@@ -185,8 +210,10 @@
-
end
---- ruby-bluefeather-0.40.orig/original-tests/05_Markdown.tests.rb
-+++ ruby-bluefeather-0.40/original-tests/05_Markdown.tests.rb
+diff --git a/original-tests/05_Markdown.tests.rb b/original-tests/05_Markdown.tests.rb
+index f0c0aaa..bc1f4ff 100644
+--- a/original-tests/05_Markdown.tests.rb
++++ b/original-tests/05_Markdown.tests.rb
@@ -8,8 +8,9 @@
# Changes: [2009-02-14] adapt to BlueFeather
@@ -199,8 +226,10 @@
end
---- ruby-bluefeather-0.40.orig/original-tests/10_Bug.tests.rb
-+++ ruby-bluefeather-0.40/original-tests/10_Bug.tests.rb
+diff --git a/original-tests/10_Bug.tests.rb b/original-tests/10_Bug.tests.rb
+index 7e50b50..6800ec6 100644
+--- a/original-tests/10_Bug.tests.rb
++++ b/original-tests/10_Bug.tests.rb
@@ -8,8 +8,9 @@
# Changes: [2009-02-14] adapt to BlueFeather
@@ -213,8 +242,10 @@
end
---- ruby-bluefeather-0.40.orig/original-tests/15_Contrib.tests.rb
-+++ ruby-bluefeather-0.40/original-tests/15_Contrib.tests.rb
+diff --git a/original-tests/15_Contrib.tests.rb b/original-tests/15_Contrib.tests.rb
+index a45a839..97c05ed 100644
+--- a/original-tests/15_Contrib.tests.rb
++++ b/original-tests/15_Contrib.tests.rb
@@ -10,8 +10,9 @@
# Changes: [2009-02-14] adapt to BlueFeather
@@ -227,8 +258,10 @@
end
---- ruby-bluefeather-0.40.orig/original-tests/bftestcase.rb
-+++ ruby-bluefeather-0.40/original-tests/bftestcase.rb
+diff --git a/original-tests/bftestcase.rb b/original-tests/bftestcase.rb
+index 6a61e56..ddd3183 100644
+--- a/original-tests/bftestcase.rb
++++ b/original-tests/bftestcase.rb
@@ -40,7 +40,7 @@
#
# == Remakers
@@ -238,7 +271,7 @@
#
#:include: COPYRIGHT
#
-@@ -87,6 +87,7 @@
+@@ -87,6 +87,7 @@ module BlueFeather
end
}
klass.methodCounter = 0
@@ -246,7 +279,7 @@
end
-@@ -225,7 +226,6 @@
+@@ -225,7 +226,6 @@ module BlueFeather
olddb = $DEBUG
$DEBUG = true
end
@@ -254,8 +287,10 @@
super
$DEBUG = olddb unless olddb.nil?
---- ruby-bluefeather-0.40.orig/original-tests/some_prob.tests.rb
-+++ ruby-bluefeather-0.40/original-tests/some_prob.tests.rb
+diff --git a/original-tests/some_prob.tests.rb b/original-tests/some_prob.tests.rb
+index 863c03a..74f02e9 100644
+--- a/original-tests/some_prob.tests.rb
++++ b/original-tests/some_prob.tests.rb
@@ -2,8 +2,9 @@
# additional test: since BlueFeather 0.32
@@ -268,9 +303,11 @@
end
---- ruby-bluefeather-0.40.orig/spec/table.rb
-+++ ruby-bluefeather-0.40/spec/table.rb
-@@ -31,6 +31,10 @@
+diff --git a/spec/table.rb b/spec/table.rb
+index 1ace8f8..0f52cd0 100644
+--- a/spec/table.rb
++++ b/spec/table.rb
+@@ -31,6 +31,10 @@ describe 'Simple Table:' do
cells[2]['style'].should == 'text-align: center'
end
end
@@ -281,9 +318,11 @@
end
---- ruby-bluefeather-0.40.orig/spec/win32.rb
-+++ ruby-bluefeather-0.40/spec/win32.rb
-@@ -17,8 +17,8 @@
+diff --git a/spec/win32.rb b/spec/win32.rb
+index 4e1cc91..fe55ca6 100644
+--- a/spec/win32.rb
++++ b/spec/win32.rb
+@@ -17,8 +17,8 @@ if RUBY_PLATFORM =~ /win|mingw/ then
File.exist?(@unix_path).should be_true
File.exist?(@dos_path).should be_true
diff --git a/debian/patches/series b/debian/patches/series
index cf8d031..fb6f58e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-bzr_r50.patch
+0001-Import-Upstream-HEAD-bzr-r50.patch
--
ruby-bluefeather.git
More information about the Pkg-ruby-extras-commits
mailing list