[DRE-commits] [ruby-redis-rack] 01/01: Fix patch issues
Balasankar C
balasankarc-guest at moszumanska.debian.org
Wed Dec 24 14:06:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
balasankarc-guest pushed a commit to branch master
in repository ruby-redis-rack.
commit 20421b3f19716d00dbe35627d3c497a69d8ffc36
Author: Balasankar C <balasankarc at autistici.org>
Date: Wed Dec 24 19:27:30 2014 +0530
Fix patch issues
---
.pc/.quilt_patches | 1 -
.pc/.quilt_series | 1 -
.pc/.version | 1 -
.pc/applied-patches | 1 -
.pc/version/test/redis/rack/version_test.rb | 7 -------
.pc/version/test/test_helper.rb | 5 -----
debian/changelog | 7 +++++++
debian/patches/library-path-fix | 21 +++++++++++++++++++++
debian/patches/remove-bundler-dependecy | 19 +++++++++++++++++++
debian/patches/series | 3 ++-
debian/ruby-tests.rake | 9 ++++-----
debian/rules | 4 ----
debian/start-redis-server.sh | 7 -------
debian/stop-redis-server.sh | 5 -----
test/redis/rack/version_test.rb | 2 +-
test/test_helper.rb | 2 +-
16 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index 088eda4..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1 +0,0 @@
-version
diff --git a/.pc/version/test/redis/rack/version_test.rb b/.pc/version/test/redis/rack/version_test.rb
deleted file mode 100644
index 44e2e83..0000000
--- a/.pc/version/test/redis/rack/version_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-describe Redis::Rack::VERSION do
- it 'returns current version' do
- Redis::Rack::VERSION.must_equal '1.5.0'
- end
-end
diff --git a/.pc/version/test/test_helper.rb b/.pc/version/test/test_helper.rb
deleted file mode 100644
index 7b6ca4f..0000000
--- a/.pc/version/test/test_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'bundler/setup'
-require 'minitest/autorun'
-require 'mocha/setup'
-require 'rack'
-require 'rack/session/redis'
diff --git a/debian/changelog b/debian/changelog
index 777e15f..cc8107c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-redis-rack (1.5.0-4) experimental; urgency=medium
+
+ * Debian update
+ * Fix patch issues
+
+ -- Balasankar C <balasankarc at autistici.org> Wed, 24 Dec 2014 19:25:44 +0530
+
ruby-redis-rack (1.5.0-3) experimental; urgency=medium
* Debian update
diff --git a/debian/patches/library-path-fix b/debian/patches/library-path-fix
new file mode 100644
index 0000000..6937554
--- /dev/null
+++ b/debian/patches/library-path-fix
@@ -0,0 +1,21 @@
+Description: <short description, required>
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/redis/rack/version_test.rb
++++ b/test/redis/rack/version_test.rb
+@@ -1,5 +1,5 @@
+ require 'test_helper'
+-
++require 'redis/rack/version'
+ describe Redis::Rack::VERSION do
+ it 'returns current version' do
+ Redis::Rack::VERSION.must_equal '1.5.0'
diff --git a/debian/patches/remove-bundler-dependecy b/debian/patches/remove-bundler-dependecy
new file mode 100644
index 0000000..ae39c21
--- /dev/null
+++ b/debian/patches/remove-bundler-dependecy
@@ -0,0 +1,19 @@
+Description: <short description, required>
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,4 +1,3 @@
+-require 'bundler/setup'
+ require 'minitest/autorun'
+ require 'mocha/setup'
+ require 'rack'
diff --git a/debian/patches/series b/debian/patches/series
index 088eda4..8159255 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-version
+library-path-fix
+remove-bundler-dependecy
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index cfabac6..e0c25ca 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -19,12 +19,11 @@ task :start_redis do
sh 'redis-server --daemonize yes --port 6381&'
end
-task :stop_redis do
- sh 'pkill redis-server'
-end
-require 'gem2deb/rake/testtask'
-
Rake::TestTask.new do |t|
t.libs << 'test'
t.test_files = FileList['test/*/*/*_test.rb']
end
+
+task :stop_redis do
+ sh 'pkill redis-server'
+end
diff --git a/debian/rules b/debian/rules
index cd2f913..d81794d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,3 @@
%:
dh $@ --buildsystem=ruby --with ruby
-
-override_dh_auto_clean:
- dh_auto_clean -O--buildsystem=ruby
-
diff --git a/debian/start-redis-server.sh b/debian/start-redis-server.sh
deleted file mode 100755
index 796f1a7..0000000
--- a/debian/start-redis-server.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-redis-server --daemonize yes --port 6379&
-redis-server --daemonize yes --port 6380&
-redis-server --daemonize yes --port 6381&
diff --git a/debian/stop-redis-server.sh b/debian/stop-redis-server.sh
deleted file mode 100755
index 4174aee..0000000
--- a/debian/stop-redis-server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-pkill redis-server
diff --git a/test/redis/rack/version_test.rb b/test/redis/rack/version_test.rb
index c8ce0fa..44e2e83 100644
--- a/test/redis/rack/version_test.rb
+++ b/test/redis/rack/version_test.rb
@@ -1,5 +1,5 @@
require 'test_helper'
-require 'redis/rack/version'
+
describe Redis::Rack::VERSION do
it 'returns current version' do
Redis::Rack::VERSION.must_equal '1.5.0'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0a579f4..7b6ca4f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,4 +1,4 @@
-#require 'bundler/setup'
+require 'bundler/setup'
require 'minitest/autorun'
require 'mocha/setup'
require 'rack'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-redis-rack.git
More information about the Pkg-ruby-extras-commits
mailing list