The following commit has been merged in the master branch:
commit 1f2a65ac27688bf361a6a4df219d4052db4176e0
Author: Youhei SASAKI <uwab...@gfd-dennou.org>
Date: Tue Dec 28 15:45:20 2010 +0900
New Upstream: 1.2.1
Signed-off-by: Youhei SASAKI <uwab...@gfd-dennou.org>
diff --git a/debian/changelog b/debian/changelog
index afa701c..0871daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+narray-miss (1.2.1-1) unstable; urgency=low
+
+ * New Upstream version 1.2.1
+ * Remove patch CVSupdate: sync upstream
+
+ -- Youhei SASAKI <uwab...@gfd-dennou.org> Tue, 28 Dec 2010 15:31:03 +0900
+
narray-miss (1.1.2-1) unstable; urgency=low
* Initial release (Closes: #523872)
diff --git a/debian/copyright b/debian/copyright
index 4a4ceea..c632007 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,76 +3,32 @@ Thu, 14 Jun 2007 14:14:18 +0900.
It was downloaded from http://ruby.gfd-dennou.org/products/narray_miss/
-Upstream Author: Seiya Nishizawa <se...@gfd-dennou.org>
-
-Copyright(c) 2008, Dennou-Ruby Project All right reserved.
-
-License:
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <m...@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see /usr/share/common-licenses/GPL), or the conditions below:
-
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
- modifications to Usenet or an equivalent medium, or by allowing
- the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or executable
- form, provided that you do at least ONE of the following:
-
- a) distribute the executables and library files of the software,
- together with instructions (in the manual page or equivalent)
- on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
- the software.
-
- c) give non-standard executables non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under this terms.
-
- They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
- files under the ./missing directory. See each file for the copying
- condition.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
-
+Upstream Author: Seiya Nishizawa <seiya_(at)_gfd-dennou.org>
+Copyright(c) 2008-2010, Dennou-Ruby Project All right reserved.
+License:
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ This package 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
+ Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+The Debian packaging is:
+ Copyright (C) 2009 Youhei SASAKI <uwab...@gfd-dennou.org>
+and is licensed under the LGPL version 2,
+see `/usr/share/common-licenses/LGPL-2'.
diff --git a/debian/patches/CVSUpdate b/debian/patches/CVSUpdate
deleted file mode 100644
index 19dbb64..0000000
--- a/debian/patches/CVSUpdate
+++ /dev/null
@@ -1,143 +0,0 @@
---- narray-miss.orig/lib/narray_miss.rb
-+++ narray-miss/lib/narray_miss.rb
-@@ -108,7 +108,7 @@
- create (({NArrayMiss})) form [((|value|)), ...].
- --- NArrayMiss.to_nam(array [,mask])
- create (({NArrayMiss})) from ((|array|)).
-- ((|array|)) must be (({Array})) or (({NArray})).
-+ ((|array|)) must be (({Numeric})) (({Array})) or (({NArray})).
- --- NArrayMiss.to_nam_no_dup(array [,mask])
- convert from ((|array|)) to (({NArrayMiss})).
-
-@@ -161,7 +161,7 @@
-
- if arg.length==2 then
- mask = arg[1]
-- if Numeric===mask then mask = [mask] end
-+ if Numeric===mask then mask = array.ne(mask) end
- if Array===mask then
- mask = NArray.to_na(mask).ne(0)
- end
-@@ -183,7 +183,7 @@
- __new__(array,mask)
- end
- def self.to_nam(*arg)
-- if !(Numeric===arg[0]) && Array===arg[0] && !arg[0].is_a?(NArray)
-+ if !(Numeric===arg[0]) && !(Array===arg[0]) && !arg[0].is_a?(NArray)
- raise "first argument must be Numeric, NArray or Array"
- end
- arg[0] = arg[0].dup if !(Numeric===arg[0])
-@@ -260,11 +260,20 @@
- =end
-
- def [](*arg)
-- obj = @array[*arg]
-- if Numeric===obj
-- return obj
-+ if arg[0].class == NArrayMiss && arg[0].typecode == BYTE
-+ obj = @array[arg[0].to_na(0)]
-+ if Numeric===obj
-+ return obj
-+ else
-+ return NArrayMiss.to_nam_no_dup(obj)
-+ end
- else
-- return NArrayMiss.to_nam_no_dup(obj,@mask[*arg])
-+ obj = @array[*arg]
-+ if Numeric===obj
-+ return obj
-+ else
-+ return NArrayMiss.to_nam_no_dup(obj,@mask[*arg])
-+ end
- end
- end
- def slice(*arg)
-@@ -295,12 +304,20 @@
- end
-
- def []=(*arg)
-- self.set_without_validation(*arg)
-- if arg[-1].class != NArrayMiss && arg[-1] then
-- if arg.length==1 then
-- @mask=1
-- else
-- @mask[*arg[0..-2]] = 1
-+ if arg.length == 2 && arg[0].class == NArrayMiss && arg[0].typecode ==
BYTE
-+ idx = arg[0].to_na(0)
-+ self.set_without_validation(idx,arg[-1])
-+ if arg[-1].class != NArrayMiss && arg[-1] then
-+ @mask[idx] = 1
-+ end
-+ else
-+ self.set_without_validation(*arg)
-+ if arg[-1].class != NArrayMiss && arg[-1] then
-+ if arg.length==1 then
-+ @mask=1
-+ else
-+ @mask[*arg[0..-2]] = 1
-+ end
- end
- end
- return self
-@@ -980,11 +997,11 @@
- obj
- end
- def hton
-- NArray.to_nam(@array.hton,@mask.hton)
-+ NArrayMiss.to_nam(@array.hton,@mask.hton)
- end
- alias :ntoh :hton
- def htov
-- NArray.to_nam(@array.htov,@mask.htov)
-+ NArrayMiss.to_nam(@array.htov,@mask.htov)
- end
- alias :vtoh :htov
-
-@@ -1036,10 +1053,12 @@
-
- def set_valid(*pos)
- @mask[*pos] = 1
-+ self
- end
- alias validation set_valid
- def set_invalid(*pos)
- @mask[*pos] = 0
-+ self
- end
- alias invalidation set_invalid
- def all_valid
-@@ -1186,7 +1205,7 @@
- sep = ", "
- const = Hash.new
- NArray.constants.each{|c| const[NArray.const_get(c)] = c}
-- str_ret = "NArrayMiss."+const[typecode].downcase+"("+shape.join(",")+"):"
-+ str_ret =
"NArrayMiss."+const[typecode].to_s.downcase+"("+shape.join(",")+"):"
- if rank == 0 then
- str_ret += " []"
- return str_ret
-@@ -1272,7 +1291,7 @@
- def routine1(arg,dummy)
- flag=true
- if Numeric===arg then
-- term1 = @array
-+ term1 = @array.dup
- term2 = arg
- mask = true
- elsif arg.class == Array then
-@@ -1281,13 +1300,13 @@
- term2 = NArray.to_na(arg)
- mask = NArray.byte(*term2.shape).fill(1)
- elsif arg.class == NArray then
-- term1 = @array
-+ term1 = @array.dup
- term1[@mask.not] = dummy
-- term2 = arg
-+ term2 = arg.dup
- mask = NArray.byte(*term2.shape).fill(1)
- elsif arg.class == NArrayMiss then
- mask = arg.get_mask
-- term1 = @array
-+ term1 = @array.dup
- term1[@mask.not] = dummy
- term2 = arg.to_na
- term2[arg.get_mask!.not] = dummy
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7686bc7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-CVSUpdate
--
Additional Ruby Class handling missing value
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
