Bug#639507: nlkt: Updates for qwt6 transition

[Eugene V. Lyubimkin]

Hi Scott,

On 2011-08-27 12:47, Scott Kitterman wrote:
 The qwt source package is now qwt6 (there is a separate qwt5 source recently
 uploaded in Debian).  The attached patch gets nlkt to build with qwt6, but I
 did not test if the application works correctly with qwt6 or not.

Thanks for the patch. I don't expect problems, but this will have to go
through an upstream code change first.

Is there a strict or preferred deadline for this transition to happen?

-- 
Eugene V. Lyubimkin aka JackYF, JID: jackyf.devel(maildog)gmail.com
C++/Perl developer, Debian Developer



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

Bug#639507: nlkt: Updates for qwt6 transition

[Scott Kitterman]

Package: nlkt
Version: 0.3.2.1-4
Severity: wishlist
Tags: patch

The qwt source package is now qwt6 (there is a separate qwt5 source recently
uploaded in Debian).  The attached patch gets nlkt to build with qwt6, but I
did not test if the application works correctly with qwt6 or not.
diff -u nlkt-0.3.2.1/debian/changelog nlkt-0.3.2.1/debian/changelog
--- nlkt-0.3.2.1/debian/changelog
+++ nlkt-0.3.2.1/debian/changelog
@@ -1,3 +1,13 @@
+nlkt (0.3.2.1-5) UNRELEASED; urgency=low
+
+  * Build-depend on libqwt-dev instead of libqwt5-qt4-dev for qwt6 transition
+  * Update src/nlkt.pro to use qwt6 include directory and library name for
+linking
+  * Update src/StatsWidget.cpp to use setSamples instead of setData for qwt6 
+API
+
+ -- Scott Kitterman sc...@kitterman.com  Fri, 26 Aug 2011 21:43:04 -0400
+
 nlkt (0.3.2.1-4) unstable; urgency=low
 
   * debian/control:
diff -u nlkt-0.3.2.1/debian/control nlkt-0.3.2.1/debian/control
--- nlkt-0.3.2.1/debian/control
+++ nlkt-0.3.2.1/debian/control
@@ -2,7 +2,7 @@
 Section: x11
 Priority: extra
 Maintainer: Eugene V. Lyubimkin jac...@debian.org
-Build-Depends: dpkg-dev (= 1.14.17), debhelper (= 7), libqt4-dev, libqwt5-qt4-dev
+Build-Depends: dpkg-dev (= 1.14.17), debhelper (= 7), libqt4-dev, libqwt-dev
 Standards-Version: 3.9.1
 Homepage: http://sf.net/projects/nlkt
 
only in patch2:
unchanged:
--- nlkt-0.3.2.1.orig/src/StatsWidget.cpp
+++ nlkt-0.3.2.1/src/StatsWidget.cpp
@@ -408,7 +408,7 @@
 		y_max = y[i]; \
 	} \
 } \
-this- STAT_STRING##Curve-setData(x, y, plotSize); \
+this- STAT_STRING##Curve-setSamples(x, y, plotSize); \
 this- STAT_STRING##Plot-axisScaleEngine(QwtPlot::yLeft)-setAttribute( \
 		QwtScaleEngine::IncludeReference, \
 		this-setMinimumYValueOnPlotsToZeroCheckBox-isChecked()); \
only in patch2:
unchanged:
--- nlkt-0.3.2.1.orig/src/nlkt.pro
+++ nlkt-0.3.2.1/src/nlkt.pro
@@ -6,8 +6,8 @@
 TARGET = 
 DEPENDPATH += .
 DEFINES += NDEBUG
-LIBS += -lqwt-qt4
-INCLUDEPATH += /usr/include/qwt-qt4
+LIBS += -lqwt
+INCLUDEPATH += /usr/include/qwt
 
 CONFIG += debug_and_release