[DRE-commits] [ruby-tioga] 02/02: Prepare new upstream version

[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 ee54a3c1ed667522da595e3e4754dd81c879a766
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Sep 14 22:22:11 2015 +0200

    Prepare new upstream version
---
 debian/changelog                   |  8 ++++++++
 debian/patches/newer-setup-rb.diff | 25 ++++++++++++-------------
 debian/patches/series              |  3 +--
 debian/watch                       |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7f451e..61cebb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-tioga (1.19.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Adapt the patches based on ideas from 
+    https://github.com/fourmond/tioga/pull/2/commits (but not exactly, though)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 14 Sep 2015 22:42:42 +0200
+
 ruby-tioga (1.18-2) unstable; urgency=medium
 
   * Use more recent setup.rb + explicit load path for scripts, to avoid FTBSes 
diff --git a/debian/patches/newer-setup-rb.diff b/debian/patches/newer-setup-rb.diff
index 269b5d1..f5fa31e 100644
--- a/debian/patches/newer-setup-rb.diff
+++ b/debian/patches/newer-setup-rb.diff
@@ -1,16 +1,3 @@
-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
@@ -24,3 +11,15 @@ Index: ruby-tioga/pre-setup.rb
    File.open("bin/repreview", 'w') do |f|
      f.puts '#!/bin/sh'
      f.puts "osascript #{config('bindir')}/Reload_Preview_Document.scpt $*"
+Index: ruby-tioga/misc/mk_tioga_sty.rb
+===================================================================
+--- ruby-tioga.orig/misc/mk_tioga_sty.rb
++++ ruby-tioga/misc/mk_tioga_sty.rb
+@@ -4,6 +4,7 @@
+ require 'date'
+ 
+ # We make up the color constants from the Tioga file.
++$: << "."
+ require 'lib/Tioga/ColorConstants.rb'
+ 
+ # Generate colors
diff --git a/debian/patches/series b/debian/patches/series
index 58bd38f..e3202b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-require-rubygems.diff
-newer-setup-rb.diff
-
+newer-setup-rb.diff 
diff --git a/debian/watch b/debian/watch
index d1750e6..c3aeaae 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,4 +5,4 @@
 
 # Compulsory line, this is a version 3 file
 version=3
-http://rubyforge.org/frs/?group_id=701 .*tioga-([\d.-]*)\.t.*
+http://sf.net/tioga/tioga-(.*).tar.xz

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