updated patch attached
diff -urN rrdtool-1.6.0/debian/changelog rrdtool-1.7.0/debian/changelog
--- rrdtool-1.6.0/debian/changelog 2017-07-26 22:13:05.000000000 +0200
+++ rrdtool-1.7.0/debian/changelog 2017-12-04 12:31:28.336791461 +0100
@@ -1,3 +1,22 @@
+rrdtool (1.7.0-0ubuntu3) bionic; urgency=medium
+
+ * Fix testing of python extensions.
+
+ -- Matthias Klose <d...@ubuntu.com> Mon, 04 Dec 2017 12:16:21 +0100
+
+rrdtool (1.7.0-0ubuntu1) bionic; urgency=medium
+
+ * New upstream version.
+ * Bump standards version.
+ * Build a python3-rrdtool package, using pybuild.
+ Closes: ##883164. LP: #1735382.
+ * Install new man page rrdlist(1).
+ * Update symbols file.
+ * Change package priorities from extra to optional.
+ * rrdcached: Depend on lsb-base.
+
+ -- Matthias Klose <d...@ubuntu.com> Mon, 04 Dec 2017 11:17:30 +0100
+
rrdtool (1.6.0-1ubuntu2) artful; urgency=medium
* No-change rebuild for perl 5.26.0.
diff -urN rrdtool-1.6.0/debian/control rrdtool-1.7.0/debian/control
--- rrdtool-1.6.0/debian/control 2017-06-09 23:05:47.000000000 +0200
+++ rrdtool-1.7.0/debian/control 2017-12-04 11:20:02.000000000 +0100
@@ -7,7 +7,7 @@
Alexander Wirt <formo...@debian.org>,
Bernd Zeimetz <b...@debian.org>,
Jean-Michel Vourgère <nir...@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
Build-Depends: dc,
debhelper (>= 9),
dh-autoreconf,
@@ -22,6 +22,13 @@
perl (>= 5.8.0),
python-all-dbg (>= 2.6.6-3~),
python-all-dev (>= 2.6.6-3~),
+ cython, cython-dbg,
+ python-setuptools,
+ python3-all-dbg,
+ python3-all-dev,
+ cython3, cython3-dbg,
+ python3-all-dbg,
+ python3-setuptools,
tcl-dev (<= 9),
tcl-dev (>= 8)
Homepage: http://oss.oetiker.ch/rrdtool/
@@ -50,7 +57,7 @@
Package: rrdcached
Architecture: kfreebsd-any linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
Description: data caching daemon for RRDtool
RRDCacheD is a daemon that receives updates to existing RRD files, accumulates
them and, if enough have been received or a defined time has passed, writes
@@ -61,19 +68,21 @@
Package: rrdtool-dbg
Architecture: any
Multi-Arch: same
-Priority: extra
Section: debug
Depends: librrd8 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
+ ${python3:Depends},
${shlibs:Depends}
Recommends: librrds-perl (= ${binary:Version}),
lua-rrd (= ${binary:Version}),
- python-all-dbg,
- python-rrdtool (= ${binary:Version}),
+ python3-all-dbg,
+ python3-rrdtool (= ${binary:Version}),
rrdtool (= ${binary:Version}),
rrdtool-tcl (= ${binary:Version}),
-Suggests: ruby-rrd (= ${binary:Version})
+Suggests: ruby-rrd (= ${binary:Version}),
+ python-all-dbg,
+ python-rrdtool (= ${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
time-series data (e.g. network bandwidth, machine-room temperature,
@@ -182,6 +191,22 @@
.
This package contains a Python interface to RRDs.
+Package: python3-rrdtool
+Architecture: any
+Multi-Arch: same
+Section: python
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
+Description: time-series data storage and display system (Python3 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 Python3 interface to RRDs.
+
Package: ruby-rrd
Architecture: any
Multi-Arch: same
@@ -240,7 +265,7 @@
Package: liblua5.1-rrd0
Architecture: all
Section: oldlibs
-Priority: extra
+Priority: optional
Depends: lua-rrd, ${misc:Depends}
Description: Transitional package to lua-rrd
This is a transitional package for liblua5.1-rrd0 to ease upgrades
@@ -249,7 +274,7 @@
Package: liblua5.1-rrd-dev
Architecture: all
Section: oldlibs
-Priority: extra
+Priority: optional
Depends: lua-rrd-dev, ${misc:Depends}
Description: Transitional package to lua-rrd-dev
This is a transitional package for liblua5.1-rrd-dev to ease upgrades
diff -urN rrdtool-1.6.0/debian/files rrdtool-1.7.0/debian/files
--- rrdtool-1.6.0/debian/files 1970-01-01 01:00:00.000000000 +0100
+++ rrdtool-1.7.0/debian/files 2017-12-04 12:31:33.184769595 +0100
@@ -0,0 +1 @@
+rrdtool_1.7.0-0ubuntu3_source.buildinfo utils optional
diff -urN rrdtool-1.6.0/debian/librrd8.symbols rrdtool-1.7.0/debian/librrd8.symbols
--- rrdtool-1.6.0/debian/librrd8.symbols 2016-05-03 21:18:39.000000000 +0200
+++ rrdtool-1.7.0/debian/librrd8.symbols 2017-12-04 11:14:23.000000000 +0100
@@ -3,6 +3,7 @@
rrd_add_ptr_chunk@Base 1.5.3
rrd_add_strdup@Base 1.4~rc2
rrd_add_strdup_chunk@Base 1.5.3
+ rrd_cf_conv@Base 1.7.0
rrd_clear_error@Base 1.3.0
rrd_close@Base 1.3.0
rrd_create@Base 1.3.0
@@ -37,6 +38,9 @@
rrd_last_r@Base 1.3.0
rrd_lastupdate@Base 1.3.0
rrd_lastupdate_r@Base 1.4~rc2
+ rrd_lcd@Base 1.7.0
+ rrd_list@Base 1.7.0
+ rrd_list_r@Base 1.7.0
rrd_lock@Base 1.3.0
rrd_mkdir_p@Base 1.4~rc2+20091004
rrd_new_context@Base 1.3.0
@@ -45,6 +49,7 @@
rrd_proc_start_end@Base 1.3.0
rrd_random@Base 1.4~rc2
rrd_read@Base 1.3.0
+ rrd_reduce_data@Base 1.7.0
rrd_resize@Base 1.3.0
rrd_restore@Base 1.3.0
rrd_scaled_duration@Base 1.5.3
diff -urN rrdtool-1.6.0/debian/python3-rrdtool.install rrdtool-1.7.0/debian/python3-rrdtool.install
--- rrdtool-1.6.0/debian/python3-rrdtool.install 1970-01-01 01:00:00.000000000 +0100
+++ rrdtool-1.7.0/debian/python3-rrdtool.install 2017-12-04 10:20:30.000000000 +0100
@@ -0,0 +1,3 @@
+usr/lib/python3*/dist-packages/rrdtool-*.egg-info
+usr/lib/python3*/dist-packages/rrdtool*.so
+usr/share/rrdtool/examples/stripes.py /usr/share/doc/python3-rrdtool/examples/
diff -urN rrdtool-1.6.0/debian/python-rrdtool.install rrdtool-1.7.0/debian/python-rrdtool.install
--- rrdtool-1.6.0/debian/python-rrdtool.install 2016-04-25 10:33:38.000000000 +0200
+++ rrdtool-1.7.0/debian/python-rrdtool.install 2017-12-04 10:20:30.000000000 +0100
@@ -1,3 +1,3 @@
-usr/lib/python2*/dist-packages/py_rrdtool-*.egg-info
+usr/lib/python2*/dist-packages/rrdtool-*.egg-info
usr/lib/python2*/dist-packages/rrdtool.so
usr/share/rrdtool/examples/stripes.py /usr/share/doc/python-rrdtool/examples/
diff -urN rrdtool-1.6.0/debian/rrdtool.install rrdtool-1.7.0/debian/rrdtool.install
--- rrdtool-1.6.0/debian/rrdtool.install 2016-05-03 21:18:39.000000000 +0200
+++ rrdtool-1.7.0/debian/rrdtool.install 2017-12-04 10:20:30.000000000 +0100
@@ -57,6 +57,7 @@
usr/share/man/man1/rrdinfo.1
usr/share/man/man1/rrdlast.1
usr/share/man/man1/rrdlastupdate.1
+usr/share/man/man1/rrdlist.1
usr/share/man/man1/rrdresize.1
usr/share/man/man1/rrdrestore.1
usr/share/man/man1/rrdthreads.1
diff -urN rrdtool-1.6.0/debian/rules rrdtool-1.7.0/debian/rules
--- rrdtool-1.6.0/debian/rules 2016-05-03 21:18:39.000000000 +0200
+++ rrdtool-1.7.0/debian/rules 2017-12-04 12:31:18.824834472 +0100
@@ -28,7 +28,7 @@
export ABS_TOP_BUILDDIR=$(CURDIR)
%:
- dh $@ --with autoreconf,lua,python2,ruby
+ dh $@ --with autoreconf,lua,python2,python3,ruby
override_dh_auto_configure:
dh_auto_configure -- \
@@ -43,14 +43,14 @@
dh_auto_configure --buildsystem=lua
dh_auto_configure --sourcedirectory=bindings/perl-shared
dh_auto_configure --sourcedirectory=bindings/perl-piped
- dh_auto_configure --sourcedirectory=bindings/python
+ dh_auto_configure --buildsystem=pybuild --sourcedirectory=bindings/python
dh_auto_configure --buildsystem=ruby
override_dh_auto_clean:
dh_auto_clean --buildsystem=lua
dh_auto_clean --sourcedirectory=bindings/perl-shared
dh_auto_clean --sourcedirectory=bindings/perl-piped
- dh_auto_clean --sourcedirectory=bindings/python
+ dh_auto_clean --buildsystem=pybuild --sourcedirectory=bindings/python
dh_auto_clean --buildsystem=ruby
dh_auto_clean # Must be called last, after other debhelper's clean
@@ -59,7 +59,7 @@
dh_auto_build --buildsystem=lua
dh_auto_build --sourcedirectory=bindings/perl-shared
dh_auto_build --sourcedirectory=bindings/perl-piped
- dh_auto_build --sourcedirectory=bindings/python
+ dh_auto_build --buildsystem=pybuild --sourcedirectory=bindings/python
dh_auto_build --buildsystem=ruby
# Fix library path to tcl bindings:
sed -i -e 's|lib/|lib/tcltk/|' -e 's|/tclrrd|/rrdtool-tcl/tclrrd|' bindings/tcl/pkgIndex.tcl
@@ -74,7 +74,12 @@
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(CURDIR)/src/.libs \
dh_auto_test --sourcedirectory=bindings/perl-shared
dh_auto_test --sourcedirectory=bindings/perl-piped
- dh_auto_test --sourcedirectory=bindings/python
+ LD_LIBRARY_PATH=$(CURDIR)/src/.libs \
+ PYBUILD_SYSTEM=custom \
+ PYBUILD_BEFORE_TEST='cp -r {dir}/tests {build_dir}' \
+ PYBUILD_AFTER_TEST='rm -rf {build_dir}/tests' \
+ PYBUILD_TEST_ARGS='cd {build_dir}; {interpreter} -m unittest discover' \
+ dh_auto_test --buildsystem=pybuild --sourcedirectory=bindings/python
dh_auto_test --buildsystem=ruby
override_dh_auto_install:
@@ -82,13 +87,13 @@
dh_auto_install --buildsystem=lua
dh_auto_install --sourcedirectory=bindings/perl-shared
dh_auto_install --sourcedirectory=bindings/perl-piped
- dh_auto_install --sourcedirectory=bindings/python
+ dh_auto_install --buildsystem=pybuild --sourcedirectory=bindings/python
dh_auto_install --buildsystem=ruby
override_dh_install:
# We don't install systemd files yet, because it changes socket location.
# This may need a transition with other packages (TODO).
- dh_install -X.la -X.txt -X.pod -Xsystemd --fail-missing
+ dh_install -X.la -X.txt -X.pod -Xsystemd -X.mo --fail-missing
override_dh_installdocs:
dh_installdocs -A CONTRIBUTORS NEWS
