Package: rrdtool Version: 1.4.7-2 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for rrdtool (versioned as 1.4.7-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -u rrdtool-1.4.7/debian/changelog rrdtool-1.4.7/debian/changelog --- rrdtool-1.4.7/debian/changelog +++ rrdtool-1.4.7/debian/changelog @@ -1,3 +1,15 @@ +rrdtool (1.4.7-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Switch Ruby bindings packaging to match the Debian Ruby packaging + policy. Based on a patch by Jonas Genannt. + Introduce ruby-rrd package, turn librrd-ruby* into transitional + packages to ruby-rrd; use gem2deb to build the bindings, and build + them for currently supported versions of Ruby, without hardcoding + a list of versions. (Closes: #687809, #722377) + + -- Christian Hofstaedtler <z...@debian.org> Wed, 22 Jan 2014 11:27:16 +0100 + rrdtool (1.4.7-2) unstable; urgency=low * Ack NMUs; thanks to Jonathan Wiltshire and gregor herrmann! diff -u rrdtool-1.4.7/debian/control rrdtool-1.4.7/debian/control --- rrdtool-1.4.7/debian/control +++ rrdtool-1.4.7/debian/control @@ -11,13 +11,14 @@ 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 @@ ${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 @@ . This package contains a Python interface to RRDs. -Package: librrd-ruby -Architecture: all +Package: ruby-rrd +Architecture: any Section: ruby -Depends: ${rubydefault:Depends}, ${misc:Depends} +XB-Ruby-Versions: ${ruby:Versions} +X-DhRuby-Root: bindings/ruby +Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter +Replaces: librrd-ruby (<< 1.4.7-2.1~), librrd-ruby1.8 (<< 1.4.7-2.1~), librrd-ruby1.9.1 (<< 1.4.7-2.1~) +Breaks: librrd-ruby (<< 1.4.7-2.1~), librrd-ruby1.8 (<< 1.4.7-2.1~), librrd-ruby1.9.1 (<< 1.4.7-2.1~) +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 @@ 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 +Architecture: all +Section: oldlibs +Priority: extra +Depends: ${misc:Depends}, ruby-rrd +Description: Transitional package to ruby-rrd + 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. +Architecture: all +Section: oldlibs +Priority: extra +Depends: ${misc:Depends}, ruby-rrd +Description: Transitional package to ruby-rrd + 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. +Architecture: all +Section: oldlibs +Priority: extra +Depends: ${misc:Depends}, ruby-rrd +Description: Transitional package to ruby-rrd + 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 -u rrdtool-1.4.7/debian/rules rrdtool-1.4.7/debian/rules --- rrdtool-1.4.7/debian/rules +++ rrdtool-1.4.7/debian/rules @@ -19,10 +19,6 @@ -#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-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 @@ 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 only in patch2: unchanged: --- rrdtool-1.4.7.orig/bindings/perl-shared/MYMETA.json +++ rrdtool-1.4.7/bindings/perl-shared/MYMETA.json @@ -0,0 +1,39 @@ +{ + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "RRDs", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "1.4007" +} -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
