r2971 - scripts
Author: frankie
Date: 2011-02-21 13:26:09 + (Mon, 21 Feb 2011)
New Revision: 2971
Added:
scripts/AUTHORS.uu
scripts/dgis-svn2git
Log:
Adding a couple of useful tools
Added: scripts/AUTHORS.uu
===
--- scripts/AUTHORS.uu (rev 0)
+++ scripts/AUTHORS.uu 2011-02-21 13:26:09 UTC (rev 2971)
@@ -0,0 +1,14 @@
+begin 644 AUTHORS
+M9G)A;FMI92`]($9R86YC97-C;R!086]L;R!,;W9EF=I;F4@/9R86YK:65`
+M95B:6%N+F]R9SX*86)O=61R96%U;'0M9W5EW0@/2!!;%N($)O=61R96%U
+M;'0@/%B;W5DF5A=6QT0UA=E87)S+F-O;3X*:G-A:6YTRUG=65S=`]
+M($IO;B!386EN=',@/'-A:6YTVID0'EA:]O+F-O;3X*:V]B;VQD(#T@1F%B
+M:6\@5')A;F-H:71E;QA(#QK;V)O;1`95B:6%N+F]R9SX*%BR`](%!A
+M=6P@5VES92`\%BT!D96)I86XN;W)G/@IP86)S+6=U97-T(#T@4%U;!7
+M:7-E(#QP86)S01E8FEA;BYOF^G!EF4@/2!0971T97(@4F5I;FAO;1T
+MV5N(#QP97)E01E8FEA;BYOF^G-H86QAWHM9W5EW0@/2!3=5V92!(
+M86QAWH@/1E8FEA;D!A9MG:7,N;W)G/@IH86UIV@M9W5EW0@/2!(86UI
+MV@@0F]W;6%N(#QH86UIVA?8D!Y86AO;RYC;VT^F9O9R`]($9E95R:6-O
+($1I($=R96=OFEO(#QF;V=`95B:6%N+F]R9SX*
+`
+end
Added: scripts/dgis-svn2git
===
--- scripts/dgis-svn2git(rev 0)
+++ scripts/dgis-svn2git2011-02-21 13:26:09 UTC (rev 2971)
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# A rough helper script to convert DebianGis SVN repository to git
+# See http://wiki.debian.org/Alioth/Git#ConvertaSVNAliothrepositorytoGit
+#
+# Copyright 2011 (C) Francesco P. Lovergine fran...@debian.org
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+#
+# On Debian GNU/Linux GPL is available under /usr/share/common-licenses
+
+set -e
+
+if [ $# -ne 2 ]; then
+echo Usage: $0 package_name upstream_tarball
+exit 1
+fi
+
+PKG=$1
+TARBALL=`readlink -f $2`
+
+# Collected authors data.
+# svn co http://svn.debian.org/svn/pkg-grass/scripts/AUTHORS.uu
+# Use uudecode to extract the list.
+AUTHORS=$HOME/debian/debian-gis/AUTHORS
+
+[ ! -f $AUTHORS ] echo List of authors '$AUTHORS' missing. exit 1
+
+git svn clone svn+ssh://svn.debian.org/svn/pkg-grass/packages/$PKG
--prefix=svn-import/ \
+--stdlayout --authors-file=$AUTHORS \
+--no-metadata $PKG
+
+cd $PKG
+
+for branch in `git branch -r`; do
+if [ `echo $branch | egrep svn-import/tags/.+$` ]; then
+version=`basename $branch`
+subject=`git log -1 --pretty=format:%s $branch`
+GIT_COMMITTER_DATE=`git log -1 --pretty=format:%ci $branch` git tag
-f -m $subject debian/$version $branch^
+git branch -d -r $branch
+fi
+done
+
+git branch -d -r svn-import/trunk
+git config --remove-section svn-remote.svn
+rm -rf .git/svn .git/{logs/,}refs/remotes/svn/
+
+git config remote.origin.url .
+git config --add remote.origin.fetch +refs/remotes/*:refs/heads/*
+git fetch
+
+git symbolic-ref HEAD refs/heads/upstream
+git rm --cached -r .
+git commit --allow-empty -m 'initial upstream branch'
+git checkout -f master
+git merge upstream
+git-import-orig $TARBALL
+
Property changes on: scripts/dgis-svn2git
___
Added: svn:executable
+ *
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch:
commit 2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5
Author: Youhei SASAKI uwab...@gfd-dennou.org
Date: Thu Feb 17 18:29:55 2011 +0900
Imported Upstream version 0.6.5
diff --git a/ChangeLog b/ChangeLog
index 1adf9ce..cee61b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Thu Feb 17 2011 T Horinouchi
+ * ruby-netcdf-0.6.5 released (relase tag: ruby-netcdf-0_6_5)
+Thu Feb 17 2011 T Horinouchi
+ * extconf.rb: Debug to have the --disable-opendap option really work
+Sat Feb 12 2011 T Horinouchi
+ * ruby-netcdf-0.6.5 preview release.
+Thu Dec 23 2010 T Koshiro
+ * test/aref_aset.rb : updated for Ruby 1.9.2
+ * lib/netcdf.rb: NetCDF.clean_tmpfile : lambda - proc
+ * verified that all test programs work fine with Ruby 1.9.2.
+
+Tue Dec 14 2010 T Koshiro
+ * netcdfraw.c : nctype2natype : char* - const char*
+ * test/aref_aset.rb, test/factor_offset.rb : bug fix.
+
+Mon Dec 13 2010 T Koshiro
+ * netcdfraw.c : patch for Ruby 1.9.2
+ - by S Kouketsu (dennou-ruby:003191)
+ - by T Koshiro (dennou-ruby:003226)
+
Mon Mar 15 2010 T Horinouchi
* ruby-netcdf-0.6.4 released (relase tag: ruby-netcdf-0_6_4)
diff --git a/extconf.rb b/extconf.rb
index ff42f7e..da90b7c 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -27,8 +27,8 @@ elsif xsystem(opendap-config --libs)
prefix_dods = `opendap-config --prefix`.gsub(/\n/, )
end
-if (enable_config('opendap',true) ( xsystem(opendap-config --libs)) ||
- xsystem(ncdap-config --libs) )
+if (enable_config('opendap',true) ( xsystem(opendap-config --libs) ||
+ xsystem(ncdap-config --libs) ) )
dir_config(libncdods,prefix_dods)
diff --git a/lib/netcdf.rb b/lib/netcdf.rb
index 3c26da4..6ff50bf 100644
--- a/lib/netcdf.rb
+++ b/lib/netcdf.rb
@@ -70,7 +70,7 @@ module NumRu
class NetCDF
def clean_tmpfile(path)
- lambda{
+ proc {
print removing , path, ... if $DEBUG
if File.exist?(path)
File.unlink(path)
diff --git a/netcdfraw.c b/netcdfraw.c
index c8e9797..6ecc045 100644
--- a/netcdfraw.c
+++ b/netcdfraw.c
@@ -6,16 +6,22 @@
/* for compatibility with ruby 1.6 */
#ifndef RSTRING_PTR
-#define RSTRING_PTR(a) (RSTRING(a)-ptr)
+#define RSTRING_PTR(s) (RSTRING(s)-ptr)
#endif
#ifndef RSTRING_LEN
-#define RSTRING_LEN(a) (RSTRING(a)-len)
+#define RSTRING_LEN(s) (RSTRING(s)-len)
#endif
#ifndef RARRAY_PTR
-#define RARRAY_PTR(s) (RARRAY(s)-ptr)
+#define RARRAY_PTR(a) (RARRAY(a)-ptr)
#endif
#ifndef RARRAY_LEN
-#define RARRAY_LEN(s) (RARRAY(s)-len)
+#define RARRAY_LEN(a) (RARRAY(a)-len)
+#endif
+#ifndef StringValueCStr
+#define StringValueCStr(s) STR2CSTR(s)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
/* Data to NArray */
@@ -345,7 +351,7 @@ NetCDF_free(struct Netcdf *Netcdffile)
}
static VALUE
-err_status2class(status)
+err_status2class(int status)
{
if(NC_ISSYSERR(status)){
return(rb_eNetcdfSyserr);
@@ -421,7 +427,7 @@ err_status2class(status)
}
}
-static char*
+static const char*
nctype2natype(int nctype){
switch(nctype){
case NC_CHAR:
@@ -677,7 +683,7 @@ NetCDF_put_att_numeric(int ncid, char *name,VALUE
value,VALUE atttype, int varid
ptr = na_val-ptr;
switch(na_typecode){
case NA_BYTE:
- status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,ptr);
+ status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char
*)ptr);
break;
case NA_SINT:
status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr);
@@ -794,7 +800,7 @@ NetCDF_def_var(VALUE file,VALUE var_name,VALUE
vartype,VALUE dimensions)
switch(TYPE(RARRAY_PTR(dimensions)[c_ndims-1-i])){
case T_STRING:
Check_Type(RARRAY_PTR(dimensions)[c_ndims-1-i],T_STRING);
- c_dim_name=STR2CSTR(RARRAY_PTR(dimensions)[c_ndims-1-i]);
+ c_dim_name=StringValueCStr(RARRAY_PTR(dimensions)[c_ndims-1-i]);
status=nc_inq_dimid(ncid,c_dim_name,dimidp);
if(status != NC_NOERR) NC_RAISE(status);
c_dimids[i]=dimidp;
@@ -1021,7 +1027,7 @@ NetCDF_open(VALUE mod,VALUE filename,VALUE omode)
VALUE retval;
Check_Type(filename,T_STRING);
- Check_SafeStr(filename);
+ SafeStringValue(filename);
c_filename=RSTRING_PTR(filename);
Check_Type(omode,T_FIXNUM);
c_omode=NUM2INT(omode);
@@ -1044,7 +1050,7 @@ NetCDF_create(VALUE mod,VALUE filename,VALUE cmode)
struct Netcdf *ncfile;
Check_Type(filename,T_STRING);
- Check_SafeStr(filename);
+ SafeStringValue(filename);
c_filename=RSTRING_PTR(filename);
Check_Type(cmode,T_FIXNUM);
c_cmode=NUM2INT(cmode);
@@ -1194,7 +1200,7 @@ NetCDF_dim_name(VALUE Dim,VALUE dimension_newname)
ncid=Netcdf_dim-ncid;
dimid=Netcdf_dim-dimid;
Check_Type(dimension_newname,T_STRING);
- c_dim_name =
[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch: commit 8de12d9b211cacf2d1f1409c564029d89cb6bf40 Merge: 2fecb9d7880ea9d5f2f70ee317296d5893b0e1e3 2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5 Author: Youhei SASAKI uwab...@gfd-dennou.org Date: Thu Feb 17 18:29:56 2011 +0900 Merge commit 'upstream/0.6.5' -- 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
[SCM] ruby-netcdf branch, master, updated. 17a746c4cce347676a620472b63a90e21f82ec08
The following commit has been merged in the master branch:
commit 17a746c4cce347676a620472b63a90e21f82ec08
Author: Youhei SASAKI uwab...@gfd-dennou.org
Date: Thu Feb 17 18:32:29 2011 +0900
remove unneeded patch: committed upstream
Signed-off-by: Youhei SASAKI uwab...@gfd-dennou.org
diff --git a/debian/changelog b/debian/changelog
index a0ccfc0..e03ec8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-netcdf (0.6.4-1) unstable; urgency=low
+ruby-netcdf (0.6.5-1) unstable; urgency=low
* Initial Release (Closes: #542144)
diff --git a/debian/patches/ChangeExtconf b/debian/patches/ChangeExtconf
deleted file mode 100644
index 16168f9..000
--- a/debian/patches/ChangeExtconf
+++ /dev/null
@@ -1,12 +0,0 @@
ruby-netcdf.orig/extconf.rb
-+++ ruby-netcdf/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 EOS
diff --git a/debian/patches/SupportRuby1.9.2 b/debian/patches/SupportRuby1.9.2
deleted file mode 100644
index 59a884f..000
--- a/debian/patches/SupportRuby1.9.2
+++ /dev/null
@@ -1,213 +0,0 @@
ruby-netcdf.orig/ChangeLog
-+++ ruby-netcdf/ChangeLog
-@@ -1,3 +1,8 @@
-+Mon Dec 13 2010 T Koshiro
-+ * netcdfraw.c : patch for Ruby 1.9.2
-+- by S Kouketsu (dennou-ruby:003191)
-+- by T Koshiro (dennou-ruby:003226)
-+
- Mon Mar 15 2010 T Horinouchi
- * ruby-netcdf-0.6.4 released (relase tag: ruby-netcdf-0_6_4)
-
ruby-netcdf.orig/netcdfraw.c
-+++ ruby-netcdf/netcdfraw.c
-@@ -6,16 +6,22 @@
-
- /* for compatibility with ruby 1.6 */
- #ifndef RSTRING_PTR
--#define RSTRING_PTR(a) (RSTRING(a)-ptr)
-+#define RSTRING_PTR(s) (RSTRING(s)-ptr)
- #endif
- #ifndef RSTRING_LEN
--#define RSTRING_LEN(a) (RSTRING(a)-len)
-+#define RSTRING_LEN(s) (RSTRING(s)-len)
- #endif
- #ifndef RARRAY_PTR
--#define RARRAY_PTR(s) (RARRAY(s)-ptr)
-+#define RARRAY_PTR(a) (RARRAY(a)-ptr)
- #endif
- #ifndef RARRAY_LEN
--#define RARRAY_LEN(s) (RARRAY(s)-len)
-+#define RARRAY_LEN(a) (RARRAY(a)-len)
-+#endif
-+#ifndef StringValueCStr
-+#define StringValueCStr(s) STR2CSTR(s)
-+#endif
-+#ifndef SafeStringValue
-+#define SafeStringValue(s) Check_SafeStr(s)
- #endif
-
- /* Data to NArray */
-@@ -345,7 +351,7 @@
- }
-
- static VALUE
--err_status2class(status)
-+err_status2class(int status)
- {
- if(NC_ISSYSERR(status)){
- return(rb_eNetcdfSyserr);
-@@ -425,17 +431,17 @@
- nctype2natype(int nctype){
- switch(nctype){
- case NC_CHAR:
--return(char);
-+return((char *)char);
- case NC_BYTE:
--return(byte);
-+return((char *)byte);
- case NC_SHORT:
--return(sint);
-+return((char *)sint);
- case NC_INT:
--return(int);
-+return((char *)int);
- case NC_FLOAT:
--return(sfloat);
-+return((char *)sfloat);
- case NC_DOUBLE:
--return(float);
-+return((char *)float);
- default:
- rb_raise(rb_eNetcdfError, No such netcdf type number %d\n,nctype);
- }
-@@ -677,7 +683,7 @@
- ptr = na_val-ptr;
- switch(na_typecode){
- case NA_BYTE:
-- status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,ptr);
-+ status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char
*)ptr);
- break;
- case NA_SINT:
- status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr);
-@@ -794,7 +800,7 @@
- switch(TYPE(RARRAY_PTR(dimensions)[c_ndims-1-i])){
- case T_STRING:
- Check_Type(RARRAY_PTR(dimensions)[c_ndims-1-i],T_STRING);
-- c_dim_name=STR2CSTR(RARRAY_PTR(dimensions)[c_ndims-1-i]);
-+ c_dim_name=StringValueCStr(RARRAY_PTR(dimensions)[c_ndims-1-i]);
- status=nc_inq_dimid(ncid,c_dim_name,dimidp);
- if(status != NC_NOERR) NC_RAISE(status);
- c_dimids[i]=dimidp;
-@@ -1021,7 +1027,7 @@
- VALUE retval;
-
- Check_Type(filename,T_STRING);
-- Check_SafeStr(filename);
-+ SafeStringValue(filename);
- c_filename=RSTRING_PTR(filename);
- Check_Type(omode,T_FIXNUM);
- c_omode=NUM2INT(omode);
-@@ -1044,7 +1050,7 @@
- struct Netcdf *ncfile;
-
- Check_Type(filename,T_STRING);
-- Check_SafeStr(filename);
-+ SafeStringValue(filename);
- c_filename=RSTRING_PTR(filename);
- Check_Type(cmode,T_FIXNUM);
- c_cmode=NUM2INT(cmode);
-@@ -1194,7 +1200,7 @@
- ncid=Netcdf_dim-ncid;
- dimid=Netcdf_dim-dimid;
- Check_Type(dimension_newname,T_STRING);
-- c_dim_name = STR2CSTR(dimension_newname);
-+ c_dim_name = StringValueCStr(dimension_newname);
-
- status = nc_rename_dim(ncid,dimid,c_dim_name);
- if(status !=NC_NOERR) NC_RAISE(status);
-@@ -1268,19 +1274,17 @@
- Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
- ncid=Netcdf_att-ncid;
- varid=Netcdf_att-varid;
-- c_att_name=ALLOCA_N(char,NC_MAX_NAME);
-- c_new_att_name=ALLOC_N(char,NC_MAX_NAME);
-
- c_att_name=Netcdf_att-name;
[SCM] ruby-netcdf annotated tag, debian/0.6.5-1, created. debian/0.6.5-1
The annotated tag, debian/0.6.5-1 has been created at 99e685e6a69456717828ee912e4a26c6ba935c90 (tag) tagging 17a746c4cce347676a620472b63a90e21f82ec08 (commit) replaces upstream/0.6.5 tagged by Youhei SASAKI on Tue Feb 22 15:53:30 2011 +0900 - Shortlog Debian release 0.6.5-1 Youhei SASAKI (11): Imported Debian patch 0.6.4-1 update Standard Version update Standard Version Imported Debian patch 0.6.4-1 Update debhelper version: 5 - 7 Update for Ruby1.9.2 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/ruby-netcdf apply CVS update (minor bugfix) apply CVS head (minor bug fix) Merge commit 'upstream/0.6.5' remove unneeded patch: committed upstream --- -- 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
[SCM] ruby-netcdf annotated tag, upstream/0.6.5, created. upstream/0.6.5
The annotated tag, upstream/0.6.5 has been created at 62cce25ab785c2182db09f11dbec386026272821 (tag) tagging 2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5 (commit) tagged by Youhei SASAKI on Thu Feb 17 18:29:56 2011 +0900 - Shortlog Upstream version 0.6.5 Youhei SASAKI (2): Imported Upstream version 0.6.4 Imported Upstream version 0.6.5 --- -- 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
[SCM] ruby-netcdf branch, pristine-tar, updated. dd56a177a3f30f683a3d000e2c7143ceb06b446b
The following commit has been merged in the pristine-tar branch: commit dd56a177a3f30f683a3d000e2c7143ceb06b446b Author: Youhei SASAKI uwab...@gfd-dennou.org Date: Thu Feb 17 18:29:56 2011 +0900 pristine-tar data for ruby-netcdf_0.6.5.orig.tar.gz diff --git a/ruby-netcdf_0.6.5.orig.tar.gz.delta b/ruby-netcdf_0.6.5.orig.tar.gz.delta new file mode 100644 index 000..97ad928 Binary files /dev/null and b/ruby-netcdf_0.6.5.orig.tar.gz.delta differ diff --git a/ruby-netcdf_0.6.5.orig.tar.gz.id b/ruby-netcdf_0.6.5.orig.tar.gz.id new file mode 100644 index 000..5648a83 --- /dev/null +++ b/ruby-netcdf_0.6.5.orig.tar.gz.id @@ -0,0 +1 @@ +2dcc65ebf064ca21de8db6dcb5250d0b64f30aa5 -- 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
[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.0-5-g7119aa9
The following commit has been merged in the master branch: commit dc11b1943161a5752c2bbdac0677468c03de2a7f Author: Youhei SASAKI uwab...@gfd-dennou.org Date: Tue Feb 22 16:05:42 2011 +0900 add test-target diff --git a/debian/patches/add-test-target.patch b/debian/patches/add-test-target.patch index 01d7e13..748f025 100644 --- a/debian/patches/add-test-target.patch +++ b/debian/patches/add-test-target.patch @@ -1,13 +1,12 @@ --- ruby-hdfeos5.orig/extconf.rb +++ ruby-hdfeos5/extconf.rb -@@ -59,8 +59,12 @@ +@@ -59,8 +59,11 @@ 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 lib/numru ] ( mkdir -p lib/numru cd lib/numru ln -s ../../hdfeos5raw.so hdfeos5raw.so ln -s ../hdfeos5.rb hdfeos5.rb )) ) -+ newmkfl.puts(\t\tcd test /usr/bin/ruby$(CDBS_RUBY_VER) -I../lib test_gd.rb 1/dev/null cd ..) + newmkfl.puts(\t\tcd test /usr/bin/ruby$(CDBS_RUBY_VER) -I../lib test_pt.rb 1/dev/null cd ..) + newmkfl.puts(\t\tcd test /usr/bin/ruby$(CDBS_RUBY_VER) -I../lib test_sw.rb 1/dev/null cd ..) + newmkfl.puts(\t\tcd test /usr/bin/ruby$(CDBS_RUBY_VER) -I../lib test_za.rb 1/dev/null cd ..) -- Ruby interface of HDF-EOS5 library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.0-5-g7119aa9
The following commit has been merged in the master branch: commit 7119aa92d14654d05db891389b3f79e384b294b1 Author: Youhei SASAKI uwab...@gfd-dennou.org Date: Tue Feb 22 16:09:43 2011 +0900 Add test-target patch diff --git a/debian/patches/0005-Added-comments-to-the-lines-that-cause-error-messagi.patch b/debian/patches/0005-Added-comments-to-the-lines-that-cause-error-messagi.patch new file mode 100644 index 000..df43c15 --- /dev/null +++ b/debian/patches/0005-Added-comments-to-the-lines-that-cause-error-messagi.patch @@ -0,0 +1,59 @@ +From 0977bce67d77317acced1e845036d39fcfe4f39f Mon Sep 17 00:00:00 2001 +From: horinout horinout +Date: Fri, 18 Feb 2011 08:32:29 + +Subject: [PATCH] * Added comments to the lines that cause error messaging, which is not + due to actual errors. + +--- + test/test_pt.rb | 14 +++--- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/test/test_pt.rb b/test/test_pt.rb +index e8793af..cfaa6ab 100644 +--- a/test/test_pt.rb b/test/test_pt.rb +@@ -121,9 +121,9 @@ time= [100,110,120,130,140] + dname1.writelevel(count, time,float) + + dname1=point8.var(Latitude) +-count =[5] +-time = NArray.float(6) +-time = [10,10,20,30,40] ++count =[3] ++#time = NArray.float(6) ++time = [10,10,20] + dname1.writelevel(count, time,float) + + dname1=point8.var(DeployDate) +@@ -198,7 +198,7 @@ p file4.has_point?() + point8=file4.point(FixedBuoy point) + p point8.getlevelname() + dname1=point8.var(Temperature) +-p dname1.get_vars_float() ++p dname1.get_vars_float() # error message is shown but it's normal + dname1=point8.var(Latitude) + p dname1.get_vars_double() + dname1=point8.var(DeployDate) +@@ -211,7 +211,7 @@ p dname1.natts + p dname1.fieldinfo() + p dname1.get + p dname1.fwdlink +-p dname1.bcklink ++#p dname1.bcklink + point8.detach + + point8=file4.point(FixedBuoy point) +@@ -233,8 +233,8 @@ p dname1.ndims + p dname1.dim_names + p dname1.natts + p dname1.fieldinfo() +-p dname1.get +-p dname1.get_vars_double() ++p dname1.get# error message is shown but it's normal ++p dname1.get_vars_double() # error message is shown but it's normal + point9.detach + file4.close + +-- +1.7.4.1 + diff --git a/debian/patches/series b/debian/patches/series index b229fc4..a8cd349 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,6 @@ 0002-update-ChangeLog.patch 0003-Ruby-1.9.2-compatibility.patch 0004-update-ChangeLog.patch +0005-Added-comments-to-the-lines-that-cause-error-messagi.patch fix-extconf-rb.patch add-test-target.patch -- Ruby interface of HDF-EOS5 library ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
