Package: treil Version: 1.8-2.1 Severity: normal Tags: patch Hello,
I have just uploaded an NMU to DELAYED/10 that makes treil build against the default Ruby version instead of hardcoding ruby1.9.1. The diff is attached. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores) Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages treil depends on: ii libc6 2.18-4 ii libruby2.0 2.0.0.484+really457-3 ii libtreil0 1.8-2.1 ii ruby 1:2.0.0.2 ii ruby-cairo 1.12.8-1+b1 treil recommends no packages. treil suggests no packages. -- no debconf information -- Antonio Terceiro <terce...@debian.org>
diff -Nru treil-1.8/debian/changelog treil-1.8/debian/changelog --- treil-1.8/debian/changelog 2013-07-10 04:11:22.000000000 -0300 +++ treil-1.8/debian/changelog 2014-04-16 23:43:11.000000000 -0300 @@ -1,3 +1,11 @@ +treil (1.8-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Make the package build against whatever Ruby version is the default + (Closes: #739123) + + -- Antonio Terceiro <terce...@debian.org> Wed, 16 Apr 2014 23:36:06 -0300 + treil (1.8-2) unstable; urgency=low * debian/source/format: New. diff -Nru treil-1.8/debian/control treil-1.8/debian/control --- treil-1.8/debian/control 2013-07-10 03:49:02.000000000 -0300 +++ treil-1.8/debian/control 2014-04-16 23:19:25.000000000 -0300 @@ -2,13 +2,13 @@ Section: utils Priority: extra Maintainer: NIIBE Yutaka <gni...@fsij.org> -Build-Depends: debhelper (>= 9), ruby, ruby1.9.1, ruby-dev, ruby-cairo, autotools-dev +Build-Depends: debhelper (>= 9), ruby, ruby-dev, ruby-cairo, autotools-dev Standards-Version: 3.9.4 Homepage: http://www.unixuser.org/~ueno/software/treil/index.html Package: treil Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, ruby1.9.1, ruby-cairo +Depends: ${misc:Depends}, ${shlibs:Depends}, ruby, ruby-cairo Description: tree structure into tiles Treil is a utility which produces an image of tiles from tree structure. For example, Linux directory tree can be shown as an image of tiles, diff -Nru treil-1.8/debian/patches/01-makefiles.diff treil-1.8/debian/patches/01-makefiles.diff --- treil-1.8/debian/patches/01-makefiles.diff 2013-07-10 03:40:43.000000000 -0300 +++ treil-1.8/debian/patches/01-makefiles.diff 2014-04-16 23:40:11.000000000 -0300 @@ -3,29 +3,25 @@ Author: NIIBE Yutaka <gni...@fsij.org> Last-Update: 2013-07-10 -Index: treil-1.8/ruby/Makefile.am -=================================================================== ---- treil-1.8.orig/ruby/Makefile.am 2013-07-10 06:20:58.232641206 +0000 -+++ treil-1.8/ruby/Makefile.am 2013-07-10 06:20:58.180641208 +0000 -@@ -4,7 +4,7 @@ +--- a/ruby/Makefile.am ++++ b/ruby/Makefile.am +@@ -4,7 +4,7 @@ SO = treil.so EXTRA_DIST = treil.c $(RB) stamp-arch: $(top_builddir)/libtreil.la treil.c - mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) -+ mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) LIBS='-lruby-1.9.1 -ltreil' ++ mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) LIBS='$(shell ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG_SHARED"]') -ltreil' touch $@ all-local: stamp-arch -Index: treil-1.8/ruby/Makefile.in -=================================================================== ---- treil-1.8.orig/ruby/Makefile.in 2013-07-10 06:20:58.232641206 +0000 -+++ treil-1.8/ruby/Makefile.in 2013-07-10 06:20:58.180641208 +0000 -@@ -325,7 +325,7 @@ +--- a/ruby/Makefile.in ++++ b/ruby/Makefile.in +@@ -325,7 +325,7 @@ uninstall-am: uninstall-info-am uninstal stamp-arch: $(top_builddir)/libtreil.la treil.c - mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) -+ mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) LIBS='-lruby-1.9.1 -ltreil' ++ mkdir -p $(RUBYARCH) && cd $(RUBYARCH) && $(RUBY) ../extconf.rb && $(MAKE) LIBS='$(shell ruby -e 'puts RbConfig::CONFIG["LIBRUBYARG_SHARED"]') -ltreil' touch $@ all-local: stamp-arch diff -Nru treil-1.8/debian/rules treil-1.8/debian/rules --- treil-1.8/debian/rules 2013-07-10 03:52:57.000000000 -0300 +++ treil-1.8/debian/rules 2014-04-16 23:26:33.000000000 -0300 @@ -4,9 +4,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -RUBY = ruby1.9.1 -RUBYLIBDIR = $(shell ruby1.9.1 -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]') -RUBYARCHDIR = $(shell ruby1.9.1 -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]') +RUBY = ruby +RUBYLIBDIR = $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]') +RUBYARCHDIR = $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]') %: dh $@ diff -Nru treil-1.8/debian/treil.install treil-1.8/debian/treil.install --- treil-1.8/debian/treil.install 2013-07-10 03:43:33.000000000 -0300 +++ treil-1.8/debian/treil.install 2014-04-16 23:29:54.000000000 -0300 @@ -1,2 +1,3 @@ /usr/bin/ /usr/lib/ruby/ +/usr/lib/*/ruby/
signature.asc
Description: Digital signature
