[DRE-commits] [ruby-tioga] 01/01: Fix FTBS + conforms to newer standards

[Vincent Fourmond]

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

fourmond pushed a commit to branch master
in repository ruby-tioga.

commit 01b08def5c7933c704f6832f50a8f4f51a195412
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Jul 13 22:54:06 2015 +0200

    Fix FTBS + conforms to newer standards
---
 debian/changelog                   |  8 ++++++++
 debian/control                     |  2 +-
 debian/patches/newer-setup-rb.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series              |  2 ++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a514120..a7f451e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-tioga (1.18-2) unstable; urgency=medium
+
+  * Use more recent setup.rb + explicit load path for scripts, to avoid FTBSes 
+    (closes: #791783)
+  * Already conforms to latest standards
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 13 Jul 2015 23:01:04 +0200
+
 ruby-tioga (1.18-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ff5d72c..266f521 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.ali
 Build-Depends: debhelper (>= 7.0.50~), rdoc,
                libfftw3-dev, zlib1g-dev,
                gem2deb (>= 0.3.0~)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://tioga.rubyforge.org
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-tioga.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-tioga.git;a=summary
diff --git a/debian/patches/newer-setup-rb.diff b/debian/patches/newer-setup-rb.diff
new file mode 100644
index 0000000..269b5d1
--- /dev/null
+++ b/debian/patches/newer-setup-rb.diff
@@ -0,0 +1,26 @@
+Index: ruby-tioga/setup.rb
+===================================================================
+--- ruby-tioga.orig/setup.rb
++++ ruby-tioga/setup.rb
+@@ -786,7 +786,7 @@ class ToplevelInstaller
+     else
+       require 'rbconfig'
+     end
+-    ::Config::CONFIG
++    ::RbConfig::CONFIG
+   end
+ 
+   def initialize(ardir_root, config)
+Index: ruby-tioga/pre-setup.rb
+===================================================================
+--- ruby-tioga.orig/pre-setup.rb
++++ ruby-tioga/pre-setup.rb
+@@ -4,7 +4,7 @@ require 'fileutils'
+ # First, generate include files and preambles
+ system "#{config("rubyprog")} misc/mk_tioga_sty.rb"
+ 
+-if Config::CONFIG["target"] =~ /darwin/i
++if RbConfig::CONFIG["target"] =~ /darwin/i
+   File.open("bin/repreview", 'w') do |f|
+     f.puts '#!/bin/sh'
+     f.puts "osascript #{config('bindir')}/Reload_Preview_Document.scpt $*"
diff --git a/debian/patches/series b/debian/patches/series
index 1de31aa..58bd38f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 disable-require-rubygems.diff
+newer-setup-rb.diff
+

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