[DRE-commits] [SCM] Packaging for Ruby-PGPLOT branch, master, updated. upstream/0.1.3-5-g3b216ac

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 3b216acddd796733f5bf2acd8000b9eaaeb02428
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed May 18 08:03:43 2011 +0900

    Fix narray dir(archdir -> vendorarchdir)
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/control b/debian/control
index 9e5e597..ac801e0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: ruby-pgplot
 Architecture: any
 XB-Ruby-Version: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-narray 
-Description: A Ruby interface to the PGPLOT graphics library
+Description: Ruby interface to the PGPLOT graphics library
  Ruby/PGPLOT is the Ruby interface to the PGPLOT graphics library.
  PGPLOT is a FORTRAN library to draw line/scatter/histogram plot, error
  bar, contour/image/vector map, etc. Supports various output devices
@@ -27,7 +27,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, ruby-pgplot (=${binary:Version})
-Description: A Ruby interface to the PGPLOT graphics library
+Description: Ruby interface to the PGPLOT graphics library
  Ruby/PGPLOT is the Ruby interface to the PGPLOT graphics library.
  PGPLOT is a FORTRAN library to draw line/scatter/histogram plot, error
  bar, contour/image/vector map, etc. Supports various output devices
diff --git a/debian/patches/fix_extconf.rb b/debian/patches/fix_extconf.rb
index c6e746c..97dc90a 100644
--- a/debian/patches/fix_extconf.rb
+++ b/debian/patches/fix_extconf.rb
@@ -1,11 +1,11 @@
---- rb_pgplot-0.1.3.orig/extconf.rb
-+++ rb_pgplot-0.1.3/extconf.rb
+--- ruby-pgplot.orig/extconf.rb
++++ ruby-pgplot/extconf.rb
 @@ -34,10 +34,10 @@
  exit unless have_header("cpgplot.h")
  
  # Check NArray
 -$CPPFLAGS = " -I#{CONFIG['sitearchdir']} "+$CPPFLAGS
-+$CPPFLAGS = " -I#{CONFIG['archdir']} "+$CPPFLAGS
++$CPPFLAGS = " -I#{CONFIG['vendorarchdir']} "+$CPPFLAGS
  exit unless have_header("narray.h")
  if RUBY_PLATFORM =~ /cygwin|mingw/
 -  $LDFLAGS = " -L#{CONFIG['sitearchdir']} "+$LDFLAGS
diff --git a/extconf.rb b/extconf.rb
index 7ea0fa7..39752c6 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -34,7 +34,7 @@ dir_config("pgplot")
 exit unless have_header("cpgplot.h")
 
 # Check NArray
-$CPPFLAGS = " -I#{CONFIG['archdir']} "+$CPPFLAGS
+$CPPFLAGS = " -I#{CONFIG['vendorarchdir']} "+$CPPFLAGS
 exit unless have_header("narray.h")
 if RUBY_PLATFORM =~ /cygwin|mingw/
   $LDFLAGS = " -L#{CONFIG['archdir']} "+$LDFLAGS

-- 
Packaging for Ruby-PGPLOT