[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578

2010-12-13 Thread Youhei SASAKI 
The following commit has been merged in the master branch:
commit 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578
Merge: 7c829ac6d8fff9f24480f1b77d36a74d3860ebf3 
f5fc5895153575fe40e4f007aad183d049634621
Author: Youhei SASAKI 
Date:   Tue Dec 14 04:14:55 2010 +0900

Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/ruby-netcdf

Conflicts:
debian/changelog
debian/control


-- 
Ruby interface of NetCDF library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578

2010-12-13 Thread Youhei SASAKI 
The following commit has been merged in the master branch:
commit 7c829ac6d8fff9f24480f1b77d36a74d3860ebf3
Author: Youhei SASAKI 
Date:   Mon Dec 13 21:53:41 2010 +0900

Update for Ruby1.9.2

* Bump Standard Version: 3.9.1
* Add Support Ruby1.9.2
* Add testsuite in extconf.rb
* Change Maintainer: Debian GIS Project
* Add me to Uploaders
* Add DM-Upload-Allowed: I became Debian Maintainer
* Add Vcs-* field

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 784b825..000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-netcdf-ruby for Debian
-===
-
-This package build without opendap support, beacuse of netcdf 4.1
-package is in experimental.
-
- -- Youhei SASAKI , Thu, 18 Mar 2010 23:41:22 +0900
-
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5ebc7a1..000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-README.source
--
-
-The source package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in debian/patches
-and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
- -- Youhei SASAKI , Fri,  4 Sep 2009 11:47:50 +0900
diff --git a/debian/changelog b/debian/changelog
index b30f3a7..a0ccfc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
 ruby-netcdf (0.6.4-1) unstable; urgency=low
 
   * Initial Release (Closes: #542144)
-<<< HEAD
 
- -- Youhei SASAKI   Sun, 22 Aug 2010 10:27:54 +0900
-===
-  * Build without opendap(nc-dap) support.
-
- -- Youhei SASAKI   Sun, 24 Jan 2010 04:35:48 +0900
->>> 6617e11... Imported Debian patch 0.6.4-1
+ -- Youhei SASAKI   Mon, 13 Dec 2010 17:35:12 +0900
diff --git a/debian/compat b/debian/compat
index 2f48f0f..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,9 +1 @@
-<<< HEAD
-<<< HEAD
 7
-===
-5
->>> 6617e11... Imported Debian patch 0.6.4-1
-===
-7
->>> b7ae99f... Update debhelper version: 5 -> 7
diff --git a/debian/control b/debian/control
index c9858a8..dd44566 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,16 @@
 Source: ruby-netcdf
 Section: ruby
 Priority: optional
-Maintainer: Youhei SASAKI 
-<<< HEAD
-<<< HEAD
+Maintainer: Debian GIS Project 
+Uploaders: Youhei SASAKI 
 Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
-  libnetcdf-dev (>= 4.1.1-5 ), libdap-dev, libcurl4-gnutls-dev,
-  libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
-Standards-Version: 3.9.1
-===
-Build-Depends: cdbs, debhelper (>> 7), ruby-pkg-tools, quilt,
-===
-Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
->>> b7ae99f... Update debhelper version: 5 -> 7
   libnetcdf-dev, 
-  libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
-Standards-Version: 3.8.3
->>> 6617e11... Imported Debian patch 0.6.4-1
+  libnarray-ruby1.8, libnarray-miss-ruby1.8, ruby1.8-dev, 
+  libnarray-ruby1.9.1, libnarray-miss-ruby1.9.1, ruby1.9.1-dev
+Standards-Version: 3.9.1
+DM-Upload-Allowed: yes
+Vcs-Git: git://git.debian.org/pkg-grass/ruby-netcdf.git
+Vcs-Browser: http://git.debian.org/?p=pkg-grass/ruby-netcdf.git
 Homepage: http://ruby.gfd-dennou.org/products/ruby-netcdf
 
 Package: netcdf-ruby
@@ -26,12 +20,8 @@ Description: Ruby interface of netCDF library
  RubyNetCDF is a Ruby interface of netCDF library built on the NArray library,
  which is an efficient multi-dimensional numeric array class for Ruby.
  .
-<<< HEAD
  This package is dependency package, which depends on Debian's default
  Ruby version(currently 1.8.x).
-===
- This package is build for Ruby 1.8.
->>> 6617e11... Imported Debian patch 0.6.4-1
 
 Package: netcdf-ruby1.8
 Architecture: any
@@ -84,8 +74,6 @@ Description: Ruby interface of netCDF library
  in a debugger, this makes it somewhat easier to interpret core
  dumps.  Most people will not need this package.
 
-<<< HEAD
-
 Package: netcdf-ruby-doc
 Section: doc
 Architecture: all
@@ -95,5 +83,3 @@ Description: Documents and example scripts of netcdf-ruby
  which is an efficient multi-dimensional numeric array class for Ruby.
  .
  This package provides all API documents and example scripts 
-===
->>> 6617e11... Imported Debian patch 0.6.4-1
diff --git a/debian/copyright b/debian/copyright
index 5ef6352..dd83b96 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Youhei SASAKI  on
 Thu, 27 Nov 2003 04:12:34 +0900.
 
-It was downloaded from http://ruby.gfd-dennou.org/products/ruby-dcl
+It was downloaded from http://ruby.gfd-dennou.org/products/ruby-netcdf
 
 Upstream Authors:
   Takeshi Horinouchi , T. Sakakima 
@@ -11,7 +11,7 @@ Copyright: Ruby/NetCDF is copyrighted free software by
 
 License: 
   You can redistribute it and/or modify it under either the terms of
-  the

[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578

2010-12-13 Thread Youhei SASAKI 
The following commit has been merged in the master branch:
commit 8841988facbc3d19e29d1934fe203f761d973b35
Author: Youhei SASAKI 
Date:   Wed Apr 7 21:08:39 2010 +0900

Update debhelper version: 5 -> 7

diff --git a/debian/compat b/debian/compat
index 2e9e2e6..2f48f0f 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,5 +1,9 @@
 <<< HEAD
+<<< HEAD
 7
 ===
 5
 >>> 6617e11... Imported Debian patch 0.6.4-1
+===
+7
+>>> b7ae99f... Update debhelper version: 5 -> 7
diff --git a/debian/control b/debian/control
index c209165..c9858a8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,18 @@ Section: ruby
 Priority: optional
 Maintainer: Youhei SASAKI 
 <<< HEAD
+<<< HEAD
 Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
   libnetcdf-dev (>= 4.1.1-5 ), libdap-dev, libcurl4-gnutls-dev,
   libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
 Standards-Version: 3.9.1
 ===
 Build-Depends: cdbs, debhelper (>> 7), ruby-pkg-tools, quilt,
+===
+Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
+>>> b7ae99f... Update debhelper version: 5 -> 7
   libnetcdf-dev, 
   libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
-#libdap-dev, libnc-dap-dev, libcurl4-gnutls-dev, libxml2-dev,
 Standards-Version: 3.8.3
 >>> 6617e11... Imported Debian patch 0.6.4-1
 Homepage: http://ruby.gfd-dennou.org/products/ruby-netcdf

-- 
Ruby interface of NetCDF library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578

2010-12-13 Thread Youhei SASAKI 
The following commit has been merged in the master branch:
commit 8113bb714442244e53b4c2c87f0f8de68835e5ac
Author: Youhei SASAKI 
Date:   Sun Jan 24 04:35:48 2010 +0900

Imported Debian patch 0.6.4-1

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..784b825
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,8 @@
+netcdf-ruby for Debian
+===
+
+This package build without opendap support, beacuse of netcdf 4.1
+package is in experimental.
+
+ -- Youhei SASAKI , Thu, 18 Mar 2010 23:41:22 +0900
+
diff --git a/debian/changelog b/debian/changelog
index 13e95fd..b30f3a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 ruby-netcdf (0.6.4-1) unstable; urgency=low
 
   * Initial Release (Closes: #542144)
+<<< HEAD
 
  -- Youhei SASAKI   Sun, 22 Aug 2010 10:27:54 +0900
+===
+  * Build without opendap(nc-dap) support.
+
+ -- Youhei SASAKI   Sun, 24 Jan 2010 04:35:48 +0900
+>>> 6617e11... Imported Debian patch 0.6.4-1
diff --git a/debian/compat b/debian/compat
index 7f8f011..2e9e2e6 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1,5 @@
+<<< HEAD
 7
+===
+5
+>>> 6617e11... Imported Debian patch 0.6.4-1
diff --git a/debian/control b/debian/control
index 0d33778..c209165 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,18 @@ Source: ruby-netcdf
 Section: ruby
 Priority: optional
 Maintainer: Youhei SASAKI 
+<<< HEAD
 Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
   libnetcdf-dev (>= 4.1.1-5 ), libdap-dev, libcurl4-gnutls-dev,
   libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
 Standards-Version: 3.9.1
+===
+Build-Depends: cdbs, debhelper (>> 7), ruby-pkg-tools, quilt,
+  libnetcdf-dev, 
+  libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
+#libdap-dev, libnc-dap-dev, libcurl4-gnutls-dev, libxml2-dev,
+Standards-Version: 3.8.3
+>>> 6617e11... Imported Debian patch 0.6.4-1
 Homepage: http://ruby.gfd-dennou.org/products/ruby-netcdf
 
 Package: netcdf-ruby
@@ -15,8 +23,12 @@ Description: Ruby interface of netCDF library
  RubyNetCDF is a Ruby interface of netCDF library built on the NArray library,
  which is an efficient multi-dimensional numeric array class for Ruby.
  .
+<<< HEAD
  This package is dependency package, which depends on Debian's default
  Ruby version(currently 1.8.x).
+===
+ This package is build for Ruby 1.8.
+>>> 6617e11... Imported Debian patch 0.6.4-1
 
 Package: netcdf-ruby1.8
 Architecture: any
@@ -69,6 +81,7 @@ Description: Ruby interface of netCDF library
  in a debugger, this makes it somewhat easier to interpret core
  dumps.  Most people will not need this package.
 
+<<< HEAD
 
 Package: netcdf-ruby-doc
 Section: doc
@@ -79,3 +92,5 @@ Description: Documents and example scripts of netcdf-ruby
  which is an efficient multi-dimensional numeric array class for Ruby.
  .
  This package provides all API documents and example scripts 
+===
+>>> 6617e11... Imported Debian patch 0.6.4-1
diff --git a/debian/patches/modified-extconf-rb.patch 
b/debian/patches/modified-extconf-rb.patch
new file mode 100644
index 000..354a4d9
--- /dev/null
+++ b/debian/patches/modified-extconf-rb.patch
@@ -0,0 +1,38 @@
+--- ruby-netcdf-0.6.4.orig/extconf.rb
 ruby-netcdf-0.6.4/extconf.rb
+@@ -1,7 +1,7 @@
+ require "mkmf"
+ 
+-dir_config('narray',$sitearchdir,$sitearchdir)
+-dir_config('netcdf','/usr/local')
++dir_config('narray',$archdir,$archdir)
++dir_config('netcdf','/usr')
+ 
+ if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
+ print <>> 6617e11... Imported Debian patch 0.6.4-1
diff --git a/debian/rules b/debian/rules
index 0d7861c..39891a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,10 @@ include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
 
 DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
 DEB_COMPRESS_EXCLUDE := .rd .html
+<<< HEAD
 DEB_INSTALL_DOCS_netcdf-ruby-doc := doc/*.rd doc/*.html
+===
+DEB_RUBY_SETUP_ARGS := --disable-opendap
+install_docs := doc/*.rd doc/*.html
+DEB_INSTALL_DOCS_netcdf-ruby1.8:= $(install_docs)
+>>> 6617e11... Imported Debian patch 0.6.4-1

-- 
Ruby interface of NetCDF library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 5089c3258c81d3229bbddbf3fa3e8f9f6c0e7578

2010-12-13 Thread Youhei SASAKI 
The following commit has been merged in the master branch:
commit b8bacb5c738d2e680da339082ea74bc16f047ea7
Author: Youhei SASAKI 
Date:   Sun Aug 22 10:28:05 2010 +0900

update Standard Version

diff --git a/debian/changelog b/debian/changelog
index 7f67fa1..13e95fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ ruby-netcdf (0.6.4-1) unstable; urgency=low
 
   * Initial Release (Closes: #542144)
 
- -- Youhei SASAKI   Sun, 02 May 2010 16:53:01 +0900
+ -- Youhei SASAKI   Sun, 22 Aug 2010 10:27:54 +0900
diff --git a/debian/control b/debian/control
index c8f196e..0d33778 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Youhei SASAKI 
 Build-Depends: cdbs, debhelper (>= 7.0.50~ ), ruby-pkg-tools, quilt,
   libnetcdf-dev (>= 4.1.1-5 ), libdap-dev, libcurl4-gnutls-dev,
   libnarray-ruby1.8, ruby1.8-dev, libnarray-ruby1.9.1, ruby1.9.1-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://ruby.gfd-dennou.org/products/ruby-netcdf
 
 Package: netcdf-ruby

-- 
Ruby interface of NetCDF library

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel