Control: tags 791846 + patch
Control: tags 791846 + pending

Dear maintainer,

I've prepared an NMU for treil (versioned as 1.8-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Christian

diff -Nru treil-1.8/debian/changelog treil-1.8/debian/changelog
--- treil-1.8/debian/changelog  2014-04-17 02:43:11.000000000 +0000
+++ treil-1.8/debian/changelog  2015-11-03 19:42:58.000000000 +0000
@@ -1,3 +1,11 @@
+treil (1.8-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use RbConfig instead of now removed Config to fix build with ruby 2.2.
+    (Closes: #791846)
+
+ -- Christian Hofstaedtler <z...@debian.org>  Tue, 03 Nov 2015 19:42:14 +0000
+
 treil (1.8-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru treil-1.8/debian/control treil-1.8/debian/control
--- treil-1.8/debian/control    2014-04-17 02:19:25.000000000 +0000
+++ treil-1.8/debian/control    2015-11-03 19:46:08.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: NIIBE Yutaka <gni...@fsij.org>
-Build-Depends: debhelper (>= 9), ruby, ruby-dev, ruby-cairo, autotools-dev
+Build-Depends: debhelper (>= 9), ruby, ruby-dev, ruby-cairo, autotools-dev, 
dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: http://www.unixuser.org/~ueno/software/treil/index.html
 
diff -Nru treil-1.8/debian/patches/03-rbconfig-configure.diff 
treil-1.8/debian/patches/03-rbconfig-configure.diff
--- treil-1.8/debian/patches/03-rbconfig-configure.diff 1970-01-01 
00:00:00.000000000 +0000
+++ treil-1.8/debian/patches/03-rbconfig-configure.diff 2015-11-03 
19:44:08.000000000 +0000
@@ -0,0 +1,26 @@
+Index: treil-1.8/configure.ac
+===================================================================
+--- treil-1.8.orig/configure.ac
++++ treil-1.8/configure.ac
+@@ -14,18 +14,18 @@ else
+ fi
+ test -z "$RUBY" && AC_MSG_ERROR([ruby not installed])
+ 
+-RUBYARCH=`"$RUBY" -rrbconfig -e "puts(Config::CONFIG.fetch('arch'))"`
++RUBYARCH=`"$RUBY" -rrbconfig -e "puts(RbConfig::CONFIG.fetch('arch'))"`
+ AC_SUBST(RUBYARCH, "$RUBYARCH")
+ 
+ AC_ARG_WITH(rubylibdir, AC_HELP_STRING([--with-rubylibdir=PATH], [install 
ruby files in PATH]), RUBYLIBDIR="$withval")
+ if test -z "$RUBYLIBDIR"; then
+-  RUBYLIBDIR=`"$RUBY" -rrbconfig -e 
"puts(Config::CONFIG.fetch('sitelibdir'))"`
++  RUBYLIBDIR=`"$RUBY" -rrbconfig -e 
"puts(RbConfig::CONFIG.fetch('sitelibdir'))"`
+ fi
+ AC_SUBST(RUBYLIBDIR, "$RUBYLIBDIR")
+ 
+ AC_ARG_WITH(rubyarchdir, AC_HELP_STRING([--with-rubyarchdir=PATH], [install 
ruby extension libraries in PATH]), RUBYARCHDIR="$withval")
+ if test -z "$RUBYARCHDIR"; then
+-  RUBYARCHDIR=`"$RUBY" -rrbconfig -e 
"puts(Config::CONFIG.fetch('sitearchdir'))"`
++  RUBYARCHDIR=`"$RUBY" -rrbconfig -e 
"puts(RbConfig::CONFIG.fetch('sitearchdir'))"`
+ fi
+ AC_SUBST(RUBYARCHDIR, "$RUBYARCHDIR")
+ 
diff -Nru treil-1.8/debian/patches/series treil-1.8/debian/patches/series
--- treil-1.8/debian/patches/series     2014-04-17 02:21:21.000000000 +0000
+++ treil-1.8/debian/patches/series     2015-11-03 19:43:38.000000000 +0000
@@ -1,2 +1,3 @@
 01-makefiles.diff
 02-rbconfig.diff
+03-rbconfig-configure.diff
diff -Nru treil-1.8/debian/rules treil-1.8/debian/rules
--- treil-1.8/debian/rules      2014-04-17 02:26:33.000000000 +0000
+++ treil-1.8/debian/rules      2015-11-03 19:46:16.000000000 +0000
@@ -9,7 +9,7 @@
 RUBYARCHDIR = $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
 
 %:
-       dh $@
+       dh $@ --with autoreconf
 
 override_dh_auto_clean:
        dh_auto_clean

Reply via email to