tags 404144 + patch
thanks

The ruby package currently seems to pull in ruby1.8. The migemo package
was last updated during 2004, at which time I guess 1.8 wasn't the
default. I've created a patch that removes the changes made to
explicitly use the 1.8 version where there where no need. I would very
much appreciate if someone with a bit more clue about ruby then me (>0
that is) could look at and/or test this....

Patch attached.

-- 
Regards,
Andreas Henriksson
diff -uriNp migemo-0.40/debian/compat migemo-0.40-fixed/debian/compat
--- migemo-0.40/debian/compat	1970-01-01 01:00:00.000000000 +0100
+++ migemo-0.40-fixed/debian/compat	2006-12-23 23:10:43.000000000 +0100
@@ -0,0 +1 @@
+5
diff -uriNp migemo-0.40/debian/control migemo-0.40-fixed/debian/control
--- migemo-0.40/debian/control	2006-12-23 23:07:06.000000000 +0100
+++ migemo-0.40-fixed/debian/control	2006-12-23 23:29:33.000000000 +0100
@@ -2,12 +2,13 @@ Source: migemo
 Section: utils
 Priority: optional
 Maintainer: Fumitoshi UKAI <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0), ruby1.8, ruby1.8-dev, libromkan-ruby1.8, libbsearch-ruby1.8, skkdic, textutils, emacs21 | emacsen, automake
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.0)
+Build-Depends-Indep: ruby, ruby1.8-dev, libromkan-ruby, libbsearch-ruby, skkdic, textutils, emacs21 | emacsen, automake
+Standards-Version: 3.7.2
 
 Package: migemo
 Architecture: all
-Depends: emacs21 | emacsen, apel, ruby1.8, libromkan-ruby1.8, libbsearch-ruby1.8
+Depends: emacs21 | emacsen, apel, ruby, libromkan-ruby, libbsearch-ruby
 Conflicts: migemo-perl
 Description: Japanese incremental search with Romaji on Emacsen
  migemo is a tool that supports Japanese incremental search with Romaji.
diff -uriNp migemo-0.40/debian/rules migemo-0.40-fixed/debian/rules
--- migemo-0.40/debian/rules	2006-12-23 23:07:06.000000000 +0100
+++ migemo-0.40-fixed/debian/rules	2006-12-23 23:14:09.000000000 +0100
@@ -9,13 +9,10 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-RUBY=ruby1.8
+RUBY=ruby
 RUBYPATH=/usr/bin/$(RUBY)
 RUBYLIBDIR=$(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
 
@@ -64,7 +61,7 @@ install: build
 
 	# Add here commands to install the package into debian/migemo.
 	LANG=C $(MAKE) install-binSCRIPTS prefix=$(CURDIR)/debian/migemo/usr RUBY=$(RUBYPATH)
-	sh ./debian/fixshbang.sh debian/migemo $(RUBYPATH)
+	#sh ./debian/fixshbang.sh debian/migemo $(RUBYPATH)
 	LANG=C $(MAKE) install-pkgdataDATA prefix=$(CURDIR)/debian/migemo/usr RUBY=$(RUBYPATH)
 	mkdir -p $(CURDIR)/debian/migemo/$(RUBYLIBDIR)
 	LANG=C $(MAKE) install-rubyDATA prefix=$(CURDIR)/debian/migemo/usr rubydir=$(CURDIR)/debian/migemo/$(RUBYLIBDIR) RUBY=$(RUBYPATH)

Reply via email to