[DRE-commits] [schleuder] 03/04: d/patches: Refresh patchs according new upstream (remove applied ones)

[Sebastien Badia]

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

sbadia pushed a commit to branch 3.0.0_beta14-1
in repository schleuder.

commit 323cf4976776a67e663c234ade71c9edb399f788
Author: Sebastien Badia <sbadia at debian.org>
Date:   Wed Jan 4 18:54:30 2017 +0100

    d/patches: Refresh patchs according new upstream (remove applied ones)
---
 debian/patches/0001-lib-fix-paths.patch       | 15 ++-------------
 debian/patches/0002-etc-fix-paths.patch       |  2 +-
 debian/patches/0003-bin-fix-require.patch     |  4 ++--
 debian/patches/0004-spec-remove-bundler.patch |  2 +-
 debian/patches/0005-spec-fix-log-path.patch   | 19 -------------------
 debian/patches/series                         |  1 -
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/debian/patches/0001-lib-fix-paths.patch b/debian/patches/0001-lib-fix-paths.patch
index 0237527..6cda4c6 100644
--- a/debian/patches/0001-lib-fix-paths.patch
+++ b/debian/patches/0001-lib-fix-paths.patch
@@ -5,20 +5,9 @@ Author: Georg Faerber <georg at riseup.net>
 Last-Update: 2016-12-06
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/schleuder/conf.rb
-+++ b/lib/schleuder/conf.rb
-@@ -91,7 +91,7 @@
-     end
- 
-     def self.load_defaults(basename)
--      file = Pathname.new(ENV['SCHLEUDER_ROOT']).join("etc/#{basename}.yml")
-+      file = Pathname.new(ENV['SCHLEUDER_CONFIG'])
-       if ! file.readable?
-         raise RuntimeError, "Error: '#{file}' is not a readable file."
-       end
 --- a/lib/schleuder/cli.rb
 +++ b/lib/schleuder/cli.rb
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ module Schleuder
      desc 'install', "Set-up or update Schleuder environment (create folders, copy files, fill the database)."
      def install
        config_dir = Pathname.new(ENV['SCHLEUDER_CONFIG']).dirname
@@ -29,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        if Dir.glob("#{Conf.lists_dir}/*/*/members.conf").size > 0
 --- a/lib/schleuder.rb
 +++ b/lib/schleuder.rb
-@@ -73,6 +73,7 @@
+@@ -73,6 +73,7 @@ Mail.defaults do
  end
  
  I18n.load_path += Dir["#{rootdir}/locales/*.yml"]
diff --git a/debian/patches/0002-etc-fix-paths.patch b/debian/patches/0002-etc-fix-paths.patch
index 30cb1c0..8f74874 100644
--- a/debian/patches/0002-etc-fix-paths.patch
+++ b/debian/patches/0002-etc-fix-paths.patch
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  # Schleuder reads plugins also from this directory.
  plugins_dir: /etc/schleuder/plugins
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ smtp_settings:
  database:
    production:
      adapter:  'sqlite3'
diff --git a/debian/patches/0003-bin-fix-require.patch b/debian/patches/0003-bin-fix-require.patch
index e353fd2..b6cb031 100644
--- a/debian/patches/0003-bin-fix-require.patch
+++ b/debian/patches/0003-bin-fix-require.patch
@@ -8,7 +8,7 @@ Last-Update: 2016-12-06
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/bin/schleuder
 +++ b/bin/schleuder
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ trap("INT") { exit 1 }
  
  
  begin
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    $stderr.puts exc.to_s
 --- a/bin/schleuder-api-daemon
 +++ b/bin/schleuder-api-daemon
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ require 'sinatra/base'
  require 'sinatra/json'
  require 'sinatra/namespace'
  require 'thin'
diff --git a/debian/patches/0004-spec-remove-bundler.patch b/debian/patches/0004-spec-remove-bundler.patch
index 53c3be3..8eb0b7f 100644
--- a/debian/patches/0004-spec-remove-bundler.patch
+++ b/debian/patches/0004-spec-remove-bundler.patch
@@ -14,4 +14,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -Bundler.setup
  require 'schleuder'
  require 'database_cleaner'
- 
+ require 'factory_girl'
diff --git a/debian/patches/0005-spec-fix-log-path.patch b/debian/patches/0005-spec-fix-log-path.patch
deleted file mode 100644
index 3437e40..0000000
--- a/debian/patches/0005-spec-fix-log-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: spec/: Comment (to disable) failing test 
- One of the test provided by upstream is currently failing. This is
- fixed already in the master upstream branch, and will be included in
- the next release. Up until then, we're disabling the test.
-Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/schleuder/list_spec.rb
-+++ b/spec/schleuder/list_spec.rb
-@@ -270,7 +270,7 @@
-         fingerprint: "aaaadddd0000999",
-       )
- 
--      expect(list.logfile).to eq "/var/schleuder/lists/bar.org/foo/list.log"
-+      #expect(list.logfile).to eq File.join(Schleuder::Conf.listlogs_dir, "bar.org/foo/list.log")
-     end
-   end
- 
diff --git a/debian/patches/series b/debian/patches/series
index ee0b7b4..035e489 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-lib-fix-paths.patch
-0005-spec-fix-log-path.patch
 0004-spec-remove-bundler.patch
 0003-bin-fix-require.patch
 0002-etc-fix-paths.patch

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