[DRE-commits] [ruby-responders] 03/05: Update patches

[Lucas Moura]

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

lucasmoura-guest pushed a commit to branch master
in repository ruby-responders.

commit b9c528a0b1c964fed3f6919b95f5df35275eea00
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Wed Mar 2 16:25:27 2016 -0300

    Update patches
---
 debian/changelog                           |  5 +++++
 debian/patches/{Bundler => bundler.patch}  |  9 ++++-----
 debian/patches/series                      |  3 +--
 debian/patches/test-against-rails4.1.patch | 11 -----------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00b43f2..a58da04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ ruby-responders (2.1.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * debian/patches: Remove patches that were already applied on the new
+                    upstream version and removing test-against-rails4.1
+                    patch, that is no longer necessary.
+  * debian/patches/bundler.patch: Update patch so it fits a proper patch
+                                  format.
 
  -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Wed, 02 Mar 2016 15:50:01 -0300
 
diff --git a/debian/patches/Bundler b/debian/patches/bundler.patch
similarity index 78%
rename from debian/patches/Bundler
rename to debian/patches/bundler.patch
index fb08227..5c58008 100644
--- a/debian/patches/Bundler
+++ b/debian/patches/bundler.patch
@@ -1,11 +1,10 @@
 Description: remove the bundler dependency
  Prevent bundler from handling the gems.
- .
- ruby-responders (2.0.2-1) UNRELEASED; urgency=medium
- .
-   * Initial release (Closes: #nnnn)
+ 
 Author: Balasankar C <balasankarc at autistici.org>
-
+Last-updated: 2014-11-15
+Forwarded: not-needed
+Bug: not-needed
 
 --- ruby-responders-2.0.2.orig/test/test_helper.rb
 +++ ruby-responders-2.0.2/test/test_helper.rb
diff --git a/debian/patches/series b/debian/patches/series
index ffe9838..cb32c63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-Bundler
-test-against-rails4.1.patch
+bundler.patch
diff --git a/debian/patches/test-against-rails4.1.patch b/debian/patches/test-against-rails4.1.patch
deleted file mode 100644
index 8b452fd..0000000
--- a/debian/patches/test-against-rails4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -32,8 +32,6 @@ class ApplicationController < ActionCont
- end
- 
- class ActiveSupport::TestCase
--  self.test_order = :random
--
-   setup do
-     @routes = Responders::Routes
-   end

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