[DRE-commits] [ruby-pgplot] 01/03: Refresh patches
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Sun Mar 6 13:05:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository ruby-pgplot.
commit 9dfac7ec9188d44fd290adb0165312971dafb2c2
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Sun Mar 6 21:59:17 2016 +0900
Refresh patches
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
debian/patches/0000-Update-NArray-PATH.patch | 16 +-
.../patches/0001-Add-enable-autobuild-option.patch | 6 +-
.../0002-Add-disable-extra-libs-option.patch | 13 +-
debian/patches/0003-Close-files-in-cogen.rb.patch | 6 +-
.../0004-Be-smart-about-extra-library-checks.patch | 94 +++++-----
debian/patches/0005-extconf.rb.patch | 199 ++++++++++-----------
debian/patches/0006-rm-extconf-auto.rb.patch | 6 +-
.../0007-s.add_dependency-narray-0.7.0.patch | 6 +-
debian/patches/0008-mv-homepage.patch | 6 +-
debian/patches/0009-fix-docs.patch | 44 +++--
10 files changed, 196 insertions(+), 200 deletions(-)
diff --git a/debian/patches/0000-Update-NArray-PATH.patch b/debian/patches/0000-Update-NArray-PATH.patch
index 8787e6d..92efc54 100644
--- a/debian/patches/0000-Update-NArray-PATH.patch
+++ b/debian/patches/0000-Update-NArray-PATH.patch
@@ -1,6 +1,16 @@
---- ruby-pgplot.orig/ext/extconf.rb
-+++ ruby-pgplot/ext/extconf.rb
-@@ -56,8 +56,9 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Sun, 6 Mar 2016 21:59:11 +0900
+Subject: Update-NArray-PATH
+
+---
+ ext/extconf.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index f576b30..e31d94b 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -56,8 +56,9 @@ if narray_h_dir =
find_dir_in_gemspec ||
find_dir_w_file("../"+narray_d,narray_h) ||
find_dir_w_file(gems_dir+narray_d,narray_h) ||
diff --git a/debian/patches/0001-Add-enable-autobuild-option.patch b/debian/patches/0001-Add-enable-autobuild-option.patch
index cf01bd9..a36c9f5 100644
--- a/debian/patches/0001-Add-enable-autobuild-option.patch
+++ b/debian/patches/0001-Add-enable-autobuild-option.patch
@@ -1,7 +1,6 @@
-From 3728b4348e4edcf5d62be38573f7d2a94ac3d089 Mon Sep 17 00:00:00 2001
From: David MacMahon <davidm at astro.berkeley.edu>
Date: Sat, 2 Mar 2013 11:06:42 -0800
-Subject: [PATCH 1/9] Add --enable-autobuild option
+Subject: Add --enable-autobuild option
This enables the automatic download and build of the pgplot library only if the
user provides the --enable-autobuild option. This is more security conscious
@@ -40,6 +39,3 @@ index 64020d1..5891862 100644
exit unless %w[gfortran g77].any?{|cmd| system("which #{cmd}")}
puts "enabling auto-build PGPLOT Library..."
---
-2.1.0
-
diff --git a/debian/patches/0002-Add-disable-extra-libs-option.patch b/debian/patches/0002-Add-disable-extra-libs-option.patch
index f655449..30da143 100644
--- a/debian/patches/0002-Add-disable-extra-libs-option.patch
+++ b/debian/patches/0002-Add-disable-extra-libs-option.patch
@@ -1,7 +1,6 @@
-From c1429180ca4edf03f10486bc7edda891a6205906 Mon Sep 17 00:00:00 2001
From: David MacMahon <davidm at astro.berkeley.edu>
Date: Sat, 2 Mar 2013 11:31:48 -0800
-Subject: [PATCH 2/9] Add --disable-extra-libs option
+Subject: Add --disable-extra-libs option
Some PGPLOT installations have incompletely linked PGPLOT libraries so linking
against libcpgplot requires also linking against other libraries such as
@@ -18,9 +17,11 @@ option provides a solution for this case.
ext/extconf.rb | 100 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 55 insertions(+), 45 deletions(-)
---- ruby-pgplot.orig/ext/extconf.rb
-+++ ruby-pgplot/ext/extconf.rb
-@@ -15,11 +15,18 @@
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index e31d94b..d091c5d 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -15,11 +15,18 @@ require "mkmf"
#$DEBUG = true
@@ -40,7 +41,7 @@ option provides a solution for this case.
# configure options:
# --with-pgplot-dir=path
-@@ -68,56 +75,59 @@
+@@ -68,56 +75,59 @@ if RUBY_PLATFORM =~ /cygwin|mingw/
exit unless have_library("narray","na_make_object")
end
diff --git a/debian/patches/0003-Close-files-in-cogen.rb.patch b/debian/patches/0003-Close-files-in-cogen.rb.patch
index 46c1cc7..4756133 100644
--- a/debian/patches/0003-Close-files-in-cogen.rb.patch
+++ b/debian/patches/0003-Close-files-in-cogen.rb.patch
@@ -1,7 +1,6 @@
-From 7d4f2b015b42d7feaba081693c070777e97b648d Mon Sep 17 00:00:00 2001
From: David MacMahon <davidm at astro.berkeley.edu>
Date: Sun, 3 Mar 2013 11:03:03 -0800
-Subject: [PATCH 3/9] Close files in cogen.rb
+Subject: Close files in cogen.rb
This is important for running cogen.rb from within Rakefile. Without
explicitly closing the output file, a truncated version of rb_pgplot.c
@@ -24,6 +23,3 @@ index aabbae4..d5cebdc 100644
end
cogen_pgplot if $0 == __FILE__
---
-2.1.0
-
diff --git a/debian/patches/0004-Be-smart-about-extra-library-checks.patch b/debian/patches/0004-Be-smart-about-extra-library-checks.patch
index abe689e..551abf1 100644
--- a/debian/patches/0004-Be-smart-about-extra-library-checks.patch
+++ b/debian/patches/0004-Be-smart-about-extra-library-checks.patch
@@ -1,7 +1,6 @@
-From e298079fb35e4b6ad3dd38b7745f4409816f5691 Mon Sep 17 00:00:00 2001
From: David MacMahon <davidm at astro.berkeley.edu>
Date: Sun, 3 Mar 2013 11:04:45 -0800
-Subject: [PATCH 4/9] Be smart about extra library checks
+Subject: Be smart about extra library checks
Try to find libcpgplot before looking for extra libs like x11, gfortran,
png, etc. If the initial check for libcpgplot fails, then look for the
@@ -11,9 +10,11 @@ the --enable-extra-libs option.
ext/extconf.rb | 132 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 66 insertions(+), 66 deletions(-)
---- ruby-pgplot.orig/ext/extconf.rb
-+++ ruby-pgplot/ext/extconf.rb
-@@ -15,19 +15,6 @@
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index d091c5d..48d1c1b 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -15,19 +15,6 @@ require "mkmf"
#$DEBUG = true
@@ -33,7 +34,7 @@ the --enable-extra-libs option.
# configure options:
# --with-pgplot-dir=path
# --with-pgplot-include=path
-@@ -75,68 +62,81 @@
+@@ -75,68 +62,81 @@ if RUBY_PLATFORM =~ /cygwin|mingw/
exit unless have_library("narray","na_make_object")
end
@@ -60,46 +61,21 @@ the --enable-extra-libs option.
- puts "failed"
- exit
- end
--
++$have_pgplot = false
++
++# Check PGPLOT Header
++if have_header("cpgplot.h")
+
- # Check GrWin Library (for cygwin (and mingw32?))
- # configure options: --with-grwin
- if with_config("grwin")
- #$LDFLAGS = "-Wl,--subsystem,console "+$LDFLAGS
- if RUBY_PLATFORM =~ /cygwin|mingw/
- $libs += " -mwindows"
-- end
-- exit unless have_library("GrWin", "GWinit")
-- end
--
-- $found_lib = []
--
-- # Check X11 Library
-- if have_library("X11", "XOpenDisplay")
-- $found_lib << 'X11'
-- end
--
-- # Check PNG Library
-- libs_save = $libs
-- $libs = append_library($libs, "z")
-- if have_library("png","png_create_write_struct")
-- $found_lib << 'png'
-- else
-- $libs = libs_save
-- end
--
-- $libs = append_library($libs, "pgplot")
--end # check_extra_libs
--
- $have_pgplot = false
-
- # Check PGPLOT Header
- if have_header("cpgplot.h")
-
-- # Check PGPLOT Library
+ # Check PGPLOT Library without extra libs
- if find_library("cpgplot","cpgbeg", "/usr/lib",
- "/usr/local/lib", "/usr/local/pgplot" )
- $have_pgplot = true
++ if find_library("cpgplot","cpgbeg", "/usr/lib",
++ "/usr/local/lib", "/usr/local/pgplot" )
++ $have_pgplot = true
+ else
+ # Check for extra libs then re-check for PGPLOT library
+ puts "First check for PGPLOT library failed,"
@@ -126,8 +102,11 @@ the --enable-extra-libs option.
+ else
+ puts "failed"
+ exit
-+ end
-+
+ end
+- exit unless have_library("GrWin", "GWinit")
+- end
+
+- $found_lib = []
+ # Check GrWin Library (for cygwin (and mingw32?))
+ # configure options: --with-grwin
+ if with_config("grwin")
@@ -137,20 +116,35 @@ the --enable-extra-libs option.
+ end
+ exit unless have_library("GrWin", "GWinit")
+ end
-+
+
+- # Check X11 Library
+- if have_library("X11", "XOpenDisplay")
+- $found_lib << 'X11'
+- end
+ $found_lib = []
-+
+
+- # Check PNG Library
+- libs_save = $libs
+- $libs = append_library($libs, "z")
+- if have_library("png","png_create_write_struct")
+- $found_lib << 'png'
+- else
+- $libs = libs_save
+- end
+ # configure options:
+ # --with-x11-dir=path
+ # --with-x11-include=path
+ # --with-x11-lib=path
+ dir_config("x11")
-+
+
+- $libs = append_library($libs, "pgplot")
+-end # check_extra_libs
+ # Check X11 Library
+ if have_library("X11", "XOpenDisplay")
+ $found_lib << 'X11'
+ end
-+
+
+-$have_pgplot = false
+ # Check PNG Library
+ libs_save = $libs
+ $libs = append_library($libs, "z")
@@ -159,9 +153,15 @@ the --enable-extra-libs option.
+ else
+ $libs = libs_save
+ end
-+
+
+-# Check PGPLOT Header
+-if have_header("cpgplot.h")
+ $libs = append_library($libs, "pgplot")
-+
+
+- # Check PGPLOT Library
+- if find_library("cpgplot","cpgbeg", "/usr/lib",
+- "/usr/local/lib", "/usr/local/pgplot" )
+- $have_pgplot = true
+ if find_library("cpgplot","cpgbeg", "/usr/lib",
+ "/usr/local/lib", "/usr/local/pgplot" )
+ $have_pgplot = true
diff --git a/debian/patches/0005-extconf.rb.patch b/debian/patches/0005-extconf.rb.patch
index 80b0f7d..1382d00 100644
--- a/debian/patches/0005-extconf.rb.patch
+++ b/debian/patches/0005-extconf.rb.patch
@@ -1,16 +1,17 @@
-From a60b9e464fdfb6e200d81eaa29c242f5eb619a9e Mon Sep 17 00:00:00 2001
From: Masahiro TANAKA <masa16.tanaka at gmail.com>
Date: Tue, 5 Mar 2013 18:46:58 +0900
-Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
- * need to define $found_lib. * define methods to make program structure
- clear. * merge extconf-auto.rb.
+Subject: extconf.rb: * need to check extra-libs before auto-build. * need to
+ define $found_lib. * define methods to make program structure clear. * merge
+ extconf-auto.rb.
---
- ext/extconf.rb | 278 +++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 170 insertions(+), 108 deletions(-)
+ ext/extconf.rb | 280 +++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 171 insertions(+), 109 deletions(-)
---- ruby-pgplot.orig/ext/extconf.rb
-+++ ruby-pgplot/ext/extconf.rb
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 48d1c1b..02a1672 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
@@ -1,30 +1,67 @@
-# extconf.rb : Configure script for Ruby/PGPLOT
-#
@@ -31,7 +32,12 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+def main
+ extconf_start
+ check_narray
-+
+
+-# configure options:
+-# --with-pgplot-dir=path
+-# --with-pgplot-include=path
+-# --with-pgplot-lib=path
+-dir_config("pgplot")
+ $objs = %w(rb_pgplot.o kwarg.o)
+ $enable_autobuild = enable_config('autobuild', false)
+ $found_lib = []
@@ -90,12 +96,6 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+ # --with-opt-lib=path
+end
--# configure options:
--# --with-pgplot-dir=path
--# --with-pgplot-include=path
--# --with-pgplot-lib=path
--dir_config("pgplot")
--
-# Otherwise you can also specify:
-# --with-opt-dir=path
-# --with-opt-include=path
@@ -103,7 +103,7 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
def find_dir_w_file(d,h)
g = Dir.glob(RbConfig.expand(d+"/"+h))
-@@ -42,107 +79,132 @@
+@@ -42,107 +79,132 @@ def find_dir_in_gemspec
nil
end
@@ -121,48 +121,11 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
- $CPPFLAGS = " -I#{narray_h_dir} " + $CPPFLAGS
-end
-exit unless have_header("narray.h")
--
+
-if RUBY_PLATFORM =~ /cygwin|mingw/
- $LDFLAGS = " -L#{CONFIG['sitearchdir']} "+$LDFLAGS
- exit unless have_library("narray","na_make_object")
-end
--
--$have_pgplot = false
--
--# Check PGPLOT Header
--if have_header("cpgplot.h")
--
-- # Check PGPLOT Library without extra libs
-- if find_library("cpgplot","cpgbeg", "/usr/lib",
-- "/usr/local/lib", "/usr/local/pgplot" )
-- $have_pgplot = true
-- else
-- # Check for extra libs then re-check for PGPLOT library
-- puts "First check for PGPLOT library failed,"
-- puts "checking for auxiliary libraries and retrying."
-
-- # Check FORTRAN Libraries
-- #
-- # SUN WorkShop FORTRAN 77 compiler ver5.0
-- # configure options: --with-sunws
-- if with_config("sunws")
-- $libs = "-lM77 -lsunmath "+$libs
-- exit unless find_library("F77", "f77_init", "/opt/SUNWspro/lib")
-- $defs.push "-DSPARC_FORTRAN"
-- #
-- # GNU FORTRAN v4
-- elsif have_library("gfortran")
-- $CFLAGS = "-Wall "+$CFLAGS
-- $defs.push "-DGNU_FORTRAN"
-- #
-- # GNU FORTRAN v3
-- elsif have_library("g77")
-- $CFLAGS = "-Wall "+$CFLAGS
-- $defs.push "-DGNU_FORTRAN"
-- else
-- puts "failed"
-- exit
-- end
+def check_narray
+ gems_dir="$(rubylibprefix)/gems/$(ruby_version)/gems/"
+ narray_d="narray-0.[56].*"
@@ -178,33 +141,20 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+ end
+ exit unless have_header("narray.h")
-- # Check GrWin Library (for cygwin (and mingw32?))
-- # configure options: --with-grwin
-- if with_config("grwin")
-- #$LDFLAGS = "-Wl,--subsystem,console "+$LDFLAGS
-- if RUBY_PLATFORM =~ /cygwin|mingw/
-- $libs += " -mwindows"
-- end
-- exit unless have_library("GrWin", "GWinit")
-- end
+-$have_pgplot = false
+ if RUBY_PLATFORM =~ /cygwin|mingw/
+ $LDFLAGS = " -L#{CONFIG['sitearchdir']} "+$LDFLAGS
+ exit unless have_library("narray","na_make_object")
+ end
+end
-- $found_lib = []
+-# Check PGPLOT Header
+-if have_header("cpgplot.h")
-- # configure options:
-- # --with-x11-dir=path
-- # --with-x11-include=path
-- # --with-x11-lib=path
-- dir_config("x11")
--
-- # Check X11 Library
-- if have_library("X11", "XOpenDisplay")
-- $found_lib << 'X11'
-- end
+- # Check PGPLOT Library without extra libs
+- if find_library("cpgplot","cpgbeg", "/usr/lib",
+- "/usr/local/lib", "/usr/local/pgplot" )
+- $have_pgplot = true
+def check_extra_libs
+ # Check FORTRAN Libraries
+ #
@@ -224,18 +174,45 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+ elsif have_library("g77")
+ $CFLAGS = "-Wall "+$CFLAGS
+ $defs.push "-DGNU_FORTRAN"
-+ else
+ else
+- # Check for extra libs then re-check for PGPLOT library
+- puts "First check for PGPLOT library failed,"
+- puts "checking for auxiliary libraries and retrying."
+-
+- # Check FORTRAN Libraries
+- #
+- # SUN WorkShop FORTRAN 77 compiler ver5.0
+- # configure options: --with-sunws
+- if with_config("sunws")
+- $libs = "-lM77 -lsunmath "+$libs
+- exit unless find_library("F77", "f77_init", "/opt/SUNWspro/lib")
+- $defs.push "-DSPARC_FORTRAN"
+- #
+- # GNU FORTRAN v4
+- elsif have_library("gfortran")
+- $CFLAGS = "-Wall "+$CFLAGS
+- $defs.push "-DGNU_FORTRAN"
+- #
+- # GNU FORTRAN v3
+- elsif have_library("g77")
+- $CFLAGS = "-Wall "+$CFLAGS
+- $defs.push "-DGNU_FORTRAN"
+- else
+- puts "failed"
+- exit
+- end
+ puts "failed"
+ exit
+ end
-- # Check PNG Library
-- libs_save = $libs
-- $libs = append_library($libs, "z")
-- if have_library("png","png_create_write_struct")
-- $found_lib << 'png'
-- else
-- $libs = libs_save
+- # Check GrWin Library (for cygwin (and mingw32?))
+- # configure options: --with-grwin
+- if with_config("grwin")
+- #$LDFLAGS = "-Wl,--subsystem,console "+$LDFLAGS
+- if RUBY_PLATFORM =~ /cygwin|mingw/
+- $libs += " -mwindows"
+- end
+- exit unless have_library("GrWin", "GWinit")
+ # Check GrWin Library (for cygwin (and mingw32?))
+ # configure options: --with-grwin
+ if with_config("grwin")
@@ -245,17 +222,13 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
end
+ exit unless have_library("GrWin", "GWinit")
+ end
-
-- $libs = append_library($libs, "pgplot")
++
+ # Check X11 Library
+ if have_library("X11", "XOpenDisplay")
+ $found_lib << 'X11'
+ end
-- if find_library("cpgplot","cpgbeg", "/usr/lib",
-- "/usr/local/lib", "/usr/local/pgplot" )
-- $have_pgplot = true
-- end
+- $found_lib = []
+ # Check PNG Library
+ libs_save = $libs
+ $libs = append_library($libs, "z")
@@ -263,26 +236,45 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+ $found_lib << 'png'
+ else
+ $libs = libs_save
- end
- end
++ end
++end
--$objs = %w(rb_pgplot.o kwarg.o)
+- # configure options:
+- # --with-x11-dir=path
+- # --with-x11-include=path
+- # --with-x11-lib=path
+- dir_config("x11")
--if $have_pgplot
+- # Check X11 Library
+- if have_library("X11", "XOpenDisplay")
+- $found_lib << 'X11'
+- end
+def autobuild_pgplot
+ # Exit unless a fortran compiler was found
+ exit unless %w[gfortran g77].any?{|cmd| system("which #{cmd}")}
+ puts "enabling auto-build PGPLOT Library..."
-+
+
+- # Check PNG Library
+- libs_save = $libs
+- $libs = append_library($libs, "z")
+- if have_library("png","png_create_write_struct")
+- $found_lib << 'png'
+- else
+- $libs = libs_save
+- end
+ $subdir = 'build_lib'
+ $CFLAGS = "-I#{$subdir}/build "+$CFLAGS
+ $LDFLAGS = "-L#{$subdir}/build "+$LDFLAGS
+ $libs = append_library($libs, "cpgplot")
+ $defs.push '-DPGPLOT_DIR=\\"$(PGPLOT_DIR)\\"'
-+
- # Generate Makefile
- create_makefile("pgplot")
-+
+
+- $libs = append_library($libs, "pgplot")
++ # Generate Makefile
++ create_makefile("pgplot")
+
+- if find_library("cpgplot","cpgbeg", "/usr/lib",
+- "/usr/local/lib", "/usr/local/pgplot" )
+- $have_pgplot = true
+ # Append PGPLOT install task to Makefile
+ exit unless $makefile_created
+ puts "appending extra install tasks to Makefile"
@@ -311,16 +303,21 @@ Subject: [PATCH 5/9] extconf.rb: * need to check extra-libs before auto-build.
+ (cd #{$subdir}; make build/pgxwin_server)
+$(DLLIB): $(PGPLOT_BUILD)/pgxwin_server
+"
-+ end
-+ end
-+
+ end
+ end
+-end
+
+-$objs = %w(rb_pgplot.o kwarg.o)
+ puts "creating #{$subdir}/drivers.conf"
+ File.open("#{$subdir}/drivers.conf","w") do |w|
+ w.puts "GIDRIV PPDRIV PSDRIV"
+ w.puts "PNDRIV" if $found_lib.include? "png"
+ w.puts "WDDRIV XWDRIV" if $found_lib.include? "X11"
+ end
-+
+
+-if $have_pgplot
+- # Generate Makefile
+- create_makefile("pgplot")
+ puts "Ready to download and auto-build PGPLOT !!"
end
+
diff --git a/debian/patches/0006-rm-extconf-auto.rb.patch b/debian/patches/0006-rm-extconf-auto.rb.patch
index 591746e..6f534bf 100644
--- a/debian/patches/0006-rm-extconf-auto.rb.patch
+++ b/debian/patches/0006-rm-extconf-auto.rb.patch
@@ -1,7 +1,6 @@
-From 313ac1b4e97bb5720a888f6006e3965e711aaff3 Mon Sep 17 00:00:00 2001
From: Masahiro TANAKA <masa16.tanaka at gmail.com>
Date: Tue, 5 Mar 2013 18:48:57 +0900
-Subject: [PATCH 6/9] rm extconf-auto.rb
+Subject: rm extconf-auto.rb
---
ext/extconf-auto.rb | 89 -----------------------------------------------------
@@ -133,6 +132,3 @@ index d7b48ad..88f23e2 100644
--exclude ext/kwarg.c
--exclude ext/rb_pgplot.c.in
--exclude ext/version.h
---
-2.1.0
-
diff --git a/debian/patches/0007-s.add_dependency-narray-0.7.0.patch b/debian/patches/0007-s.add_dependency-narray-0.7.0.patch
index 80b6999..b624535 100644
--- a/debian/patches/0007-s.add_dependency-narray-0.7.0.patch
+++ b/debian/patches/0007-s.add_dependency-narray-0.7.0.patch
@@ -1,7 +1,6 @@
-From 42e98bf9d7db8bd60822a67c381233ad0c31ac83 Mon Sep 17 00:00:00 2001
From: Masahiro TANAKA <masa16.tanaka at gmail.com>
Date: Wed, 30 Oct 2013 20:59:01 +0900
-Subject: [PATCH 7/9] s.add_dependency('narray', '< 0.7.0')
+Subject: s.add_dependency('narray', '< 0.7.0')
---
pgplot.gemspec | 2 +-
@@ -20,6 +19,3 @@ index 88f23e2..4e41bc4 100644
if s.respond_to? :specification_version then
s.specification_version = 2
---
-2.1.0
-
diff --git a/debian/patches/0008-mv-homepage.patch b/debian/patches/0008-mv-homepage.patch
index f9b2159..7c341d3 100644
--- a/debian/patches/0008-mv-homepage.patch
+++ b/debian/patches/0008-mv-homepage.patch
@@ -1,7 +1,6 @@
-From 8844f14b454d9d32b1b9069f96c14a7d9d0ded14 Mon Sep 17 00:00:00 2001
From: Masahiro TANAKA <masa16.tanaka at gmail.com>
Date: Fri, 16 May 2014 10:23:43 +0900
-Subject: [PATCH 8/9] mv homepage
+Subject: mv homepage
---
pgplot.gemspec | 2 +-
@@ -20,6 +19,3 @@ index 4e41bc4..05bc3ec 100644
s.require_paths = ["."]
s.rubyforge_project = "pgplot"
s.rubygems_version = "2.0.0"
---
-2.1.0
-
diff --git a/debian/patches/0009-fix-docs.patch b/debian/patches/0009-fix-docs.patch
index 9d6f949..aacde97 100644
--- a/debian/patches/0009-fix-docs.patch
+++ b/debian/patches/0009-fix-docs.patch
@@ -1,16 +1,18 @@
-From 4c6750b05d09d71fb6ed5fb610ac722fd9aed2b3 Mon Sep 17 00:00:00 2001
From: Masahiro TANAKA <masa16.tanaka at gmail.com>
Date: Fri, 16 May 2014 11:22:23 +0900
-Subject: [PATCH 9/9] fix docs
+Subject: fix docs
---
- doc/Makefile | 4 ++--
- doc/index.rd | 4 ++--
- doc/mkdoc.rb | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ doc/Makefile | 6 +++---
+ doc/index.rd | 4 ++--
+ doc/mkdoc.rb | 4 +++-
+ doc/myrd2html.rb | 7 +++++--
+ 4 files changed, 13 insertions(+), 8 deletions(-)
---- ruby-pgplot.orig/doc/Makefile
-+++ ruby-pgplot/doc/Makefile
+diff --git a/doc/Makefile b/doc/Makefile
+index 47e9c02..7354af3 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
@@ -1,6 +1,6 @@
.SUFFIXES: .rd .html .ja.rd .html.ja .rb $(SUFFIXES)
@@ -19,7 +21,7 @@ Subject: [PATCH 9/9] fix docs
.rd.html:
$(rd2) --lang=en --kw="Ruby,PGPLOT,NArray" $(opt) $< > $@
-@@ -42,8 +42,8 @@
+@@ -42,8 +42,8 @@ tutorial-01.html.ja: tutorial-01.ja.rd trailer.html
# Method description
rbpgplot.html: mkdoc.rb
@@ -30,9 +32,11 @@ Subject: [PATCH 9/9] fix docs
# Method index categolized
rbpg-ind.rd: rbpg-ind.txt mkind.rb trailer.html
---- ruby-pgplot.orig/doc/index.rd
-+++ ruby-pgplot/doc/index.rd
-@@ -11,11 +11,11 @@
+diff --git a/doc/index.rd b/doc/index.rd
+index 8bbcca6..91df739 100644
+--- a/doc/index.rd
++++ b/doc/index.rd
+@@ -11,11 +11,11 @@ graphics library.
* ((<PGPLOT Library|URL:http://www.astro.caltech.edu/~tjp/pgplot/>))
* GNU FORTRAN compiler
@@ -46,15 +50,17 @@ Subject: [PATCH 9/9] fix docs
== Installation
---- ruby-pgplot.orig/doc/mkdoc.rb
-+++ ruby-pgplot/doc/mkdoc.rb
+diff --git a/doc/mkdoc.rb b/doc/mkdoc.rb
+index 3d249e0..15d31df 100644
+--- a/doc/mkdoc.rb
++++ b/doc/mkdoc.rb
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
class Formatter
def initialize(stream)
@stream = stream
-@@ -276,7 +278,7 @@
+@@ -276,7 +278,7 @@ pgqvsz:0:1,1,1,1
def manualfunclist
@manualfunc={}
curfunc=nil
@@ -63,8 +69,10 @@ Subject: [PATCH 9/9] fix docs
case line
when %r'^/\* (PG\w+)'
curfunc = $1.downcase
---- ruby-pgplot.orig/doc/myrd2html.rb
-+++ ruby-pgplot/doc/myrd2html.rb
+diff --git a/doc/myrd2html.rb b/doc/myrd2html.rb
+index 134dc39..b375bc1 100644
+--- a/doc/myrd2html.rb
++++ b/doc/myrd2html.rb
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
@@ -72,7 +80,7 @@ Subject: [PATCH 9/9] fix docs
while /^--/ =~ ARGV[0]
a = ARGV.shift
case a
-@@ -17,9 +20,9 @@
+@@ -17,9 +20,9 @@ $date = File.mtime(rdfile).strftime("%b %d %Y")
case $lang
when 'ja'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-pgplot.git
More information about the Pkg-ruby-extras-commits
mailing list