package: gonzai
Hi,
please include the changes from 1.2+cvs20070129-3.1 into your next upload.
debdiff is attached.
cheers,
Holger
diff -u gonzui-1.2+cvs20070129/debian/changelog gonzui-1.2+cvs20070129/debian/changelog
--- gonzui-1.2+cvs20070129/debian/changelog
+++ gonzui-1.2+cvs20070129/debian/changelog
@@ -1,3 +1,18 @@
+gonzui (1.2+cvs20070129-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build only with Ruby 1.8.
+ + debian/control: remove ruby from (Build-)Depends field as it would
+ pull in unnecessarily ruby-1.9.1
+ + debian/rules: add --with-ruby flag to configure script to point to
+ /usr/bin/ruby1.8 binary
+ + acinclude.m4: use $RUBY variable instead of hardcoded name 'ruby' for
+ the Ruby binary to ensure that Ruby 1.8 is used in the configuration
+ process. (Closes: #676106)
+ * Set urgency to medium, as a RC bug is fixed.
+
+ -- Cédric Boutillier <cedric.boutill...@gmail.com> Tue, 04 Sep 2012 10:23:01 +0200
+
gonzui (1.2+cvs20070129-3) unstable; urgency=low
* Merge NMU by Michael Schutte <m.schutte...@gmail.com> on Fri, 22
diff -u gonzui-1.2+cvs20070129/debian/rules gonzui-1.2+cvs20070129/debian/rules
--- gonzui-1.2+cvs20070129/debian/rules
+++ gonzui-1.2+cvs20070129/debian/rules
@@ -11,8 +11,9 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-RUBYLIBDIR = $(shell ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
-RUBYARCHDIR = $(shell ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
+RUBY = /usr/bin/ruby1.8
+RUBYLIBDIR = $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
+RUBYARCHDIR = $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["archdir"]')
CFLAGS = -Wall -g
@@ -31,7 +32,8 @@
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--localstatedir=/var/spool CFLAGS="$(CFLAGS)" \
- --with-rubydir=$(RUBYLIBDIR) --with-rubyarchdir=$(RUBYARCHDIR)
+ --with-rubydir=$(RUBYLIBDIR) --with-rubyarchdir=$(RUBYARCHDIR) \
+ --with-ruby=$(RUBY)
touch configure-stamp
diff -u gonzui-1.2+cvs20070129/debian/control gonzui-1.2+cvs20070129/debian/control
--- gonzui-1.2+cvs20070129/debian/control
+++ gonzui-1.2+cvs20070129/debian/control
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: ARAKI Yasuhiro <a...@debian.org>
Uploaders: NIIBE Yutaka <gni...@fsij.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, autoconf (>= 2.50), automake (>= 1.9.5), ruby, ruby1.8 (>= 1.8.2), ruby1.8-dev (>= 1.8.2), libdb-ruby1.8, liblangscan-ruby, flex
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, autoconf (>= 2.50), automake (>= 1.9.5), ruby1.8 (>= 1.8.2), ruby1.8-dev (>= 1.8.2), libdb-ruby1.8, liblangscan-ruby, flex
Standards-Version: 3.8.4
Homepage: http://gonzui.sourceforge.net/
Package: gonzui
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ruby, ruby1.8 (>= 1.8.2), liblangscan-ruby, libdb-ruby1.8, libzlib-ruby1.8, libwebrick-ruby1.8, libiconv-ruby1.8, libstrscan-ruby1.8
+Depends: ${misc:Depends}, ${shlibs:Depends}, ruby1.8 (>= 1.8.2), liblangscan-ruby, libdb-ruby1.8, libzlib-ruby1.8, libwebrick-ruby1.8, libiconv-ruby1.8, libstrscan-ruby1.8
Suggests: libprogressbar-ruby1.8, subversion, cvs, unzip, rpm, bzip2, libppi-perl
Description: A source code search engine
Gonzui offers source code indexer which supports many programing languages,
only in patch2:
unchanged:
--- gonzui-1.2+cvs20070129.orig/acinclude.m4
+++ gonzui-1.2+cvs20070129/acinclude.m4
@@ -19,7 +19,7 @@
REQUIRED_VERSION="$1"
AC_MSG_CHECKING([ruby version...])
RUBY_VERSION="`$RUBY -e "puts RUBY_VERSION"`"
- if ruby -e "exit(RUBY_VERSION >= '$REQUIRED_VERSION')" >/dev/null; then
+ if $RUBY -e "exit(RUBY_VERSION >= '$REQUIRED_VERSION')" >/dev/null; then
AC_MSG_RESULT($RUBY_VERSION found)
else
AC_MSG_RESULT($RUBY_VERSION found)
@@ -41,7 +41,7 @@
AC_MSG_CHECKING([path to ruby library])
if test "x$rubydir" = x; then
changequote(<<, >>)
- rubydir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
+ rubydir=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
changequote([, ])
fi
AC_MSG_RESULT($rubydir)
@@ -57,20 +57,20 @@
AC_MSG_CHECKING([path to ruby binary library])
if test "x$rubyarchdir" = x; then
changequote(<<, >>)
- rubyarchdir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]'`
+ rubyarchdir=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]'`
changequote([, ])
fi
AC_MSG_RESULT($rubyarchdir)
AC_SUBST(rubyarchdir)
changequote(<<, >>)
- RUBY_CC="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CC"]'`"
- RUBY_LDSHARED="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LDSHARED"]'`"
- RUBY_CFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CCDLFLAGS"] + " " + Config::MAKEFILE_CONFIG["CFLAGS"]'`"
- RUBY_DLEXT="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
- RUBY_DLDFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
- RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
- RUBY_HDRHDIR="`ruby -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
+ RUBY_CC="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CC"]'`"
+ RUBY_LDSHARED="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LDSHARED"]'`"
+ RUBY_CFLAGS="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CCDLFLAGS"] + " " + Config::MAKEFILE_CONFIG["CFLAGS"]'`"
+ RUBY_DLEXT="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
+ RUBY_DLDFLAGS="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
+ RUBY_LIBS="`$RUBY -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
+ RUBY_HDRHDIR="`$RUBY -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
RUBY_CPPFLAGS='-I. -I$(RUBY_HDRHDIR)'
changequote([, ])
@@ -92,7 +92,7 @@
LIB="$1"
URL="$2"
AC_MSG_CHECKING([$LIB for ruby...])
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if $RUBY -r$LIB -e '' 2>/dev/null; then
AC_MSG_RESULT(found)
else
AC_MSG_RESULT(not found)
