[DRE-commits] [SCM] ruby-rspec-core.git branch, master, updated. upstream/2.5.1-2-gbc15f9f

Lucas Nussbaum lucas at lucas-nussbaum.net
Tue Apr 26 13:31:48 UTC 2011


The following commit has been merged in the master branch:
commit bc15f9f03db7a95e725490cb493cfa56cc016f67
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Tue Apr 26 13:36:30 2011 +0200

    continue packaging

diff --git a/debian/changelog b/debian/changelog
index c980d9d..31a73c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,135 @@
-ruby-rspec-core (2.5.1-1) UNRELEASED; urgency=low
+ruby-rspec-core (2.5.1-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Switch to gem2deb-based packaging and to a more recent upstream release.
+    Upstream package was split into rspec-{core,expectations,mocks}.
 
  -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Tue, 26 Apr 2011 13:18:35 +0200
+
+librspec-ruby (1.3.1-2) unstable; urgency=low
+
+  * Updated debian/watch to only catch 1.x versions. RSpec2 will
+    be a separate package.
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 14 Feb 2011 22:14:20 +0100
+
+librspec-ruby (1.3.1-1) unstable; urgency=low
+
+  * New upstream release - This is a minor bugfix release before switching
+    to RSpec 2
+  * Dropped patches (fixed upstream):
+    - 14_ruby1.9.2-lambda.patch
+    - 16_ruby1.9.2-class-variable.patch
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 27 Oct 2010 01:32:12 +0200
+
+librspec-ruby (1.3.0-3) unstable; urgency=low
+
+  * Added support for Ruby 1.9.2 which introduced some breaking changes like no
+    '.' in the LOAD_PATH or requiring to pass blocks with a parameter to 
+    instance_eval (Closes: #593020)
+  * Standards-Version: 3.9.1
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 17 Aug 2010 01:16:27 +0200
+
+librspec-ruby (1.3.0-2) unstable; urgency=low
+
+  * Fixed manpage creation by not including the current date in the diff
+    (Closes: #584385)
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 03 Jun 2010 13:40:25 +0200
+
+librspec-ruby (1.3.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Falling back to gemwatch for debian/watch, because the Rubyforge download
+    site hasn't been updated for months
+  * Standards-Version: 3.8.4
+  * Added Ruby 1.9.1 package
+  * Enabled tests depending on FakeFS
+  * source/format 3.0 (quilt)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 29 May 2010 20:31:49 +0200
+
+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
+  * Force local inline cache dir during build (parsetree uses
+    libinline-ruby which on-the-fly compiles C code)
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 01 Nov 2009 11:17:07 +0100
+
+librspec-ruby (1.2.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Added 12_differ-test-fix.dpatch (reported upstream as ticket #862)
+  * Increased standards version to 3.8.2
+  * Build-depend on rake (required to test the rake tasks)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 25 Jul 2009 15:40:48 +0200
+
+librspec-ruby (1.2.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Added Debian Ruby Extras Maintainers to list of uploaders
+  * Added package VCS links to debian/control
+  * Dropped 99_fix-html-and-textmate-output (fixed upstream)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 02 May 2009 12:02:21 +0200
+
+librspec-ruby (1.2.4-1) unstable; urgency=low
+
+  * New upstream release (Closes: #521109)
+  * Dropped 20_fix-for-500625.dpatch - fixed upstream
+  * Changed section to 'ruby'
+  * Generate and install manpage for /usr/bin/spec
+  * Depend on `ruby1.8` instead of just `ruby`
+  * Run the tests in spec/spec during package build
+  * Updated 10-force-spec-binary-path.dpatch to fix the spec path in the
+    autotest plugin as well
+  * Added note about autotest to README.Debian
+  * Added 11_dont-require-rubygems.dpatch
+  * Added 99_fix-html-and-textmate-output.dpatch (a bugfix picked from the
+    upstream Git)
+  * Bumped standards version to 3.8.1
+  * Added Tobias Grimm <etobi at debian.org> to uploaders
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 21 Apr 2009 22:16:30 +0200
+
+librspec-ruby (1.1.12-1) unstable; urgency=low
+
+  * Upload entirely prepared by Tobias Grimm (etobi at debian.org); thank you
+    very much for all the quality improvements.
+  * New upstream release (Closes: #517694).
+  * Bumped debhelper dependency / compat to >= 5
+  * Using cdbs now
+  * Updated 20_fix-for-500625.dpatch
+  * Added debian/watch
+  * Added Homepage field to debian/control
+
+ -- Sebastien Delafond <seb at debian.org>  Fri, 06 Mar 2009 08:16:42 -0800
+
+librspec-ruby (1.1.3-3) unstable; urgency=low
+
+  * Put plugins, specs and stories in /usr/lib/ruby/1.8/spec/
+    (Closes: #500625).
+
+ -- Sebastien Delafond <seb at debian.org>  Mon, 29 Sep 2008 14:03:10 -0700
+
+librspec-ruby (1.1.3-2) unstable; urgency=low
+
+  * Force spec script path to /usr/bin/spec (Closes: #490729).
+  * Bump up policy version.
+
+ -- Sebastien Delafond <seb at debian.org>  Mon, 14 Jul 2008 14:55:09 -0700
+
+librspec-ruby (1.1.3-1) unstable; urgency=low
+
+  * Initial Release (Closes: #444623, #480441).
+
+ -- Sebastien Delafond <seb at debian.org>  Sat, 10 May 2008 19:26:47 -0700
diff --git a/debian/control b/debian/control
index 31e28e4..c6572a5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), rake, ruby-rspec-expectations, ruby-rspec-mocks
 Standards-Version: 3.9.1
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rspec-core.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rspec-core.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rspec-core.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rspec-core.git;a=summary
 Homepage: http://github.com/rspec/rspec-core
 XS-Ruby-Versions: all
 
@@ -15,5 +15,9 @@ Package: ruby-rspec-core
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Description: rspec-core-2.5.1
- RSpec runner and example groups
+Conflicts: librspec-ruby1.8 (<< 2.5.0-1~), librspec-ruby1.9.1 (<< 2.5.0-1~), librspec-ruby (<< 2.5.0-1~)
+Suggests: ruby-rspec
+Description: Behaviour Driven Development framework for Ruby - core
+ RSpec is a Behaviour Driven Development framework for Ruby. It
+ provides a framework for writing and executing examples of how your
+ Ruby application should behave.
diff --git a/debian/copyright b/debian/copyright
index 7aa81a4..1323ba3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,31 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: rspec-core
-Source: FIXME (URL where source can be downloaded)
+Source: https://github.com/rspec/rspec-core
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Copyright:
+ Copyright (c) 2009 Chad Humphries, David Chelimsky
+ Copyright (c) 2005 The RSpec Development Team
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+License: MIT
diff --git a/debian/patches/disable-autotest-in-tests.patch b/debian/patches/disable-autotest-in-tests.patch
new file mode 100644
index 0000000..a4c3d4d
--- /dev/null
+++ b/debian/patches/disable-autotest-in-tests.patch
@@ -0,0 +1,9 @@
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,5 +1,5 @@
+ require 'rspec/core'
+-require 'autotest/rspec2'
++#require 'autotest/rspec2'
+ 
+ Dir['./spec/support/**/*.rb'].map {|f| require f}
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..486bb9e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-autotest-in-tests.patch
diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
new file mode 100644
index 0000000..e208e9f
--- /dev/null
+++ b/debian/require-rubygems.overrides
@@ -0,0 +1 @@
+debian/ruby-rspec-core/usr/lib/ruby/vendor_ruby/rspec/core/configuration.rb
diff --git a/debian/ruby-rspec-core.docs b/debian/ruby-rspec-core.docs
index 07b3c9e..b43bf86 100644
--- a/debian/ruby-rspec-core.docs
+++ b/debian/ruby-rspec-core.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.md
+README.md
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 04b3393..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
---- 
-- features/Autotest.md
-- features/Changelog.md
-- features/README.md
-- features/Upgrade.md
-- features/command_line/README.md
-- features/command_line/configure.feature
-- features/command_line/example_name_option.feature
-- features/command_line/exit_status.feature
-- features/command_line/format_option.feature
-- features/command_line/line_number_appended_to_path.feature
-- features/command_line/line_number_option.feature
-- features/command_line/rake_task.feature
-- features/command_line/tag.feature
-- features/configuration/custom_settings.feature
-- features/configuration/fail_fast.feature
-- features/configuration/read_options_from_file.feature
-- features/example_groups/basic_structure.feature
-- features/example_groups/shared_example_group.feature
-- features/expectation_framework_integration/configure_expectation_framework.feature
-- features/filtering/exclusion_filters.feature
-- features/filtering/implicit_filters.feature
-- features/filtering/inclusion_filters.feature
-- features/filtering/run_all_when_everything_filtered.feature
-- features/formatters/custom_formatter.feature
-- features/helper_methods/arbitrary_methods.feature
-- features/helper_methods/let.feature
-- features/hooks/around_hooks.feature
-- features/hooks/before_and_after_hooks.feature
-- features/hooks/filtering.feature
-- features/metadata/described_class.feature
-- features/mock_framework_integration/use_any_framework.feature
-- features/mock_framework_integration/use_flexmock.feature
-- features/mock_framework_integration/use_mocha.feature
-- features/mock_framework_integration/use_rr.feature
-- features/mock_framework_integration/use_rspec.feature
-- features/pending/pending_examples.feature
-- features/spec_files/arbitrary_file_suffix.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/subject/attribute_of_subject.feature
-- features/subject/explicit_subject.feature
-- features/subject/implicit_receiver.feature
-- features/subject/implicit_subject.feature
-- features/support/env.rb
-- spec/autotest/discover_spec.rb
-- spec/autotest/failed_results_re_spec.rb
-- spec/autotest/rspec_spec.rb
-- spec/rspec/core/command_line_configuration_spec.rb
-- spec/rspec/core/command_line_spec.rb
-- spec/rspec/core/command_line_spec_output.txt
-- spec/rspec/core/configuration_options_spec.rb
-- spec/rspec/core/configuration_spec.rb
-- spec/rspec/core/deprecations_spec.rb
-- spec/rspec/core/drb_command_line_spec.rb
-- spec/rspec/core/example_group_spec.rb
-- spec/rspec/core/example_spec.rb
-- spec/rspec/core/formatters/base_formatter_spec.rb
-- spec/rspec/core/formatters/base_text_formatter_spec.rb
-- spec/rspec/core/formatters/documentation_formatter_spec.rb
-- spec/rspec/core/formatters/helpers_spec.rb
-- spec/rspec/core/formatters/html_formatted-1.8.6.html
-- spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
-- spec/rspec/core/formatters/html_formatted-1.8.7.html
-- spec/rspec/core/formatters/html_formatted-1.9.1.html
-- spec/rspec/core/formatters/html_formatted-1.9.2.html
-- spec/rspec/core/formatters/html_formatter_spec.rb
-- spec/rspec/core/formatters/progress_formatter_spec.rb
-- spec/rspec/core/formatters/snippet_extractor_spec.rb
-- spec/rspec/core/formatters/text_mate_formatted-1.8.6.html
-- spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html
-- spec/rspec/core/formatters/text_mate_formatted-1.8.7.html
-- spec/rspec/core/formatters/text_mate_formatted-1.9.1.html
-- spec/rspec/core/formatters/text_mate_formatted-1.9.2.html
-- spec/rspec/core/formatters/text_mate_formatter_spec.rb
-- spec/rspec/core/hooks_filtering_spec.rb
-- spec/rspec/core/hooks_spec.rb
-- spec/rspec/core/kernel_extensions_spec.rb
-- spec/rspec/core/let_spec.rb
-- spec/rspec/core/metadata_spec.rb
-- spec/rspec/core/option_parser_spec.rb
-- spec/rspec/core/pending_example_spec.rb
-- spec/rspec/core/rake_task_spec.rb
-- spec/rspec/core/reporter_spec.rb
-- spec/rspec/core/resources/a_bar.rb
-- spec/rspec/core/resources/a_foo.rb
-- spec/rspec/core/resources/a_spec.rb
-- spec/rspec/core/resources/custom_example_group_runner.rb
-- spec/rspec/core/resources/formatter_specs.rb
-- spec/rspec/core/resources/utf8_encoded.rb
-- spec/rspec/core/ruby_project_spec.rb
-- spec/rspec/core/runner_spec.rb
-- spec/rspec/core/shared_context_spec.rb
-- spec/rspec/core/shared_example_group_spec.rb
-- spec/rspec/core/subject_spec.rb
-- spec/rspec/core/world_spec.rb
-- spec/rspec/core_spec.rb
-- spec/ruby_forker.rb
-- spec/spec_helper.rb
-- spec/support/matchers.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..2a09a14
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,11 @@
+$: << 'lib' << 'spec' << '.'
+EXC_TESTS = [
+  # needs nokogiri
+  'spec/rspec/core/formatters/text_mate_formatter_spec.rb',
+  'spec/rspec/core/formatters/html_formatter_spec.rb',
+  # pending
+  'spec/rspec/core/resources/formatter_specs.rb',
+  # drb
+  'spec/rspec/core/drb_command_line_spec.rb'
+]
+(Dir['spec/rspec/**/*.rb'] - EXC_TESTS).each { |f| require f }
diff --git a/debian/rules b/debian/rules
index a5e7dc8..d9042d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,7 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	dh_auto_install
+	rm debian/ruby-rspec-core/usr/bin/autospec

-- 
ruby-rspec-core.git



More information about the Pkg-ruby-extras-commits mailing list