[DRE-commits] r4290 - in trunk/librspec-ruby/debian: . patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Nov 1 10:17:44 UTC 2009
Author: tiber-guest
Date: 2009-11-01 10:17:43 +0000 (Sun, 01 Nov 2009)
New Revision: 4290
Added:
trunk/librspec-ruby/debian/README.source
trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch
Removed:
trunk/librspec-ruby/debian/patches/12_differ-test-fix.dpatch
Modified:
trunk/librspec-ruby/debian/README.Debian
trunk/librspec-ruby/debian/changelog
trunk/librspec-ruby/debian/control
trunk/librspec-ruby/debian/patches/00list
trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch
trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch
trunk/librspec-ruby/debian/watch
Log:
* New upstream release
* Removed 12_differ-test-fix.dpatch - fixed upstream
* Added 13_skip-unsupported-tests.dpatch
* Added README note about unavailable syntax library
* Added README.source referring to dpatch's README.source
* Standards-Version: 3.8.3
Modified: trunk/librspec-ruby/debian/README.Debian
===================================================================
--- trunk/librspec-ruby/debian/README.Debian 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/README.Debian 2009-11-01 10:17:43 UTC (rev 4290)
@@ -27,3 +27,17 @@
The examples to be executed must be located in ./spec/ as <name>_spec.rb.
-- Tobias Grimm <etobi at debian.org> Tue, 24 Mar 2009 20:54:52 +0100
+
+
+Syntax higlighting support for RSpec
+------------------------------------
+
+The syntax higlighting used in the HTML and TextMate formatters require
+a library which is not available as a Debian package.
+
+In order to get syntax highlightingg support, you can install the library
+as a gem:
+
+ sudo gem install syntax
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 31 Oct 2009 19:44:10 +0100
Added: trunk/librspec-ruby/debian/README.source
===================================================================
--- trunk/librspec-ruby/debian/README.source (rev 0)
+++ trunk/librspec-ruby/debian/README.source 2009-11-01 10:17:43 UTC (rev 4290)
@@ -0,0 +1,7 @@
+This package uses the dpatch system to save and apply patches to the
+upstream source code of the software that is packaged. For details
+about how to use dpatch read
+
+ /usr/share/doc/dpatch/README.source.gz
+
+from the dpatch package.
Modified: trunk/librspec-ruby/debian/changelog
===================================================================
--- trunk/librspec-ruby/debian/changelog 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/changelog 2009-11-01 10:17:43 UTC (rev 4290)
@@ -1,8 +1,14 @@
-librspec-ruby (1.2.8-2) UNRELEASED; urgency=low
+librspec-ruby (1.2.9-1) unstable; urgency=low
+ * New upstream release
* Fixed debian/watch to recognize .rc versions
+ * Removed 12_differ-test-fix.dpatch - fixed upstream
+ * Added 13_skip-unsupported-tests.dpatch
+ * Added README note about unavailable syntax library
+ * Added README.source referring to dpatch's README.source
+ * Standards-Version: 3.8.3
- -- Tobias Grimm <etobi at debian.org> Sat, 31 Oct 2009 19:44:10 +0100
+ -- Tobias Grimm <etobi at debian.org> Sun, 01 Nov 2009 11:17:07 +0100
librspec-ruby (1.2.8-1) unstable; urgency=low
Modified: trunk/librspec-ruby/debian/control
===================================================================
--- trunk/librspec-ruby/debian/control 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/control 2009-11-01 10:17:43 UTC (rev 4290)
@@ -4,7 +4,7 @@
Maintainer: Sebastien Delafond <seb at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Tobias Grimm <etobi at debian.org>
Build-Depends: debhelper (>= 5), cdbs, dpatch, help2man, ruby, libdifflcs-ruby1.8, libheckle-ruby1.8, rake
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://rspec.info
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/librspec-ruby/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/librspec-ruby/
Modified: trunk/librspec-ruby/debian/patches/00list
===================================================================
--- trunk/librspec-ruby/debian/patches/00list 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/patches/00list 2009-11-01 10:17:43 UTC (rev 4290)
@@ -1,3 +1,4 @@
10-force-spec-binary-path
11_dont-require-rubygems
-12_differ-test-fix
+#12_differ-test-fix
+13_skip-unsupported-tests
Modified: trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch 2009-11-01 10:17:43 UTC (rev 4290)
@@ -5,9 +5,9 @@
## DP: Force spec script path to /usr/bin
@DPATCH@
-diff -urNad librspec-ruby-1.2.2~/lib/autotest/rspec.rb librspec-ruby-1.2.2/lib/autotest/rspec.rb
---- librspec-ruby-1.2.2~/lib/autotest/rspec.rb 2009-03-15 13:00:28.000000000 +0100
-+++ librspec-ruby-1.2.2/lib/autotest/rspec.rb 2009-03-24 20:35:30.000000000 +0100
+diff -urNad librspec-ruby-1.2.9~/lib/autotest/rspec.rb librspec-ruby-1.2.9/lib/autotest/rspec.rb
+--- librspec-ruby-1.2.9~/lib/autotest/rspec.rb 2009-11-01 10:21:35.000000000 +0100
++++ librspec-ruby-1.2.9/lib/autotest/rspec.rb 2009-11-01 10:21:48.000000000 +0100
@@ -37,7 +37,7 @@
def make_test_cmd(files_to_test)
@@ -16,15 +16,15 @@
+ spec_program = File.expand_path('/usr/bin/spec')
return "#{ruby} #{spec_program} --autospec #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
end
-
-diff -urNad librspec-ruby-1.2.2~/lib/spec/rake/spectask.rb librspec-ruby-1.2.2/lib/spec/rake/spectask.rb
---- librspec-ruby-1.2.2~/lib/spec/rake/spectask.rb 2009-03-24 19:44:39.000000000 +0100
-+++ librspec-ruby-1.2.2/lib/spec/rake/spectask.rb 2009-03-24 20:34:56.000000000 +0100
-@@ -139,7 +139,7 @@
+
+diff -urNad librspec-ruby-1.2.9~/lib/spec/rake/spectask.rb librspec-ruby-1.2.9/lib/spec/rake/spectask.rb
+--- librspec-ruby-1.2.9~/lib/spec/rake/spectask.rb 2009-11-01 10:21:35.000000000 +0100
++++ librspec-ruby-1.2.9/lib/spec/rake/spectask.rb 2009-11-01 10:22:26.000000000 +0100
+@@ -142,7 +142,7 @@
end
def define # :nodoc:
-- spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
+- spec_script = File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","bin","spec"))
+ spec_script = '/usr/bin/spec'
lib_path = libs.join(File::PATH_SEPARATOR)
Modified: trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch 2009-11-01 10:17:43 UTC (rev 4290)
@@ -6,9 +6,9 @@
## DP: a required library
@DPATCH@
-diff -urNad librspec-ruby-1.2.4~/lib/spec/adapters/mock_frameworks/flexmock.rb librspec-ruby-1.2.4/lib/spec/adapters/mock_frameworks/flexmock.rb
---- librspec-ruby-1.2.4~/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-04-21 20:26:30.000000000 +0200
-+++ librspec-ruby-1.2.4/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-04-21 20:28:31.000000000 +0200
+diff -urNad librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/flexmock.rb librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/flexmock.rb
+--- librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-09-07 01:08:31.000000000 +0200
++++ librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-11-01 10:22:53.000000000 +0100
@@ -3,8 +3,12 @@
# Created by Jim Weirich on 2007-04-10.
# Copyright (c) 2007. All rights reserved.
@@ -24,9 +24,9 @@
module Spec
module Adapters
-diff -urNad librspec-ruby-1.2.4~/lib/spec/adapters/mock_frameworks/mocha.rb librspec-ruby-1.2.4/lib/spec/adapters/mock_frameworks/mocha.rb
---- librspec-ruby-1.2.4~/lib/spec/adapters/mock_frameworks/mocha.rb 2009-04-21 20:26:30.000000000 +0200
-+++ librspec-ruby-1.2.4/lib/spec/adapters/mock_frameworks/mocha.rb 2009-04-21 20:28:31.000000000 +0200
+diff -urNad librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/mocha.rb librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/mocha.rb
+--- librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/mocha.rb 2009-09-20 16:59:11.000000000 +0200
++++ librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/mocha.rb 2009-11-01 10:22:53.000000000 +0100
@@ -1,6 +1,11 @@
-require 'rubygems' unless ENV['NO_RUBYGEMS']
-require 'mocha/standalone'
@@ -42,9 +42,9 @@
module Spec
module Adapters
-diff -urNad librspec-ruby-1.2.4~/lib/spec/runner/heckle_runner.rb librspec-ruby-1.2.4/lib/spec/runner/heckle_runner.rb
---- librspec-ruby-1.2.4~/lib/spec/runner/heckle_runner.rb 2009-04-21 20:26:30.000000000 +0200
-+++ librspec-ruby-1.2.4/lib/spec/runner/heckle_runner.rb 2009-04-21 20:28:55.000000000 +0200
+diff -urNad librspec-ruby-1.2.9~/lib/spec/runner/heckle_runner.rb librspec-ruby-1.2.9/lib/spec/runner/heckle_runner.rb
+--- librspec-ruby-1.2.9~/lib/spec/runner/heckle_runner.rb 2009-09-07 01:08:31.000000000 +0200
++++ librspec-ruby-1.2.9/lib/spec/runner/heckle_runner.rb 2009-11-01 10:22:53.000000000 +0100
@@ -1,8 +1,7 @@
if Spec::Ruby.version.to_f < 1.9
- begin
Deleted: trunk/librspec-ruby/debian/patches/12_differ-test-fix.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/12_differ-test-fix.dpatch 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/patches/12_differ-test-fix.dpatch 2009-11-01 10:17:43 UTC (rev 4290)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_differ-test-fix.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a test for the default differ
-## DP: Reported upstream:
-## DP: https://rspec.lighthouseapp.com/projects/5645/tickets/862-default-differ-test-fails-because-of-different-hash-ordering
-
- at DPATCH@
-diff -urNad librspec-ruby-1.2.8~/spec/spec/expectations/differs/default_spec.rb librspec-ruby-1.2.8/spec/spec/expectations/differs/default_spec.rb
---- librspec-ruby-1.2.8~/spec/spec/expectations/differs/default_spec.rb 2009-07-16 01:04:43.000000000 +0200
-+++ librspec-ruby-1.2.8/spec/spec/expectations/differs/default_spec.rb 2009-07-25 15:10:03.000000000 +0200
-@@ -111,15 +112,15 @@
- expected = { "foo" => "bar", "fizz" => [1, 2, 3] }
- actual = { "foo" => "baz", "fizz" => [1, 2] }
-
-- expected_diff = <<'EOD'
-+ expected_diff = <<"EOD"
-
- Expected the key "fizz" to be [1, 2, 3], but was [1, 2]
- Expected the key "foo" to be "bar", but was "baz"
-
-
- @@ -1,2 +1,2 @@
---{"foo"=>"bar", "fizz"=>[1, 2, 3]}
--+{"foo"=>"baz", "fizz"=>[1, 2]}
-+-#{PP.singleline_pp(expected, '')}
-++#{PP.singleline_pp(actual, '')}
- EOD
-
-
Added: trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch (rev 0)
+++ trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch 2009-11-01 10:17:43 UTC (rev 4290)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_skip-unsupported-tests.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disables some tests, which will not pass on Debian due to missing
+## DP: dependencies.
+
+ at DPATCH@
+diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/formatter/html_formatter_spec.rb librspec-ruby-1.2.9/spec/spec/runner/formatter/html_formatter_spec.rb
+--- librspec-ruby-1.2.9~/spec/spec/runner/formatter/html_formatter_spec.rb 2009-11-01 10:44:20.000000000 +0100
++++ librspec-ruby-1.2.9/spec/spec/runner/formatter/html_formatter_spec.rb 2009-11-01 10:44:23.000000000 +0100
+@@ -49,6 +49,7 @@
+ # end
+
+ it "should produce HTML identical to the one we designed manually with --diff" do
++ pending "The required syntax higlighting library is not available as a debian package yet."
+ Dir.chdir(root) do
+ args = [
+ 'examples/failing/mocking_example.rb',
+diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/formatter/text_mate_formatter_spec.rb librspec-ruby-1.2.9/spec/spec/runner/formatter/text_mate_formatter_spec.rb
+--- librspec-ruby-1.2.9~/spec/spec/runner/formatter/text_mate_formatter_spec.rb 2009-11-01 10:44:20.000000000 +0100
++++ librspec-ruby-1.2.9/spec/spec/runner/formatter/text_mate_formatter_spec.rb 2009-11-01 10:44:23.000000000 +0100
+@@ -60,6 +60,7 @@
+
+ describe "functional spec using --diff" do
+ it "should produce HTML identical to the one we designed manually with --diff" do
++ pending "The required syntax higlighting library is not available as a debian package yet."
+ produces_html_identical_to_manually_designed_document("--diff") do |html|
+ suffix = jruby? ? '-jruby' : ''
+ expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
+diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/option_parser_spec.rb librspec-ruby-1.2.9/spec/spec/runner/option_parser_spec.rb
+--- librspec-ruby-1.2.9~/spec/spec/runner/option_parser_spec.rb 2009-11-01 10:44:20.000000000 +0100
++++ librspec-ruby-1.2.9/spec/spec/runner/option_parser_spec.rb 2009-11-01 10:56:23.000000000 +0100
+@@ -1,7 +1,12 @@
+ require 'spec_helper'
+ require 'spec/runner/resources/custom_example_group_runner'
+-require 'fakefs/safe'
+-require 'fakefs/spec_helpers'
++begin
++ require 'fakefs/safe'
++ require 'fakefs/spec_helpers'
++ HAVE_FAKEFS = true
++rescue LoadError
++ HAVE_FAKEFS = false
++end
+
+ describe "OptionParser" do
+ before(:each) do
+@@ -29,7 +34,7 @@
+ options = parse([])
+ options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter)
+ end
+- end
++ end if HAVE_FAKEFS
+
+ it "should leave the submitted argv alone" do
+ args = ["--pattern", "foo"]
+@@ -539,7 +544,7 @@
+ options = parse(['-O','spec/alternate.opts'])
+ options.colour.should be(true)
+ end
+- end
++ end if HAVE_FAKEFS
+
+
+ end
Modified: trunk/librspec-ruby/debian/watch
===================================================================
--- trunk/librspec-ruby/debian/watch 2009-11-01 01:45:53 UTC (rev 4289)
+++ trunk/librspec-ruby/debian/watch 2009-11-01 10:17:43 UTC (rev 4290)
@@ -1,3 +1,3 @@
version=3
opts="uversionmangle=s/\.rc/~rc/" \
- http://rubyforge.org/frs/?group_id=797 .*rspec-(.*)\.tgz
+ http://rubyforge.org/frs/?group_id=797 .*rspec-(\d.*)\.tgz
More information about the Pkg-ruby-extras-commits
mailing list