[DRE-commits] [schleuder] 08/13: debian/patches: Refresh for release 3.2.1-1

[Georg Faerber]

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

georg-alioth-guest pushed a commit to branch master
in repository schleuder.

commit ab8073bec7d46a272d139854b9fef070ff4b3637
Author: Georg Faerber <georg at riseup.net>
Date:   Mon Oct 23 12:08:48 2017 +0200

    debian/patches: Refresh for release 3.2.1-1
---
 debian/patches/0001-lib-fix-paths.patch   | 17 +++++++++++++++--
 debian/patches/0003-bin-fix-require.patch | 17 ++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-lib-fix-paths.patch b/debian/patches/0001-lib-fix-paths.patch
index c11966a..792941d 100644
--- a/debian/patches/0001-lib-fix-paths.patch
+++ b/debian/patches/0001-lib-fix-paths.patch
@@ -6,15 +6,17 @@ Description: lib/: Fix paths
  Additionally, add '/usr/share/schleuder/locales/*.yml' to the locales
  load path. 
 
+ Use 'require' instead of 'require_relative'.
+
  Upstream is aware of this patch and we're working on integrating it
  upstream.
 Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-06-25
+Last-Update: 2017-10-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/lib/schleuder/conf.rb
 +++ b/lib/schleuder/conf.rb
-@@ -7,7 +7,7 @@
+@@ -9,7 +9,7 @@
  
      DEFAULTS = {
        'lists_dir' => '/var/lib/schleuder/lists',
@@ -44,3 +46,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  I18n.enforce_available_locales = true
  I18n.default_locale = :en
  
+--- a/lib/schleuder-api-daemon.rb
++++ b/lib/schleuder-api-daemon.rb
+@@ -7,7 +7,7 @@
+ require 'sinatra/json'
+ require 'sinatra/namespace'
+ require 'thin'
+-require_relative '../lib/schleuder.rb'
++require 'schleuder'
+ 
+ 
+ %w[tls_cert_file tls_key_file].each do |config_key|
diff --git a/debian/patches/0003-bin-fix-require.patch b/debian/patches/0003-bin-fix-require.patch
index 1236b24..b03e8af 100644
--- a/debian/patches/0003-bin-fix-require.patch
+++ b/debian/patches/0003-bin-fix-require.patch
@@ -8,7 +8,7 @@ Description: bin/: Use 'require' or 'require_relative'
 
  Upstream is aware of this patch and we're working on integrating it.
 Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2017-07-17
+Last-Update: 2017-10-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/bin/schleuder
@@ -28,12 +28,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +Schleuder::Cli.start
 --- a/bin/schleuder-api-daemon
 +++ b/bin/schleuder-api-daemon
-@@ -7,7 +7,7 @@
- require 'sinatra/json'
- require 'sinatra/namespace'
- require 'thin'
--require_relative '../lib/schleuder.rb'
-+require 'schleuder'
+@@ -1,4 +1,4 @@
+ #!/usr/bin/env ruby
  
- 
- %w[tls_cert_file tls_key_file].each do |config_key|
+-require_relative '../lib/schleuder-api-daemon'
+-SchleuderApiDaemon.run!
+\ No newline at end of file
++require 'schleuder-api-daemon'
++SchleuderApiDaemon.run!

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