diff -Nru ruby-ole-1.2.11.1/ChangeLog ruby-ole-1.2.11.2/ChangeLog --- ruby-ole-1.2.11.1/ChangeLog 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/ChangeLog 2011-09-11 02:05:15.000000000 +0000 @@ -1,3 +1,15 @@ +== 1.2.11.2 / 2011-09-07 + +- Remove empty dirents after constructing tree (fixes non-contiguous + allocation table usage). +- Fix fallback Symbol#to_proc to match activesupport definition in case + we get loaded first (github #2, lazylester). +- Use method_defined? for fallback guards to support newer versions of + ruby (jocker). +- Add guard on FileTime#initialize to skip for newer versions of ruby. + Missing required methods, but optimization no longer relevant + anyway (github #4, sagmor). + == 1.2.11.1 / 2010-10-24 - Add gemspec and docs to packages so tests can pass again. diff -Nru ruby-ole-1.2.11.1/debian/changelog ruby-ole-1.2.11.2/debian/changelog --- ruby-ole-1.2.11.1/debian/changelog 2011-07-29 07:22:06.000000000 +0000 +++ ruby-ole-1.2.11.2/debian/changelog 2012-01-21 20:04:25.000000000 +0000 @@ -1,3 +1,19 @@ +ruby-ole (1.2.11.2-1) unstable; urgency=low + + * New upstream release: 1.2.11.2 + * Add me to Uploaders + + -- Youhei SASAKI Sun, 22 Jan 2012 05:03:29 +0900 + +ruby-ole (1.2.11.1-6) unstable; urgency=low + + * Transitional packages should be oldlibs/extra as requested by + lintian + * Fix FTBFS due to a call to a no-longer-provided interface + (DateTime#new!) under Ruby 1.9.1 (Closes: #652752) + + -- Gunnar Wolf Mon, 16 Jan 2012 00:33:27 -0600 + ruby-ole (1.2.11.1-5) unstable; urgency=low [Antonio Terceiro] diff -Nru ruby-ole-1.2.11.1/debian/control ruby-ole-1.2.11.2/debian/control --- ruby-ole-1.2.11.1/debian/control 2011-07-29 06:57:54.000000000 +0000 +++ ruby-ole-1.2.11.2/debian/control 2012-01-21 20:04:25.000000000 +0000 @@ -2,7 +2,8 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers -Uploaders: Gunnar Wolf , Ryan Niebur +Uploaders: Gunnar Wolf , Ryan Niebur , Youhei SASAKI +DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2) Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-ole.git @@ -29,6 +30,7 @@ # Transitional packages Package: libole-ruby Section: oldlibs +Priority: extra Architecture: all Depends: ${misc:Depends}, ruby-ole Description: Transitional package for ruby-ole @@ -37,6 +39,7 @@ Package: libole-ruby-doc Section: oldlibs +Priority: extra Architecture: all Depends: ${misc:Depends}, ruby-ole Description: Transitional package for ruby-ole @@ -45,6 +48,7 @@ Package: libole-ruby1.8 Section: oldlibs +Priority: extra Architecture: all Depends: ${misc:Depends}, ruby-ole Description: Transitional package for ruby-ole @@ -53,6 +57,7 @@ Package: libole-ruby1.9.1 Section: oldlibs +Priority: extra Architecture: all Depends: ${misc:Depends}, ruby-ole Description: Transitional package for ruby-ole diff -Nru ruby-ole-1.2.11.1/debian/copyright ruby-ole-1.2.11.2/debian/copyright --- ruby-ole-1.2.11.1/debian/copyright 2011-05-17 21:07:54.000000000 +0000 +++ ruby-ole-1.2.11.2/debian/copyright 2012-01-21 20:04:25.000000000 +0000 @@ -1,21 +1,44 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173 Upstream-Name: Ruby-ole Upstream-Contact: Charles Lowe Source: http://code.google.com/p/ruby-ole/ Files: * -Copyright: Copyright © 2007-2009 Charles Lowe -License: GPL-2 +Copyright: Copyright © 2007-2010 Charles Lowe +License: MIT-X Files: debian/* Copyright: Copyright © 2009-2011, Gunnar Wolf -License: GPL-2 +License: GPL-3+ -License: GPL-2 +License: GPL-3+ 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; version + 3 or -at your option- any later version. . On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. + License version 3x can be found in the file + `/usr/share/common-licenses/GPL-3'. + +License: MIT-X + Copyright (c) 2007-2010 Charles Lowe + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + diff -Nru ruby-ole-1.2.11.1/debian/patches/dont_use_deprecated_new0 ruby-ole-1.2.11.2/debian/patches/dont_use_deprecated_new0 --- ruby-ole-1.2.11.1/debian/patches/dont_use_deprecated_new0 1970-01-01 00:00:00.000000000 +0000 +++ ruby-ole-1.2.11.2/debian/patches/dont_use_deprecated_new0 2012-01-21 20:04:25.000000000 +0000 @@ -0,0 +1,31 @@ +Author: Gunnar Wolf +Origin: vendor +Bug: http://bugs.debian.org/652752 +Forwarded: no +Last-Update: 2012-01-16 +Description: Fix FTBFS due to a deprecated method call + FileTime#new overrides DateTime#new by using its faster creator new0 + (previously called new!). That method no longer exists under Ruby + 1.9.x (i.e. see http://bugs.ruby-lang.org/issues/4776), so we revert + to calling the super function when they are not defined. + +Index: ruby-ole/lib/ole/types/base.rb +=================================================================== +--- ruby-ole.orig/lib/ole/types/base.rb 2012-01-15 12:52:38.000000000 -0600 ++++ ruby-ole/lib/ole/types/base.rb 2012-01-15 23:58:16.000000000 -0600 +@@ -60,8 +60,14 @@ + class FileTime < DateTime + SIZE = 8 + +- # DateTime.new is slow... faster version for FileTime ++ # DateTime.new is slow... If we are running ++ # under Ruby 1.8, we can set up a faster ++ # version for FileTime. ++ # Ruby 1.9.x no longer offers the new0 / new! ++ # interface, so we have to use the version from ++ # DateTime. + def self.new year, month, day, hour=0, min=0, sec=0, usec=0 ++ return super unless respond_to?(:new!) or respond_to?(:new0) + # DateTime will remove leap and leap-leap seconds + sec = 59 if sec > 59 + if month <= 2 diff -Nru ruby-ole-1.2.11.1/debian/patches/series ruby-ole-1.2.11.2/debian/patches/series --- ruby-ole-1.2.11.1/debian/patches/series 2011-05-17 21:07:54.000000000 +0000 +++ ruby-ole-1.2.11.2/debian/patches/series 2012-01-21 20:04:25.000000000 +0000 @@ -1 +1,2 @@ +dont_use_deprecated_new0 move_propids_location diff -Nru ruby-ole-1.2.11.1/lib/ole/storage/base.rb ruby-ole-1.2.11.2/lib/ole/storage/base.rb --- ruby-ole-1.2.11.1/lib/ole/storage/base.rb 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/lib/ole/storage/base.rb 2011-09-11 02:05:15.000000000 +0000 @@ -124,7 +124,7 @@ # get block chain for directories, read it, then split it into chunks and load the # directory entries. semantics changed - used to cut at first dir where dir.type == 0 @dirents = @bbat.read(@header.dirent_start).to_enum(:each_chunk, Dirent::SIZE). - map { |str| Dirent.new self, str }.reject { |d| d.type_id == 0 } + map { |str| Dirent.new self, str } # now reorder from flat into a tree # links are stored in some kind of balanced binary tree @@ -143,6 +143,7 @@ end @root = @dirents.to_tree.first + @dirents.reject! { |d| d.type_id == 0 } # silence this warning by default, its not really important (issue #5). # fairly common one appears to be "R" (from office OS X?) which smells # like some kind of UTF16 snafu, but scottwillson also has had some kanji... diff -Nru ruby-ole-1.2.11.1/lib/ole/storage/version.rb ruby-ole-1.2.11.2/lib/ole/storage/version.rb --- ruby-ole-1.2.11.1/lib/ole/storage/version.rb 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/lib/ole/storage/version.rb 2011-09-11 02:05:15.000000000 +0000 @@ -2,7 +2,7 @@ module Ole # :nodoc: class Storage - VERSION = '1.2.11.1' + VERSION = '1.2.11.2' end end diff -Nru ruby-ole-1.2.11.1/lib/ole/support.rb ruby-ole-1.2.11.2/lib/ole/support.rb --- ruby-ole-1.2.11.1/lib/ole/support.rb 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/lib/ole/support.rb 2011-09-11 02:05:15.000000000 +0000 @@ -27,7 +27,7 @@ class File # :nodoc: # for interface consistency with StringIO etc (rather than adding #stat # to them). used by RangesIO. - unless File.instance_methods.include?(:size) + unless File.method_defined?(:size) def size stat.size end @@ -35,9 +35,9 @@ end class Symbol # :nodoc: - unless Symbol.instance_methods.include?(:to_proc) + unless Symbol.method_defined?(:to_proc) def to_proc - proc { |a| a.send self } + Proc.new { |*args| args.shift.__send__(self, *args) } end end end diff -Nru ruby-ole-1.2.11.1/lib/ole/types/base.rb ruby-ole-1.2.11.2/lib/ole/types/base.rb --- ruby-ole-1.2.11.1/lib/ole/types/base.rb 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/lib/ole/types/base.rb 2011-09-11 02:05:15.000000000 +0000 @@ -76,7 +76,7 @@ # see issue #4. msg = respond_to?(:new!) ? :new! : :new0 send msg, jd + fr - 0.5, 0, ITALY - end + end if respond_to?(:new!) || respond_to?(:new0) def self.from_time time new(*(time.to_a[0, 6].reverse + [time.usec])) diff -Nru ruby-ole-1.2.11.1/metadata.yml ruby-ole-1.2.11.2/metadata.yml --- ruby-ole-1.2.11.1/metadata.yml 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/metadata.yml 2011-09-11 02:05:15.000000000 +0000 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: ruby-ole version: !ruby/object:Gem::Version - hash: 97 + hash: 103 prerelease: false segments: - 1 - 2 - 11 - - 1 - version: 1.2.11.1 + - 2 + version: 1.2.11.2 platform: ruby authors: - Charles Lowe @@ -16,7 +16,7 @@ bindir: bin cert_chain: [] -date: 2010-10-24 00:00:00 -04:00 +date: 2011-09-08 00:00:00 -04:00 default_executable: dependencies: [] diff -Nru ruby-ole-1.2.11.1/test/test_support.rb ruby-ole-1.2.11.2/test/test_support.rb --- ruby-ole-1.2.11.1/test/test_support.rb 2011-05-16 14:53:20.000000000 +0000 +++ ruby-ole-1.2.11.2/test/test_support.rb 2011-09-11 02:05:15.000000000 +0000 @@ -44,6 +44,11 @@ # note not [6, 7] - no overlaps assert_equal [6], str.indexes('||') end + + def test_symbol + array = (1..10).to_a + assert_equal 55, array.inject(&:+) + end end class TestIOMode < Test::Unit::TestCase