Hi, I saw that the upload with the previous patch has been rejected because of the presence of todo boilerplate in debian/changelog. Here is another one, removing these lines.
Cheers, Cédric
diff -u langscan-1.2+cvs20070125/debian/changelog langscan-1.2+cvs20070125/debian/changelog
--- langscan-1.2+cvs20070125/debian/changelog
+++ langscan-1.2+cvs20070125/debian/changelog
@@ -1,3 +1,21 @@
+langscan (1.2+cvs20070125-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove todo boilerplate from debian/copyright.
+ * Build only with Ruby 1.8.
+ + debian/control: remove ruby from Build-Depends field as it would pull
+ 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: #676113)
+ + gonzui,the only reverse dependency, will only work with Ruby 1.8 anyway
+ because of other depencies.
+ * Set urgency to medium, as a RC bug is fixed.
+
+ -- Cédric Boutillier <cedric.boutill...@gmail.com> Mon, 03 Sep 2012 22:38:55 +0200
+
langscan (1.2+cvs20070125-1) unstable; urgency=low
* New upstream release.
diff -u langscan-1.2+cvs20070125/debian/rules langscan-1.2+cvs20070125/debian/rules
--- langscan-1.2+cvs20070125/debian/rules
+++ langscan-1.2+cvs20070125/debian/rules
@@ -12,8 +12,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
@@ -28,7 +29,7 @@
dh_testdir
# Add here commands to configure the package.
./autogen.sh --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
- --with-rubydir=$(RUBYLIBDIR) --with-rubyarchdir=$(RUBYARCHDIR)
+ --with-rubydir=$(RUBYLIBDIR) --with-rubyarchdir=$(RUBYARCHDIR) --with-ruby=$(RUBY)
touch configure-stamp
diff -u langscan-1.2+cvs20070125/debian/control langscan-1.2+cvs20070125/debian/control
--- langscan-1.2+cvs20070125/debian/control
+++ langscan-1.2+cvs20070125/debian/control
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: NIIBE Yutaka <gni...@fsij.org>
-Build-Depends: debhelper (>= 5), autotools-dev, autoconf (>= 2.50), automake (>= 1.9.5), ruby, ruby1.8 (>= 1.8.2), ruby1.8-dev (>= 1.8.2), flex, ocaml-nox
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf (>= 2.50), automake (>= 1.9.5), ruby1.8 (>= 1.8.2), ruby1.8-dev (>= 1.8.2), flex, ocaml-nox
Standards-Version: 3.7.2.2
Package: liblangscan-ruby
diff -u langscan-1.2+cvs20070125/debian/copyright langscan-1.2+cvs20070125/debian/copyright
--- langscan-1.2+cvs20070125/debian/copyright
+++ langscan-1.2+cvs20070125/debian/copyright
@@ -32,3 +31,0 @@
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
only in patch2:
unchanged:
--- langscan-1.2+cvs20070125.orig/acinclude.m4
+++ langscan-1.2+cvs20070125/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([, ])
signature.asc
Description: Digital signature
