Package: hyperestraier
Severity: important
Hello,
your package ruby-hyperestraier uses Ruby 1.8 and Ruby 1.9. Please see attached
patch.
This patch adds gem2deb support to your package. This build your ruby library
against 1.9
and 2.0.
That patch is against your current Git tree, please include it, so we can
remove Ruby 1.8
from the archive.
Thanks,
Jonas
diff --git a/debian/control b/debian/control
index 35d151b..e7f4c58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: hyperestraier
Section: text
Priority: optional
Maintainer: KURASHIKI Satoru <[email protected]>
-Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, zlib1g-dev, libqdbm-dev (>= 1.8.75), libfcgi-dev (>= 2.4.0-6), ruby1.9.1, ruby1.9.1-dev, openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe s390 sparc], chrpath, perl
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, zlib1g-dev, libqdbm-dev (>= 1.8.75), libfcgi-dev (>= 2.4.0-6), gem2deb, openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe s390 sparc], chrpath, perl
Standards-Version: 3.9.4
Homepage: http://fallabs.com/hyperestraier/
Vcs-Git: git://anonscm.debian.org/collab-maint/hyperestraier.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/hyperestraier.git
+XS-Ruby-Versions: all
Package: hyperestraier
Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386
@@ -47,6 +48,8 @@ Description: full-text search system Libraries [development]
library.
Package: ruby-hyperestraier
+XB-Ruby-Versions: ${ruby:Versions}
+X-DhRuby-Root: rubynative/src
Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386
Section: ruby
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/ruby-hyperestraier.dirs b/debian/ruby-hyperestraier.dirs
deleted file mode 100644
index 6a3e46f..0000000
--- a/debian/ruby-hyperestraier.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby
-usr/bin
diff --git a/debian/ruby-hyperestraier.examples b/debian/ruby-hyperestraier.examples
index 3ed322d..cbba263 100644
--- a/debian/ruby-hyperestraier.examples
+++ b/debian/ruby-hyperestraier.examples
@@ -1,3 +1,2 @@
rubypure/pure
rubynative/native
-rubynative19/native
diff --git a/debian/rules b/debian/rules
index 4310743..451b756 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@
# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -34,8 +34,6 @@ JAVA_UNSUPPORTED_CPUS = zhppaz zmipsz zs390xz zmipselz
JAVA_UNSUPPORTED_SYSTEMS = zkfreebsd-gnuz zgnuz
RUBYLIBDIR=/usr/lib/ruby/vendor_ruby
-RUBY18ARCHDIR=/usr/lib/ruby/vendor_ruby/1.8/$$(arch)
-RUBY19ARCHDIR=/usr/lib/ruby/vendor_ruby/1.9.1/$$(arch)
export CFLAGS += `dpkg-buildflags --get CFLAGS`
export CPPFLAGS += `dpkg-buildflags --get CPPFLAGS`
@@ -75,7 +73,6 @@ endif
$(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES)
cd rubypure && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES)
$(MAKE)
- cd rubynative && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES)
ifeq "$(BUILD_JAVA)" "true"
cd javapure && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) \
--libdir=\$${prefix}/share/hyperestraier
@@ -95,8 +92,7 @@ build-arch-stamp: config.status
$(MAKE) estseek.fcgi
cd rubypure && $(MAKE)
perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby -w@' rubypure/estcall.rb
- export RUBY=/usr/bin/ruby1.9.1 && cd rubynative && $(MAKE) && $(MAKE) check
- perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby1.9.1 -w@' rubynative/estcmd.rb
+ perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby -w@' rubynative/estcmd.rb
ifeq "$(BUILD_JAVA)" "true"
cd javapure && $(MAKE)
cd javanative && $(MAKE) && $(MAKE) check
@@ -140,8 +136,8 @@ binary-arch-stamp: build-arch
cp -Rf rubypure/estraierpure.rb $(CURDIR)/debian/ruby-hyperestraier/$(RUBYLIBDIR)
install -m 644 rubynative/estraier-doc.rb $(CURDIR)/debian/ruby-hyperestraier/$(RUBYLIBDIR)
- mkdir -p $(CURDIR)/debian/ruby-hyperestraier/$(RUBY19ARCHDIR)
- cp -Rf rubynative/src/estraier.so $(CURDIR)/debian/ruby-hyperestraier/$(RUBY19ARCHDIR)
+ # build Ruby with gem2deb
+ dh_ruby --install
# create example directory tree
cp -pR rubypure/example rubypure/pure
