[DRE-commits] [ruby-rack-flash3] 01/07: Imported Debian patch 1.0.5-1

Tue Aug 9 15:09:47 UTC 2016

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-rack-flash3.

commit 0dfa33003da3ca3ae1c352b47d38a02d4e581a8e
Author: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
Date:   Tue Sep 3 07:57:24 2013 -0300

    Imported Debian patch 1.0.5-1
---
 debian/changelog                  | 19 +++----------------
 debian/compat                     |  2 +-
 debian/control                    | 21 ++++++---------------
 debian/copyright                  |  2 +-
 debian/patches/fix_requires.patch |  7 +------
 debian/ruby-tests.rake            | 12 ++++++++----
 debian/rules                      | 13 +++++++++++--
 7 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 374991a..ec8a847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,8 @@
-ruby-rack-flash3 (1.0.5-1) unstable; urgency=medium
+ruby-rack-flash3 (1.0.5-1) unstable; urgency=low
 
-  [ Cédric Boutillier ]
-  * Bump debhelper compatibility level to 9
-  * Remove version in the gem2deb build-dependency
-  * Use https:// in Vcs-* fields
-  * Run wrap-and-sort on packaging files
+  * New upstream release.
 
-  [ Ben Armstrong ]
-  * Removed myself from Uploaders.
-
-  [ Antonio Terceiro ]
-  * New upstream release
-  * Build with newer gem2deb enables Rubygems integration (Closes: #830924)
-  * Refresh packaging with a `dh-make-ruby -w` run
-  * fix_requires.patch: amend to also fix running tests under autopkgtest
-
- -- Antonio Terceiro <terceiro at debian.org>  Tue, 09 Aug 2016 09:00:41 -0300
+ -- Ben Armstrong <synrg at sanctuary.nslug.ns.ca>  Tue, 03 Sep 2013 07:57:24 -0300
 
 ruby-rack-flash3 (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index 67f58bc..86581ed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,18 @@ Source: ruby-rack-flash3
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 9~),
-               gem2deb,
-               rake,
-               ruby-bacon,
-               ruby-rack-test,
-               ruby-sinatra
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-rack-flash3.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-rack-flash3.git
+Uploaders: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.1~), rake, ruby-rack-test, ruby-bacon, ruby-sinatra
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rack-flash3.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-rack-flash3.git;a=summary
 Homepage: https://github.com/treeder/rack-flash
-Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-rack-flash3
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ruby | ruby-interpreter,
-         ruby-rack,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rack
 Suggests: ruby-sinatra
 Description: Flash hash for Ruby Rack applications
  Rack Flash is a simple flash hash implementation for Rack apps. This version
diff --git a/debian/copyright b/debian/copyright
index bb182a8..dde68ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rack-flash3
-Source: https://github.com/treeder/rack-flash
+Source: https://github.com/treeder/rack-flash 
 
 Files: *
 Copyright: 2013 Pat Nakajima <patnakajima at gmail.com>
diff --git a/debian/patches/fix_requires.patch b/debian/patches/fix_requires.patch
index 5f76115..499db15 100644
--- a/debian/patches/fix_requires.patch
+++ b/debian/patches/fix_requires.patch
@@ -9,17 +9,12 @@ Forwarded: no
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,9 +1,7 @@
+@@ -1,5 +1,3 @@
 -require 'rubygems'
 -gem 'sinatra', '<=1.3.2'
  require 'sinatra/base'
  require 'bacon'
  require 'rack/test'
--require File.join(File.dirname(__FILE__), *%w[.. lib rack-flash])
-+require 'rack-flash'
- 
- class String
-   [:green, :yellow, :red].each { |c| define_method(c) { self } }
 @@ -48,4 +46,4 @@ module Rack
        @sweeped
      end
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 63f3fd6..f384e31 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,10 @@
-require 'gem2deb/rake/testtask'
+require 'rake'
+require 'rake/testtask'
 
-Gem2Deb::Rake::TestTask.new do |t|
-  t.libs = ['test']
-  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
+
+task :default => :test
diff --git a/debian/rules b/debian/rules
index 8a5f92e..5ce1e4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,15 @@
 #!/usr/bin/make -f
-
-export GEM2DEB_TEST_RUNNER = --check-dependencies
+#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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rack-flash3.git

