[DRE-commits] [SCM] ruby-shoulda-matchers.git branch, master, updated. 066f7ba03ba3405c0db9d09cee7fd1ac7ca6b7c7

Tue Jun 7 05:24:07 UTC 2011

The following commit has been merged in the master branch:
commit 066f7ba03ba3405c0db9d09cee7fd1ac7ca6b7c7
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Mon Jun 6 22:20:19 2011 -0700

    Adjusting packaging files

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..1feac8d
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,8 @@
+Missing dependencies that prevent us from running the tests during build:
+# rails (= 3.0.3, development
+# sqlite3-ruby (~> 1.3.2, development
+# mocha (~> 0.9.10, development
+# rspec-rails (~> 2.3.0, development
+# cucumber (~> 0.10.0, development
+# aruba (~> 0.2.7, development
+# ruby-debug (~> 0.10.4, development)
diff --git a/debian/changelog b/debian/changelog
index c058aad..f5bd945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-shoulda-matchers (1.0.0.beta2-1) UNRELEASED; urgency=low
+ruby-shoulda-matchers (1.0.0~beta2-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #626016)
 
  -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 08 Apr 2011 01:38:22 -0700
diff --git a/debian/control b/debian/control
index 9cea161..6110ffb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,18 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Antonio Terceiro <terceiro at softwarelivre.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
-Standards-Version: 3.9.1
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-shoulda-matchers.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-shoulda-matchers.git;a=summary
-Homepage: http://thoughtbot.com/community/
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-shoulda-matchers.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-shoulda-matchers.git;a=summary
+Homepage: https://github.com/thoughtbot/shoulda-matchers
 XS-Ruby-Versions: all
 
 Package: ruby-shoulda-matchers
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-# rails (= 3.0.3, development), sqlite3-ruby (~> 1.3.2, development), mocha (~> 0.9.10, development), rspec-rails (~> 2.3.0, development), cucumber (~> 0.10.0, development), aruba (~> 0.2.7, development), ruby-debug (~> 0.10.4, development)
-Description: Making tests easy on the fingers and eyes
- Making tests easy on the fingers and eyes
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Conflicts: libshoulda-ruby (<< 2.11.3-1~), libshoulda-ruby1.8 (<< 2.11.3-1~)
+Description: Test helpers for Rails applications, compatible with Test::Unit and RSpec
+ Test::Unit- and RSpec-compatible one-liners that test common Rails
+ functionality. These tests would otherwise be much longer, more complex, and
+ error-prone.
diff --git a/debian/copyright b/debian/copyright
index 3e731e3..3ad6876 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,30 +4,32 @@ Upstream-Name: shoulda-matchers
 Source: FIXME (URL where source can be downloaded)
 
 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.
+Copyright:
+ Copyright © 2007, Tammer Saleh, Thoughtbot, Inc.
+ Copyright © 2006-2010 thoughtbot, inc.
+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:
  .
- 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.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- 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'.
+ 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>
+Copyright: Copyright © 2011 Antonio Terceiro <terceiro at softwarelivre.org>
 License:
- [LICENSE TEXT]
+ The same as the original package.
diff --git a/debian/ruby-shoulda-matchers.docs b/debian/ruby-shoulda-matchers.docs
index 0d5eab8..e475c53 100644
--- a/debian/ruby-shoulda-matchers.docs
+++ b/debian/ruby-shoulda-matchers.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.rdoc
+README.rdoc
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..9c45abe
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,3 @@
+task :default do
+  puts "FIXME: tests not running because of missing dependencies"
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index eac5ce6..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# FIXME
-# there's a spec/ or a test/ directory in the upstream source, but
-# no test suite was defined in the Gem specification. It would be
-# a good idea to define it here so the package gets tested at build time.
-# Examples:
-# $: << 'lib' << '.'
-# Dir['{spec,test}/**/*.rb'].each { |f| require f }
-#
-# require 'test/ts_foo.rb'
-#
-# require 'rbconfig'
-# ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-# exec("#{ruby} -I. test/runtests.rb")
diff --git a/debian/rules b/debian/rules
index a5e7dc8..c6142f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,4 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

-- 
ruby-shoulda-matchers.git

