tags 722382 + patch thanks Dear maintainer,
I've prepared an NMU for stfl (versioned as 0.22-1.1). The diff is attached to this message. As this fixes an RC bug which has shown no activity for more than three weeks, I'm going to upload right away. Regards. diff -Nru stfl-0.22/debian/changelog stfl-0.22/debian/changelog --- stfl-0.22/debian/changelog 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/changelog 2014-02-12 02:07:22.000000000 +0100 @@ -1,3 +1,11 @@ +stfl (0.22-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Convert Ruby build system to dh_ruby, to build for Ruby 1.9/2.0. + (Closes: #722382) + + -- Christian Hofstaedtler <z...@debian.org> Wed, 12 Feb 2014 02:06:19 +0100 + stfl (0.22-1) unstable; urgency=low * New upstream version: diff -Nru stfl-0.22/debian/control stfl-0.22/debian/control --- stfl-0.22/debian/control 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/control 2014-02-12 02:20:58.000000000 +0100 @@ -1,10 +1,11 @@ Source: stfl Priority: optional Maintainer: Nico Golde <n...@debian.org> -Build-Depends: debhelper (>= 7), libncursesw5-dev, swig, python-all-dev (>= 2.6.6-3~), ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, spl-dev +Build-Depends: debhelper (>= 7), libncursesw5-dev, swig, python-all-dev (>= 2.6.6-3~), gem2deb, spl-dev Standards-Version: 3.9.2 Section: libdevel X-Python-Version: all +XS-Ruby-Versions: all Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/stfl/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/trunk/ Homepage: http://www.clifford.at/stfl/ @@ -51,35 +52,35 @@ This package contains the Python bindings to libstfl. Package: libstfl-ruby1.8 -Section: ruby +Section: oldlibs +Priority: extra Architecture: any -Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libstfl-ruby Description: Ruby 1.8 bindings for the structured terminal forms language/library stfl is a library which implements a curses-based widget set for text terminals. . - This package contains the ruby1.8 bindings to libstfl. + This is a transitional package and can be safely removed. Package: libstfl-ruby1.9.1 -Section: ruby +Section: oldlibs +Priority: extra Architecture: any -Depends: ruby1.9.1, ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libstfl-ruby Description: Ruby 1.9.1 bindings for the structured terminal forms language/library stfl is a library which implements a curses-based widget set for text terminals. . - This package contains the ruby1.9 bindings to libstfl. + This is a transitional package and can be safely removed. Package: libstfl-ruby Section: ruby -Architecture: all -Depends: libstfl-ruby1.8, ${misc:Depends} +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ruby:Depends} +X-DhRuby-Root: ruby Description: Ruby bindings for the structured terminal forms language/library stfl is a library which implements a curses-based widget set for text terminals. - . - This is a dependency package which depends on Debian's default Ruby version - (currently 1.8.x). Package: libstfl-spl Section: devel diff -Nru stfl-0.22/debian/libstfl-ruby1.8.dirs stfl-0.22/debian/libstfl-ruby1.8.dirs --- stfl-0.22/debian/libstfl-ruby1.8.dirs 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.8.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/usr/lib/ruby/1.8/x86_64-linux diff -Nru stfl-0.22/debian/libstfl-ruby1.8.examples stfl-0.22/debian/libstfl-ruby1.8.examples --- stfl-0.22/debian/libstfl-ruby1.8.examples 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.8.examples 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ruby/example.rb diff -Nru stfl-0.22/debian/libstfl-ruby1.8.install stfl-0.22/debian/libstfl-ruby1.8.install --- stfl-0.22/debian/libstfl-ruby1.8.install 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.8.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/usr/lib/ruby/1.8/*/stfl.so diff -Nru stfl-0.22/debian/libstfl-ruby1.9.1.dirs stfl-0.22/debian/libstfl-ruby1.9.1.dirs --- stfl-0.22/debian/libstfl-ruby1.9.1.dirs 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.9.1.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/usr/lib/ruby/1.9.1/x86_64-linux diff -Nru stfl-0.22/debian/libstfl-ruby1.9.1.examples stfl-0.22/debian/libstfl-ruby1.9.1.examples --- stfl-0.22/debian/libstfl-ruby1.9.1.examples 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.9.1.examples 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ruby/example.rb diff -Nru stfl-0.22/debian/libstfl-ruby1.9.1.install stfl-0.22/debian/libstfl-ruby1.9.1.install --- stfl-0.22/debian/libstfl-ruby1.9.1.install 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/libstfl-ruby1.9.1.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/usr/lib/ruby/1.9.1/*/stfl.so diff -Nru stfl-0.22/debian/patches/ruby-extconf stfl-0.22/debian/patches/ruby-extconf --- stfl-0.22/debian/patches/ruby-extconf 1970-01-01 01:00:00.000000000 +0100 +++ stfl-0.22/debian/patches/ruby-extconf 2014-02-12 02:19:53.000000000 +0100 @@ -0,0 +1,12 @@ +Description: Fix ruby/extconf.rb + Fixed extconf.rb to actually create a useable makefile. +Author: Christian Hofstaedtler <z...@debian.org> + +--- stfl-0.22.orig/ruby/extconf.rb ++++ stfl-0.22/ruby/extconf.rb +@@ -1,2 +1,5 @@ + require 'mkmf' ++`swig -ruby stfl.i` ++$LIBS << " ../libstfl.a -lncursesw" ++$CFLAGS << " -I.. -fPIC" + create_makefile('stfl') diff -Nru stfl-0.22/debian/patches/series stfl-0.22/debian/patches/series --- stfl-0.22/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ stfl-0.22/debian/patches/series 2014-02-12 02:19:10.000000000 +0100 @@ -0,0 +1 @@ +ruby-extconf diff -Nru stfl-0.22/debian/rules stfl-0.22/debian/rules --- stfl-0.22/debian/rules 2011-10-25 16:22:53.000000000 +0200 +++ stfl-0.22/debian/rules 2014-02-12 02:05:12.000000000 +0100 @@ -5,7 +5,6 @@ #export DH_PYCENTRAL=nomove -RUBY_VERSIONS = 1.8 1.9.1 #PYTHON_VERSIONS = 2.4 2.5 #PYVERS=$(shell pyversions -vr) PYTHON_VERSIONS = $(shell pyversions -vr) @@ -15,7 +14,7 @@ MAKE_INSTALL_TARGET := DESTDIR=$(MAKE_DESTDIR) prefix=/usr CFLAGS += -fPIC -build: build-stamp $(addprefix build-stamp-ruby-, $(RUBY_VERSIONS)) $(addprefix build-stamp-python-, $(PYTHON_VERSIONS)) +build: build-stamp $(addprefix build-stamp-python-, $(PYTHON_VERSIONS)) build-stamp: dh_testdir @@ -24,13 +23,8 @@ test ! -f perl5/Makefile || $(MAKE) -C perl5 clean cd perl5 && swig -perl5 stfl.i && perl Makefile.PL INSTALLDIRS=vendor $(MAKE) -C perl5 - - touch $@ - -build-stamp-ruby-%: - cp -a ruby ruby$* - cd ruby$* && swig -ruby stfl.i && ruby$* extconf.rb - $(MAKE) -C ruby$* clean && $(MAKE) -C ruby$* LIBS+="../libstfl.a -lncursesw" CFLAGS+="-I.. -fPIC" + # ruby + dh_ruby --build touch $@ @@ -42,15 +36,14 @@ touch $@ -install: build $(addprefix install-ruby-, $(RUBY_VERSIONS)) $(addprefix install-python-, $(PYTHON_VERSIONS)) +install: build $(addprefix install-python-, $(PYTHON_VERSIONS)) dh_testdir dh_testroot $(MAKE) $(MAKE_INSTALL_TARGET) $(MAKE_FOUND_INTERPR) install # perl $(MAKE) -C perl5 install DESTDIR=$(MAKE_DESTDIR) PREFIX=/usr - -install-ruby-%: - $(MAKE) -C ruby$* $(MAKE_INSTALL_TARGET) sitedir=$(MAKE_DESTDIR)/usr/lib/ruby install + # ruby + dh_ruby --install install-python-%: mkdir -p $(MAKE_PYTHON_DESTDIR)$*/$(call py_sitename, $*)/ @@ -62,6 +55,8 @@ dh_testdir dh_testroot rm -f build-stamp* + # ruby + dh_ruby --clean # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) clean @@ -69,9 +64,6 @@ dh_clean -clean-ruby-%: - rm -rf ruby$* - clean-python-%: rm -rf python$* -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
