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

[tille at users.alioth.debian.org]

Author: tille
Date: Wed Jun  6 07:34:05 2012
New Revision: 44966

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44966
Log:
Use the conservative method to deal with ruby incompatibility problems and stick to ruby1.8

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=44966&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog (original)
+++ packages/wordnet/trunk/debian/changelog Wed Jun  6 07:34:05 2012
@@ -1,9 +1,15 @@
-wordnet (1:3.0-28) UNRELEASED; urgency=low
+wordnet (1:3.0-28) unstable; urgency=low
 
   * debian/dict-wn.post{inst,rm}: verify start script using
     "invoke-rc.d --query" first (thanks for the patch to
     Ryo IGARASHI <rigarash at gmail.com>)
     Closes: #675534, #673620
+  * debian/control: Explicitly Build-Depends ruby1.8
+  + debian/rules: Explicitly call ruby1.8 because there is some
+    difference in handling of strings and bytes in ruby 1.8 and
+    1.9 and the current script to build the goldendict package
+    fails with ruby 1.9
+    Closes: #676114
 
  -- Andreas Tille <tille at debian.org>  Mon, 04 Jun 2012 13:27:27 +0200
 

Modified: packages/wordnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/control?rev=44966&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/control (original)
+++ packages/wordnet/trunk/debian/control Wed Jun  6 07:34:05 2012
@@ -2,7 +2,7 @@
 Section: text
 Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 8), quilt,
  tk8.5-dev, tcl8.5-dev, libxaw7-dev, flex, dictzip, python, groff,
- autoconf, automake, libtool, bison, man-db, libxss-dev, libxft-dev, ruby,
+ autoconf, automake, libtool, bison, man-db, libxss-dev, libxft-dev, ruby1.8,
  imagemagick
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>

Modified: packages/wordnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/rules?rev=44966&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/rules (original)
+++ packages/wordnet/trunk/debian/rules Wed Jun  6 07:34:05 2012
@@ -45,7 +45,7 @@
 	set -e; \
 	if dpkg-architecture -qDEB_BUILD_ARCH|grep -q 'mips\|arm\|s390'; then \
 		if test "$$FORCE_GOLDENDICT_BUILD" -gt 0; then \
-			ruby debian/wn-for-goldendict.rb > $@; \
+			ruby1.8 debian/wn-for-goldendict.rb > $@; \
 		else \
 			echo "Building of goldendict-wordnet dictionary was skipped"; \
 			echo "to build this package use environment variable"; \
@@ -53,5 +53,5 @@
 			touch $@; \
 		fi; \
 	else \
-		ruby debian/wn-for-goldendict.rb > $@; \
+		ruby1.8 debian/wn-for-goldendict.rb > $@; \
 	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=44966&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/wn-for-goldendict.rb (original)
+++ packages/wordnet/trunk/debian/wn-for-goldendict.rb Wed Jun  6 07:34:05 2012
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+# encoding: utf-8
 # A script to convert WordNet 3.0 dictionary from original
 # format (http://wordnet.princeton.edu/wordnet/download/)
 # to DSL format, suitable for Lingvo and GoldenDict.