r46486 - in /packages/wordnet/trunk/debian: changelog control rules wn-for-goldendict.rb

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Jan 28 22:26:39 2014
New Revision: 46486

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46486
Log:
Enable building with default ruby (2.0)

Modified:
    packages/wordnet/trunk/debian/changelog
    packages/wordnet/trunk/debian/control
    packages/wordnet/trunk/debian/rules
    packages/wordnet/trunk/debian/wn-for-goldendict.rb

Modified: packages/wordnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/changelog?rev=46486&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog	(original)
+++ packages/wordnet/trunk/debian/changelog	Tue Jan 28 22:26:39 2014
@@ -1,6 +1,9 @@
 wordnet (1:3.0-32) UNRELEASED; urgency=medium
 
   * cme fix dpkg-control
+  * Enable building with ruby default (2.0) - thanks for the patch to
+    Antonio Terceiro <terceiro at debian.org>
+    Closes: #733110
 
  -- Andreas Tille <tille at debian.org>  Tue, 28 Jan 2014 13:59:14 +0100
 

Modified: packages/wordnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/control?rev=46486&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/control	(original)
+++ packages/wordnet/trunk/debian/control	Tue Jan 28 22:26:39 2014
@@ -22,7 +22,7 @@
                man-db,
                libxss-dev,
                libxft-dev,
-               ruby1.8,
+               ruby,
                imagemagick
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/wordnet/trunk/

Modified: packages/wordnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/rules?rev=46486&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/rules	(original)
+++ packages/wordnet/trunk/debian/rules	Tue Jan 28 22:26:39 2014
@@ -48,7 +48,7 @@
 	set -e; \
 	if dpkg-architecture -qDEB_BUILD_ARCH|grep -q 'mips\|arm\|s390'; then \
 		if test "$$FORCE_GOLDENDICT_BUILD" -gt 0; then \
-			ruby1.8 debian/wn-for-goldendict.rb > $@; \
+			ruby debian/wn-for-goldendict.rb > $@ || ($(RM) $@; false); \
 		else \
 			echo "Building of goldendict-wordnet dictionary was skipped"; \
 			echo "to build this package use environment variable"; \
@@ -56,5 +56,5 @@
 			touch $@; \
 		fi; \
 	else \
-		ruby1.8 debian/wn-for-goldendict.rb > $@; \
+		ruby debian/wn-for-goldendict.rb > $@ || ($(RM) $@; false); \
 	fi

Modified: packages/wordnet/trunk/debian/wn-for-goldendict.rb
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/wn-for-goldendict.rb?rev=46486&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/wn-for-goldendict.rb	(original)
+++ packages/wordnet/trunk/debian/wn-for-goldendict.rb	Tue Jan 28 22:26:39 2014
@@ -293,14 +293,14 @@
     @offset = data[0].to_i
     @lex_filenum = data[1]
     @pos = data[2]
-    @w_cnt = [data[3]].pack('H2')[0]
+    @w_cnt = [data[3]].pack('H2').bytes.first
     @words = []
     i = 4
     @lex_ids = []
     @w_cnt.times {
       @words << data[i].gsub(/_/, ' ').gsub(/\s*\((p|a|ip)\)\s*$/, '')
       i += 1
-      @lex_ids << [data[i]].pack('h')[0]
+      @lex_ids << [data[i]].pack('h').bytes.first
       i += 1
     }
 
@@ -362,8 +362,8 @@
     if (src_target == "0000")
       return other.words
     else
-      src = [src_target[0, 2]].pack('H2')[0]
-      target = [src_target[2, 2]].pack('H2')[0]
+      src = [src_target[0, 2]].pack('H2').bytes.first
+      target = [src_target[2, 2]].pack('H2').bytes.first
       h_src = words[src - 1]
       if (h_src == headword)
         return [other.words[target - 1]]
@@ -374,7 +374,7 @@
   end
   def get_frame_data(headword, frame)
     f_num = frame[0].to_i
-    w_num = [frame[1]].pack('H2')[0]
+    w_num = [frame[1]].pack('H2').bytes.first
     if (w_num == 0)
       return [$frames[f_num]]
     else