The following commit has been merged in the master branch:
commit 2c18ce813ae0db4dfb0ef384a5f98f4c7aba3f40
Author: Youhei SASAKI <uwab...@gfd-dennou.org>
Date:   Wed Feb 22 18:11:07 2012 +0900

    Update Debian Pacakges: 0.6.6-1
    
    Signed-off-by: Youhei SASAKI <uwab...@gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index f9bab14..dc2d883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-ruby-netcdf (0.6.6-1~1.gbpc1429d) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @c1429d9e0a397fea085be1d709d630cbb46e1c07 **
+ruby-netcdf (0.6.6-1) unstable; urgency=low
 
+  * New Upstream version 0.6.6
   * Update watch
-  * Imported Upstream version 0.6.6
+  * Add unapply-patches to debian/sources/local-options
+  * Update patches: for gbp-pq
+    * rename patch 
0001-Change-NArray-Directory-for-Debian-s-Ruby-vendor-lib.patch.
+    * rename patch 0002-ChangeTestPath.patch.
 
- -- Youhei SASAKI <uwab...@gfd-dennou.org>  Wed, 22 Feb 2012 17:46:52 +0900
+ -- Youhei SASAKI <uwab...@gfd-dennou.org>  Wed, 22 Feb 2012 18:06:15 +0900
 
 ruby-netcdf (0.6.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cb4fa1c..64e39a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: ruby
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Youhei SASAKI <uwab...@gfd-dennou.org>
-Build-Depends: debhelper (>= 7.0.50~ ), gem2deb, libnetcdf-dev,  
-  libnarray-ruby1.8 | ruby-narray, libnarray-ruby1.9.1 | ruby-narray, 
-  libnarray-miss-ruby1.8 | ruby-narray-miss, libnarray-miss-ruby1.9.1 | 
ruby-narray-miss
+Build-Depends: debhelper (>= 7.0.50~ ), gem2deb, libnetcdf-dev, rake,
+  ruby-narray, ruby-narray-miss
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 XS-Ruby-Versions: all
@@ -15,7 +14,8 @@ Homepage: http://ruby.gfd-dennou.org/products/ruby-netcdf
 
 Package: ruby-netcdf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-interpreter | ruby1.8
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-narray, ruby-narray-miss
 Replaces: netcdf-ruby (<< 0.6.5-2~), netcdf-ruby1.8 (<< 0.6.5-2~), 
netcdf-ruby1.9.1 (<< 0.6.5-2~)
 Conflicts: netcdf-ruby (<< 0.6.5-2~), netcdf-ruby1.8 (<< 0.6.5-2~), 
netcdf-ruby1.9.1 (<< 0.6.5-2~)
 Provides: netcdf-ruby, netcdf-ruby1.8, netcdf-ruby1.9.1
@@ -42,6 +42,7 @@ Description: Ruby interface of netCDF library
 Package: netcdf-ruby
 Architecture: all
 Section: oldlibs
+Priority: extra
 Depends: ruby-netcdf, ${misc:Depends}
 Description: Ruby interface of netCDF library
  This is a transitional package to ease upgrades to the ruby-netcdf
@@ -50,6 +51,7 @@ Description: Ruby interface of netCDF library
 Package: netcdf-ruby1.8
 Architecture: all
 Section: oldlibs
+Priority: extra
 Depends: ruby-netcdf, ${misc:Depends}
 Description: Ruby interface of netCDF library
  This is a transitional package to ease upgrades to the ruby-netcdf
@@ -67,6 +69,7 @@ Description: Ruby interface of netCDF library
 Package: netcdf-ruby1.9.1
 Architecture: all
 Section: oldlibs
+Priority: extra
 Depends: ruby-netcdf, ${misc:Depends}
 Description: Ruby interface of netCDF library
  This is a transitional package to ease upgrades to the ruby-netcdf
diff --git 
a/debian/patches/0002-Change-Test-Path-for-running-under-test_runner.rb.patch 
b/debian/patches/0002-Change-Test-Path-for-running-under-test_runner.rb.patch
index bc720e0..2490436 100644
--- 
a/debian/patches/0002-Change-Test-Path-for-running-under-test_runner.rb.patch
+++ 
b/debian/patches/0002-Change-Test-Path-for-running-under-test_runner.rb.patch
@@ -7,18 +7,16 @@ Signed-off-by: Youhei SASAKI <uwab...@gfd-dennou.org>
  test/test.rb |    5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)
 
-diff --git a/test/test.rb b/test/test.rb
-index 7ec59c6..c69026c 100644
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -1,9 +1,6 @@
- ##require 'numru/netcdf' 
+--- ruby-netcdf.orig/test/test.rb
++++ ruby-netcdf/test/test.rb
+@@ -1,9 +1,5 @@
+-##require 'numru/netcdf' 
 -## // to test before make install -->
  require 'narray'
 -require '../netcdfraw'  
 -require '../lib/netcdf'
 -## <-- to test before make install //
-+require 'numru/netcdfraw'  
++require 'numru/netcdf'  
  
  include NumRu
  
diff --git a/debian/patches/0002-ChangeTestPath.patch 
b/debian/patches/0002-ChangeTestPath.patch
deleted file mode 100644
index 3152241..0000000
--- a/debian/patches/0002-ChangeTestPath.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
-Date: Wed, 22 Feb 2012 17:49:07 +0900
-Subject: ChangeTestPath
-
----
- extconf.rb   |    5 ++---
- test/test.rb |    8 ++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/extconf.rb b/extconf.rb
-index 5e53471..b8cbeb7 100644
---- a/extconf.rb
-+++ b/extconf.rb
-@@ -108,12 +108,11 @@ oldmkfl.each_line{ |line|
-    case(line)
-    when /^distclean:/
-       newmkfl.puts(line)
-+      newmkfl.puts("\t\t@$(RM) -fr test-lib")
-       newmkfl.puts("\t\t@$(RM) *.nc demo/*.nc demo/*~ lib/*~ doc/*~ test/*.nc 
test/*~ Makefile.orig")
-    when /^all:/
-       newmkfl.puts(line)
--      newmkfl.puts("")         
--      newmkfl.puts("test: all")            # insert the "test" target
--      newmkfl.puts("\t\t@cd test && ruby test.rb && echo 'test did not fail 
:-p (please ignore the warnings)' && cd ..") 
-+      newmkfl.puts("\t\t-@( [ ! -d test-lib ] && (mkdir -p test-lib/numru && 
cd test-lib/numru && ln -s ../../netcdfraw.so && ln -s ../../lib/*.rb . ))")
-    when /lib\/netcdf/
-       line = line.chomp! + "/"
-       newmkfl.puts(line)
-diff --git a/test/test.rb b/test/test.rb
-index 7ec59c6..a95f73b 100644
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -1,13 +1,9 @@
--##require 'numru/netcdf' 
--## // to test before make install -->
- require 'narray'
--require '../netcdfraw'  
--require '../lib/netcdf'
--## <-- to test before make install //
-+require 'numru/netcdf'
- 
- include NumRu
- 
--filename = "test.nc"
-+filename = "test/test.nc"
- print "creating ",filename,"...\n"
- file=NetCDF.create(filename,false,false)
- 
diff --git a/debian/patches/series b/debian/patches/series
index ae3070c..d9da515 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Change-NArray-Directory-for-Debian-s-Ruby-vendor-lib.patch
-0002-ChangeTestPath.patch
+0002-Change-Test-Path-for-running-under-test_runner.rb.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..9075465
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,8 @@
+# -*- mode: ruby; coding: utf-8 -*-
+require 'gem2deb/rake/testtask'
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/test.rb'
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index 6b205e4..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1 +0,0 @@
-system("#{ENV['RUBY_TEST_BIN']} -Itest-lib test/test.rb 1>/dev/null")
diff --git a/debian/rules b/debian/rules
index f6aec6f..5f1d969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-
 %:
        dh $@ --buildsystem ruby --with ruby
 
@@ -9,21 +8,3 @@ override_dh_strip:
 
 override_dh_installchangelogs:
        dh_installchangelogs -A ChangeLog
-
-# NETCDF_RUBY_VERSIONS= 1.8 1.9.1
-# LIB_PACKAGE_FILTER = %-ruby $(patsubst %,\%-ruby%,$(NETCDF_RUBY_VERSIONS))
-# DEB_AUTO_CLEANUP_RCS := yes
-# DEB_RUBY_SETUP_CMD = extconf.rb
-# DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-# DEB_INSTALL_DOCS_ruby-netcdf-doc :=  doc/*.rd
-# cdbs_pkgdir = $(CURDIR)/debian/$(cdbs_curpkg)
-# cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)
-# cdbs_ruby_archdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_ARCHDIR)
-# DEB_RUBY_INSTALL_ARGS = DESTDIR=$(cdbs_pkgdir) \
-#      sitelibdir=$(cdbs_ruby_libdir_ver) \
-#         sitearchdir=$(cdbs_ruby_archdir_ver)
-# clean::
-#      -[ ! -f Makefile ] || $(MAKE) distclean
-#      -[ ! -f test/test.nc ] || rm -f test/test.nc
-#      -[ ! -d lib/numru ] || rm -rf lib/numru
-#      -rm -f debian/*.log

-- 
Ruby interface of NetCDF library

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

Reply via email to