Bug#620023: kcollectd: diff for NMU version 0.9-2.1

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
boundary="080101060208080809080809"

This is a multi-part message in MIME format.

tags 620023 + patch pending
tags 624931 + patch pending
thanks


Dear maintainer,

I've prepared an NMU for kcollectd (versioned as 0.9-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

.''`.
: :' : Luca Falavigna <dktrkranz@debian.org>
`. `'
`-

name="kcollectd-0.9-2.1-nmu.diff"
filename="kcollectd-0.9-2.1-nmu.diff"

diff -u kcollectd-0.9/debian/control kcollectd-0.9/debian/control
kcollectd-0.9/debian/control
+++ kcollectd-0.9/debian/control
@@ -8,8 +8,7 @@

Package: kcollectd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: collectd
+Depends: ${shlibs:Depends}, ${misc:Depends}, collectd
Suggests: khelpcenter4
Description: simple collectd graphing frontend for KDE
Kcollectd is a graphical KDE-frontend to collectd that allows to view
diff -u kcollectd-0.9/debian/changelog kcollectd-0.9/debian/changelog
kcollectd-0.9/debian/changelog
+++ kcollectd-0.9/debian/changelog
@@ -1,3 +1,15 @@
+kcollectd (0.9-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * kcollectd/gui.cc, kcollectd/kcollectd.cc:
+ - Port to new boost1.46 filesystem API (Closes: #624931)
+ * doc/en/index.docbook:
+ - Bump doctype version to 4.2 to avoid FTBFS.
+ * debian/control:
+ - Promote collectd to Depends (Closes: #620023).
+
+ -- Luca Falavigna <dktrkranz@debian.org> Thu, 25 Aug 2011 00:30:43 +0200
+
kcollectd (0.9-2) unstable; urgency=low

* Added build-dependencies on shared-mime-info, since this
only in patch2:
unchanged:
kcollectd-0.9.orig/doc/en/index.docbook
+++ kcollectd-0.9/doc/en/index.docbook
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kcollectd "<application>kcollectd 0.8</application>">
<!ENTITY kappname "&kcollectd;">
<!ENTITY package "kcollectd">
only in patch2:
unchanged:
kcollectd-0.9.orig/kcollectd/gui.cc
+++ kcollectd-0.9/kcollectd/gui.cc
@@ -127,21 +127,21 @@
const directory_iterator end_itr;
for (directory_iterator host(rrdpath); host != end_itr; ++host ) {
if (is_directory(*host)) {
- QTreeWidgetItem *hostitem = mkItem(listview, host->leaf());
+ QTreeWidgetItem *hostitem = mkItem(listview, host->path().filename().string());
hostitem->setFlags(hostitem->flags() & ~Qt::ItemIsSelectable);
for (directory_iterator sensor(*host); sensor != end_itr; ++sensor ) {
if (is_directory(*sensor)) {
- QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->leaf());
+ QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->path().filename().string());
sensoritem->setFlags(sensoritem->flags() & ~Qt::ItemIsSelectable);
for (directory_iterator rrd(*sensor); rrd != end_itr; ++rrd ) {
if (is_regular(*rrd) && extension(*rrd) == ".rrd") {
QTreeWidgetItem *rrditem = mkItem(sensoritem, basename(*rrd));
rrditem->setFlags(rrditem->flags() & ~Qt::ItemIsSelectable);
std::ostringstream info;
- info << host->leaf() << delimiter
- << sensor->leaf() << delimiter
+ info << host->path().filename().string() << delimiter
+ << sensor->path().filename().string() << delimiter
<< basename(*rrd);
- get_datasources(rrd->string(), info.str(), rrditem);
+ get_datasources(rrd->path().string(), info.str(), rrditem);
}
}
}
only in patch2:
unchanged:
kcollectd-0.9.orig/kcollectd/kcollectd.cc
+++ kcollectd-0.9/kcollectd/kcollectd.cc
@@ -73,7 +73,7 @@
gui->show();
}
}
- catch(basic_filesystem_error<path> &e) {
+ catch(const std::exception &e) {
KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'"
"Terminating.", QString(RRD_BASEDIR)));
exit(1);







To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org