severity 722382 serious
thanks
Hello stfl-Maintainer,
during Ruby Sprint in Paris, we have created an patch for your package to fit
the Ruby
Debian policy.
This patch removes Ruby 1.8 dependency and moves that package to gem2deb helper.
Pleas include the patch to fix your package. Otherwise we can't remove ruby 1.8
from the
archive.
Thanks,
Jonasdiff --git a/debian/control b/debian/control
index 02573f0..3a94ecb 100644
--- a/debian/control
+++ b/debian/control
@@ -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~), spl-dev, gem2deb
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/
@@ -50,36 +51,47 @@ Description: python bindings for the structured terminal forms language/library
.
This package contains the Python bindings to libstfl.
-Package: libstfl-ruby1.8
+Package: ruby-stfl
+XB-Ruby-Versions: ${ruby:Versions}
+X-DhRuby-Root: ruby
Section: ruby
Architecture: any
-Depends: ruby1.8, ${shlibs:Depends}, ${misc:Depends}
-Description: Ruby 1.8 bindings for the structured terminal forms language/library
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libstfl-ruby1.8 (<< 0.22-2~), libstfl-ruby1.9.1 (<< 0.22-2~), libstfl-ruby (<< 0.22-2~)
+Breaks: libstfl-ruby1.8 (<< 0.22-2~), libstfl-ruby1.9.1 (<< 0.22-2~), libstfl-ruby (<< 0.22-2~)
+Provides: libstfl-ruby1.8, libstfl-ruby1.9.1, libstfl-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 package contains the ruby1.8 bindings to libstfl.
+ This package contains the ruby bindings to libstfl.
+
+Package: libstfl-ruby1.8
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-stfl
+Description: Transitional package libstfl-ruby1.8 for ruby-stfl
+ This is a transitional package libstfl-ruby1.8 to ease upgrades to the
+ ruby-stfl package. It can safely be removed.
Package: libstfl-ruby1.9.1
-Section: ruby
-Architecture: any
-Depends: ruby1.9.1, ${shlibs:Depends}, ${misc:Depends}
-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.
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-stfl
+Description: Transitional package libstfl-ruby1.9.1 for ruby-stfl
+ This is a transitional package libstfl-ruby1.9.1 to ease upgrades to the
+ ruby-stfl package. It can safely be removed.
Package: libstfl-ruby
-Section: ruby
+Section: oldlibs
+Priority: extra
Architecture: all
-Depends: libstfl-ruby1.8, ${misc:Depends}
-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).
+Depends: ${misc:Depends}, ruby-stfl
+Description: Transitional package libstfl-ruby for libstfl0
+ This is a transitional package libstfl-ruby to ease upgrades to the ruby-stfl
+ package. It can safely be removed.
Package: libstfl-spl
Section: devel
diff --git a/debian/libstfl-ruby1.8.dirs b/debian/libstfl-ruby1.8.dirs
deleted file mode 100644
index 709e902..0000000
--- a/debian/libstfl-ruby1.8.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/ruby/1.8/x86_64-linux
diff --git a/debian/libstfl-ruby1.8.examples b/debian/libstfl-ruby1.8.examples
deleted file mode 100644
index 96a062f..0000000
--- a/debian/libstfl-ruby1.8.examples
+++ /dev/null
@@ -1 +0,0 @@
-ruby/example.rb
diff --git a/debian/libstfl-ruby1.8.install b/debian/libstfl-ruby1.8.install
deleted file mode 100644
index 19a6a02..0000000
--- a/debian/libstfl-ruby1.8.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/ruby/1.8/*/stfl.so
diff --git a/debian/libstfl-ruby1.9.1.dirs b/debian/libstfl-ruby1.9.1.dirs
deleted file mode 100644
index 0cceba8..0000000
--- a/debian/libstfl-ruby1.9.1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/ruby/1.9.1/x86_64-linux
diff --git a/debian/libstfl-ruby1.9.1.examples b/debian/libstfl-ruby1.9.1.examples
deleted file mode 100644
index 96a062f..0000000
--- a/debian/libstfl-ruby1.9.1.examples
+++ /dev/null
@@ -1 +0,0 @@
-ruby/example.rb
diff --git a/debian/libstfl-ruby1.9.1.install b/debian/libstfl-ruby1.9.1.install
deleted file mode 100644
index e6aec7b..0000000
--- a/debian/libstfl-ruby1.9.1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/ruby/1.9.1/*/stfl.so
diff --git a/debian/ruby-stfl.examples b/debian/ruby-stfl.examples
new file mode 100644
index 0000000..96a062f
--- /dev/null
+++ b/debian/ruby-stfl.examples
@@ -0,0 +1 @@
+ruby/example.rb
diff --git a/debian/rules b/debian/rules
index 1521c17..1d0ed8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/python/python.mk
#export DH_PYCENTRAL=nomove
-RUBY_VERSIONS = 1.8 1.9.1
+RUBY_VERSIONS = $(shell dh_ruby --print-supported 2>/dev/null)
#PYTHON_VERSIONS = 2.4 2.5
#PYVERS=$(shell pyversions -vr)
PYTHON_VERSIONS = $(shell pyversions -vr)
@@ -28,9 +28,9 @@ build-stamp:
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"
+ cp -a ruby $*
+ cd $* && swig -ruby stfl.i && $* extconf.rb
+ $(MAKE) -C $* clean && $(MAKE) -C $* LIBS+="../libstfl.a -lncursesw" CFLAGS+="-I.. -fPIC"
touch $@
@@ -50,7 +50,9 @@ install: build $(addprefix install-ruby-, $(RUBY_VERSIONS)) $(addprefix install-
$(MAKE) -C perl5 install DESTDIR=$(MAKE_DESTDIR) PREFIX=/usr
install-ruby-%:
- $(MAKE) -C ruby$* $(MAKE_INSTALL_TARGET) sitedir=$(MAKE_DESTDIR)/usr/lib/ruby install
+ install -d debian/ruby-stfl/$(shell $* -e "print RbConfig::CONFIG['vendorarchdir']")
+ install $*/stfl.so debian/ruby-stfl/$(shell $* -e "print RbConfig::CONFIG['vendorarchdir']")
+ #$(MAKE) -C $* debian/ruby-stfl/$($* -e "print RbConfig::CONFIG['vendorarchdir']") sitedir=debian/ruby-stfl/$($* -e "print RbConfig::CONFIG['vendorarchdir']") install
install-python-%:
mkdir -p $(MAKE_PYTHON_DESTDIR)$*/$(call py_sitename, $*)/
@@ -70,7 +72,7 @@ clean: $(addprefix clean-ruby-, $(RUBY_VERSIONS)) $(addprefix clean-python-, $(P
dh_clean
clean-ruby-%:
- rm -rf ruby$*
+ rm -rf $*
clean-python-%:
rm -rf python$*
@@ -82,6 +84,7 @@ binary-arch: build install
dh_installchangelogs
dh_installdocs
dh_installexamples -plibstfl-dev example.c example.stfl
+ dh_installexamples -pruby-stfl
dh_install
dh_installman
dh_link
