diff --git a/debian/patches/add-iface.patch b/debian/patches/add-iface.patch index 3a1eab9..b29200c 100644 --- a/debian/patches/add-iface.patch +++ b/debian/patches/add-iface.patch @@ -15,11 +15,11 @@ 2 files changed, 3990 insertions(+), 2 deletions(-) create mode 100644 Scintilla.iface -diff --git a/Rakefile b/Rakefile -index 8e3b7ae..624f813 100755 ---- a/Rakefile -+++ b/Rakefile -@@ -331,8 +331,8 @@ namespace :fxruby do +Index: ruby-fxruby.git/Rakefile +=================================================================== +--- ruby-fxruby.git.orig/Rakefile ++++ ruby-fxruby.git/Rakefile +@@ -347,8 +347,8 @@ namespace :fxruby do end task :scintilla => 'lib/fox16/scintilla.rb' @@ -30,11 +30,10 @@ end task :generate_kwargs_lib => 'lib/fox16/kwargs.rb' -diff --git a/Scintilla.iface b/Scintilla.iface -new file mode 100644 -index 0000000..827e725 +Index: ruby-fxruby.git/Scintilla.iface +=================================================================== --- /dev/null -+++ b/Scintilla.iface ++++ ruby-fxruby.git/Scintilla.iface @@ -0,0 +1,3988 @@ +## First line may be used for shbang + diff --git a/debian/patches/do-not-use-git-ls.patch b/debian/patches/do-not-use-git-ls.patch index 3d7ea77..8827445 100644 --- a/debian/patches/do-not-use-git-ls.patch +++ b/debian/patches/do-not-use-git-ls.patch @@ -8,13 +8,13 @@ fxruby.gemspec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/fxruby.gemspec b/fxruby.gemspec -index f32945b..366b7dc 100644 ---- a/fxruby.gemspec -+++ b/fxruby.gemspec -@@ -34,9 +34,8 @@ Gem::Specification.new do |spec| - spec.homepage = "https://github.com/larskanis/fxruby" - spec.license = 'LGPL-2.1' +Index: ruby-fxruby.git/fxruby.gemspec +=================================================================== +--- ruby-fxruby.git.orig/fxruby.gemspec ++++ ruby-fxruby.git/fxruby.gemspec +@@ -36,9 +36,8 @@ Gem::Specification.new do |spec| + spec.metadata["changelog_uri"] = "https://github.com/larskanis/fxruby/blob/1.6/History.md" + spec.metadata["documentation_uri"] = "https://rubydoc.info/gems/fxruby/frames" - spec.files = `git ls-files -z`.split("\x0").reject do |f| - f=~/^fox-includes|^web/ diff --git a/debian/patches/dont-run-test.patch b/debian/patches/dont-run-test.patch index 2ce20ec..7c3f379 100644 --- a/debian/patches/dont-run-test.patch +++ b/debian/patches/dont-run-test.patch @@ -9,11 +9,11 @@ Rakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/Rakefile b/Rakefile -index 76cb249..d2e95e1 100755 ---- a/Rakefile -+++ b/Rakefile -@@ -81,9 +81,9 @@ CLEAN.include( ".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_ +Index: ruby-fxruby.git/Rakefile +=================================================================== +--- ruby-fxruby.git.orig/Rakefile ++++ ruby-fxruby.git/Rakefile +@@ -81,9 +81,9 @@ CLEAN.include( ".config", "ext/fox16_c/M CLOBBER.include( "pkg" ) # Make sure extension is built before tests are run diff --git a/debian/patches/drop-failing-test.patch b/debian/patches/drop-failing-test.patch index 9a2d707..00c1817 100644 --- a/debian/patches/drop-failing-test.patch +++ b/debian/patches/drop-failing-test.patch @@ -11,10 +11,10 @@ test/TC_FXVec4f.rb | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/test/TC_FXApp.rb b/test/TC_FXApp.rb -index 385074f..d989047 100755 ---- a/test/TC_FXApp.rb -+++ b/test/TC_FXApp.rb +Index: ruby-fxruby.git/test/TC_FXApp.rb +=================================================================== +--- ruby-fxruby.git.orig/test/TC_FXApp.rb ++++ ruby-fxruby.git/test/TC_FXApp.rb @@ -3,15 +3,15 @@ require 'fox16' require 'testcase' require 'socket' @@ -40,10 +40,10 @@ class TC_FXApp2 < Fox::TestCase include Fox -diff --git a/test/TC_FXId.rb b/test/TC_FXId.rb -index 7e677e6..ad46c51 100755 ---- a/test/TC_FXId.rb -+++ b/test/TC_FXId.rb +Index: ruby-fxruby.git/test/TC_FXId.rb +=================================================================== +--- ruby-fxruby.git.orig/test/TC_FXId.rb ++++ ruby-fxruby.git/test/TC_FXId.rb @@ -12,7 +12,7 @@ class TC_FXId < Fox::TestCase def test_created? assert !mainWindow.created? @@ -53,11 +53,11 @@ mainWindow.destroy assert !mainWindow.created? end -diff --git a/test/TC_FXMainWindow.rb b/test/TC_FXMainWindow.rb -index d8267fb..68179a0 100644 ---- a/test/TC_FXMainWindow.rb -+++ b/test/TC_FXMainWindow.rb -@@ -10,11 +10,11 @@ class TC_FXMainWindow < Test::Unit::TestCase +Index: ruby-fxruby.git/test/TC_FXMainWindow.rb +=================================================================== +--- ruby-fxruby.git.orig/test/TC_FXMainWindow.rb ++++ ruby-fxruby.git/test/TC_FXMainWindow.rb +@@ -10,11 +10,11 @@ class TC_FXMainWindow < Test::Unit::Test end end @@ -76,11 +76,11 @@ +# end +# end end -diff --git a/test/TC_FXMaterial.rb b/test/TC_FXMaterial.rb -index 2ac01b2..771bbe0 100755 ---- a/test/TC_FXMaterial.rb -+++ b/test/TC_FXMaterial.rb -@@ -68,7 +68,7 @@ class TC_FXMaterial < Test::Unit::TestCase +Index: ruby-fxruby.git/test/TC_FXMaterial.rb +=================================================================== +--- ruby-fxruby.git.orig/test/TC_FXMaterial.rb ++++ ruby-fxruby.git/test/TC_FXMaterial.rb +@@ -68,7 +68,7 @@ class TC_FXMaterial < Test::Unit::TestCa mat.ambient = FXVec4f.new(0, 0, 0, 0) cube.setMaterial(0, mat) mat2 = cube.getMaterial(0) @@ -89,10 +89,10 @@ assert_instance_of(FXVec4f, mat2.specular) assert_instance_of(FXVec4f, mat2.diffuse) end -diff --git a/test/TC_FXVec4f.rb b/test/TC_FXVec4f.rb -index 3958c52..027af86 100755 ---- a/test/TC_FXVec4f.rb -+++ b/test/TC_FXVec4f.rb +Index: ruby-fxruby.git/test/TC_FXVec4f.rb +=================================================================== +--- ruby-fxruby.git.orig/test/TC_FXVec4f.rb ++++ ruby-fxruby.git/test/TC_FXVec4f.rb @@ -133,10 +133,10 @@ class TC_FXVec4f < Test::Unit::TestCase assert_equal(2.0, v.length) end diff --git a/debian/patches/fix-path-headers.patch b/debian/patches/fix-path-headers.patch index cb39578..1d1b155 100644 --- a/debian/patches/fix-path-headers.patch +++ b/debian/patches/fix-path-headers.patch @@ -12,10 +12,10 @@ scripts/build-fox.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/ext/fox16_c/FXRbApp.cpp b/ext/fox16_c/FXRbApp.cpp -index 397aeea..7437c20 100644 ---- a/ext/fox16_c/FXRbApp.cpp -+++ b/ext/fox16_c/FXRbApp.cpp +Index: ruby-fxruby.git/ext/fox16_c/FXRbApp.cpp +=================================================================== +--- ruby-fxruby.git.orig/ext/fox16_c/FXRbApp.cpp ++++ ruby-fxruby.git/ext/fox16_c/FXRbApp.cpp @@ -24,7 +24,7 @@ * $Id: FXRbApp.cpp 2902 2008-12-11 14:09:20Z lyle $ ***********************************************************************/ @@ -25,30 +25,30 @@ #ifdef HAVE_SYS_TIME_H #include /* For struct timeval */ -diff --git a/ext/fox16_c/extconf.rb b/ext/fox16_c/extconf.rb -index 5b13f97..57f08cf 100755 ---- a/ext/fox16_c/extconf.rb -+++ b/ext/fox16_c/extconf.rb +Index: ruby-fxruby.git/ext/fox16_c/extconf.rb +=================================================================== +--- ruby-fxruby.git.orig/ext/fox16_c/extconf.rb ++++ ruby-fxruby.git/ext/fox16_c/extconf.rb @@ -1,4 +1,4 @@ -#!/bin/env ruby +#!/usr/bin/env ruby require 'fileutils' require 'mkmf' -diff --git a/ext/fox16_c/make_impl.rb b/ext/fox16_c/make_impl.rb -index 3cf4377..91b6a64 100755 ---- a/ext/fox16_c/make_impl.rb -+++ b/ext/fox16_c/make_impl.rb +Index: ruby-fxruby.git/ext/fox16_c/make_impl.rb +=================================================================== +--- ruby-fxruby.git.orig/ext/fox16_c/make_impl.rb ++++ ruby-fxruby.git/ext/fox16_c/make_impl.rb @@ -1,4 +1,4 @@ -#!/bin/env ruby +#!/usr/bin/env ruby $special_stubclasses = ["FXGLSHAPE", "FXICONITEM", "FXTABLE", "FXTABLEITEM", "FXTEXT", "FXTREEITEM"] -diff --git a/scripts/build-fox.rb b/scripts/build-fox.rb -index 0d3e747..0b62e9f 100755 ---- a/scripts/build-fox.rb -+++ b/scripts/build-fox.rb +Index: ruby-fxruby.git/scripts/build-fox.rb +=================================================================== +--- ruby-fxruby.git.orig/scripts/build-fox.rb ++++ ruby-fxruby.git/scripts/build-fox.rb @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/ruby diff --git a/debian/patches/fix-scintilla-not-in-scope.patch b/debian/patches/fix-scintilla-not-in-scope.patch index 8b7632a..705abf8 100644 --- a/debian/patches/fix-scintilla-not-in-scope.patch +++ b/debian/patches/fix-scintilla-not-in-scope.patch @@ -9,10 +9,10 @@ swig-interfaces/scintilla.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/swig-interfaces/scintilla.i b/swig-interfaces/scintilla.i -index 5584b68..08f0c76 100644 ---- a/swig-interfaces/scintilla.i -+++ b/swig-interfaces/scintilla.i +Index: ruby-fxruby.git/swig-interfaces/scintilla.i +=================================================================== +--- ruby-fxruby.git.orig/swig-interfaces/scintilla.i ++++ ruby-fxruby.git/swig-interfaces/scintilla.i @@ -49,9 +49,9 @@ %include freefuncs.i diff --git a/debian/patches/installation-with-rakefile.patch b/debian/patches/installation-with-rakefile.patch index 71dd8da..0072a5f 100644 --- a/debian/patches/installation-with-rakefile.patch +++ b/debian/patches/installation-with-rakefile.patch @@ -9,10 +9,10 @@ Rakefile | 138 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 74 insertions(+), 64 deletions(-) -diff --git a/Rakefile b/Rakefile -index 624f813..76cb249 100755 ---- a/Rakefile -+++ b/Rakefile +Index: ruby-fxruby.git/Rakefile +=================================================================== +--- ruby-fxruby.git.orig/Rakefile ++++ ruby-fxruby.git/Rakefile @@ -7,67 +7,67 @@ require 'bundler/gem_helper' require './lib/fox16/version.rb' @@ -161,7 +161,7 @@ gem_spec = Bundler.load_gemspec('fxruby.gemspec') -@@ -139,8 +149,8 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext| +@@ -140,8 +150,8 @@ ext_task = Rake::ExtensionTask.new("fox1 end end