Hello rrdtool-Maintainers,
we at Ruby Sprint have created an patch against your rrdtool package, to fit
your
package to the new Ruby Policy.
This updated also fixes the remaining Ruby 1.8 removal problems.
The patch adds an new binary package ruby-rrd. The old ruby packages will be
transitional packages. (That can be removed after the Jessie release)
Could you please upload a new rrdtool version with the patch included?
Thanks,
Jonasdiff --git a/debian/changelog b/debian/changelog
index c9ed55f..8c7ef74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
rrdtool (1.4.7-3) UNRELEASED; urgency=low
* Fixed changelog of 1.4.7-2 regarding the versioned build-dep on tcl-dev.
+ * Using gem2deb to create Ruby packages (Closes: #687809, #722377)
-- Sebastian Harl <[email protected]> Sat, 18 Aug 2012 15:53:54 +0200
diff --git a/debian/control b/debian/control
index 3519a54..68ebe27 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,14 @@ Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, gettext, quilt,
tcl-dev (>= 8), tcl-dev (<= 9),
perl (>= 5.8.0),
python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~),
- ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
+ gem2deb,
liblua5.1-0-dev, lua5.1
Build-Conflicts: lua50
Homepage: http://oss.oetiker.ch/rrdtool/
Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary
Vcs-Git: git://git.snow-crash.org/pkg-rrdtool.git/
X-Python-Version: >= 2.3
+XS-Ruby-Versions: all
Package: rrdtool
Architecture: any
@@ -56,7 +57,7 @@ Depends: rrdtool (= ${binary:Version}), librrd4 (= ${binary:Version}),
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
Recommends: librrds-perl (= ${binary:Version}),
rrdtool-tcl (= ${binary:Version}), python-rrdtool (= ${binary:Version}),
- librrd-ruby1.8 (= ${binary:Version}), librrd-ruby1.9.1 (= ${binary:Version}),
+ ruby-rrd (= ${binary:Version}),
python-all-dbg, liblua5.1-rrd0 (= ${binary:Version})
Description: time-series data storage and display system (debugging symbols)
The Round Robin Database Tool (RRDtool) is a system to store and display
@@ -163,10 +164,15 @@ Description: time-series data storage and display system (Python interface)
.
This package contains a Python interface to RRDs.
-Package: librrd-ruby
-Architecture: all
+Package: ruby-rrd
Section: ruby
-Depends: ${rubydefault:Depends}, ${misc:Depends}
+Architecture: any
+XB-Ruby-Versions: ${ruby:Versions}
+X-DhRuby-Root: bindings/ruby
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Replaces: librrd-ruby (<< 1.4.7-3~), librrd-ruby1.8 (<< 1.4.7-3~), librrd-ruby1.9.1 (<< 1.4.7-3~)
+Breaks: librrd-ruby (<< 1.4.7-3~), librrd-ruby1.8 (<< 1.4.7-3~), librrd-ruby1.9.1 (<< 1.4.7-3~)
+Provides: librrd-ruby, librrd-ruby1.8, librrd-ruby1.9.1
Description: time-series data storage and display system (Ruby interface)
The Round Robin Database Tool (RRDtool) is a system to store and display
time-series data (e.g. network bandwidth, machine-room temperature,
@@ -175,36 +181,34 @@ Description: time-series data storage and display system (Ruby interface)
extracted data to enforce a certain data density, allowing for useful
graphical representation of data values.
.
- This is a dummy package which depends on the package for Debian's default
- Ruby version.
+ This package contains a Ruby interface to RRDs.
+
+Package: librrd-ruby
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-rrd
+Description: Transitional package for ruby-fcgi / librrd-ruby
+ This is a transitional package for librrd-ruby to ease upgrades
+ to the ruby-rrd package. It can safely be removed.
Package: librrd-ruby1.8
-Architecture: any
-Section: ruby
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: time-series data storage and display system (Ruby 1.8 interface)
- The Round Robin Database Tool (RRDtool) is a system to store and display
- time-series data (e.g. network bandwidth, machine-room temperature,
- server load average). It stores the data in Round Robin Databases (RRDs),
- a very compact way that will not expand over time. RRDtool processes the
- extracted data to enforce a certain data density, allowing for useful
- graphical representation of data values.
- .
- This package contains a Ruby 1.8 interface to RRDs.
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-rrd
+Description: Transitional package for ruby-fcgi / librrd-ruby1.8
+ This is a transitional package for librrd-ruby1.8 to ease upgrades
+ to the ruby-rrd package. It can safely be removed.
Package: librrd-ruby1.9.1
-Architecture: any
-Section: ruby
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: time-series data storage and display system (Ruby 1.9.1 interface)
- The Round Robin Database Tool (RRDtool) is a system to store and display
- time-series data (e.g. network bandwidth, machine-room temperature,
- server load average). It stores the data in Round Robin Databases (RRDs),
- a very compact way that will not expand over time. RRDtool processes the
- extracted data to enforce a certain data density, allowing for useful
- graphical representation of data values.
- .
- This package contains a Ruby 1.9.1 interface to RRDs.
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-rrd
+Description: Transitional package for ruby-fcgi / librrd-ruby1.9.1
+ This is a transitional package for librrd-ruby1.9.1 to ease upgrades
+ to the ruby-rrd package. It can safely be removed.
Package: liblua5.1-rrd0
Architecture: any
diff --git a/debian/rules b/debian/rules
index 040c372..5c0aa75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,6 @@ endif
-#Ruby versions to build for
-RUBY_VERS := 1.8 1.9.1
-RUBY_DEFAULT_VERS := 1.8
-
PY_VERS := $(shell pyversions -vr)
#tcl version we're building for
@@ -163,15 +159,7 @@ install-common-stamp: build-arch-stamp
install-arch: install-common-stamp $(PY_VERS:%=install-python%)
#build and install ruby
- set -e; \
- cd bindings/ruby ;\
- for rbv in $(RUBY_VERS); do \
- ruby$$rbv extconf.rb ;\
- make ;\
- make install sitelibdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["rubylibdir"]'` \
- sitearchdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["archdir"]'` ;\
- make distclean ;\
- done
+ dh_ruby --install
dh_installexamples -s
chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
@@ -193,11 +181,9 @@ install-python%: install-common-stamp
binary-indep: build-indep install-indep
dh_testdir
dh_testroot
- dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
- dh_installchangelogs -i -Nlibrrd-ruby CHANGES
- dh_installdocs -i -Nlibrrd-ruby -A CONTRIBUTORS NEWS
- dh_link -i -Nlibrrd-ruby
- echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
+ dh_installchangelogs -i CHANGES
+ dh_installdocs -i -A CONTRIBUTORS NEWS
+ dh_link -i
dh_perl -i
dh_compress -i
dh_fixperms -i
