QtiPlot

qtiplot FTBFS using qt > 4.6 (Maverick has 4.7)

Bug #598826 reported by Scott Howard on 2010-06-26

This bug affects 1 person

	Status	Importance	Assigned to
QtiPlot	New	Undecided	Unassigned
qtiplot (Debian)	Fix Released	Unknown	debbugs #587244
qtiplot (Ubuntu)	Fix Released	Undecided	Unassigned

Bug Description

Binary package hint: qtiplot

qtiplot fails to build when using Qt > 4.6 (4.7 is in debian experimental and Ubuntu Maverick right now)

src/core/ApplicationWindow.cpp:166:28: error: QAssistantClient: No
such file or directory

qassistantclient has been removed from qt in 4.7.
See:
http://doc.qt.nokia.com/4.6/qassistantclient.html

http://doc.qt.nokia.com/4.7-snapshot/functions.html

"This class is obsolete and only required when using the old Qt
Assistant, now called assistant_adp. If you want to use the new Qt
Assistant as a remote help viewer, simple create a QProcess instance
and specify assistant as its executable."

I posted this at:
https://developer.berlios.de/forum/message.php?msg_id=51418

Tags:

Related branches

lp://staging/ubuntu/maverick/qtiplot

lp://staging/~valavanisalex/ubuntu/maverick/qtiplot/qtiplot-fix-605025

On hold for merging into lp://staging/ubuntu/maverick/qtiplot

Ubuntu Sponsors: Pending requested 2010-07-22

Diff: 445833 lines (+58032/-191127)

368 files modified

.pc/.version (+1/-0)
.pc/01_build_system.diff/qtiplot.pro (+7/-0)
.pc/01_build_system.diff/qtiplot/qtiplot.pro (+241/-0)
.pc/01_build_system.diff/qtiplot/src/origin/origin.pri (+27/-0)
.pc/02_fix_paths.diff/qtiplot/src/core/ApplicationWindow.cpp (+18381/-0)
.pc/applied-patches (+3/-0)
3rdparty/liborigin/FORMAT (+0/-77)
3rdparty/liborigin/Origin750Parser.cpp (+0/-2413)
3rdparty/liborigin/Origin750Parser.h (+0/-65)
3rdparty/liborigin/OriginDefaultParser.cpp (+0/-481)
3rdparty/liborigin/OriginDefaultParser.h (+0/-47)
3rdparty/liborigin/OriginFile.cpp (+0/-175)
3rdparty/liborigin/OriginFile.h (+0/-75)
3rdparty/liborigin/OriginObj.h (+0/-703)
3rdparty/liborigin/OriginParser.cpp (+0/-189)
3rdparty/liborigin/OriginParser.h (+0/-67)
3rdparty/liborigin/copying (+0/-674)
3rdparty/liborigin/doc/Doxyfile (+0/-236)
3rdparty/liborigin/doc/liborigin2.dox (+0/-66)
3rdparty/liborigin/endianfstream.hh (+0/-225)
3rdparty/liborigin/liborigin.pro (+0/-26)
3rdparty/liborigin/logging.hpp (+0/-619)
3rdparty/liborigin/readme (+0/-27)
3rdparty/liborigin/tree.hh (+0/-2663)
3rdparty/qwtplot3d/3rdparty/gl2ps/COPYING.GL2PS (+0/-25)
3rdparty/qwtplot3d/3rdparty/gl2ps/COPYING.LGPL (+0/-482)
3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c (+0/-6061)
3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h (+0/-199)
3rdparty/qwtplot3d/include/qwt3d_autoptr.h (+0/-75)
3rdparty/qwtplot3d/include/qwt3d_autoscaler.h (+0/-51)
3rdparty/qwtplot3d/include/qwt3d_axis.h (+0/-127)
3rdparty/qwtplot3d/include/qwt3d_color.h (+0/-63)
3rdparty/qwtplot3d/include/qwt3d_colorlegend.h (+0/-80)
3rdparty/qwtplot3d/include/qwt3d_coordsys.h (+0/-125)
3rdparty/qwtplot3d/include/qwt3d_curve.h (+258/-0)
3rdparty/qwtplot3d/include/qwt3d_drawable.h (+0/-70)
3rdparty/qwtplot3d/include/qwt3d_enrichment.h (+0/-62)
3rdparty/qwtplot3d/include/qwt3d_enrichment_std.h (+0/-116)
3rdparty/qwtplot3d/include/qwt3d_extglwidget.h (+203/-0)
3rdparty/qwtplot3d/include/qwt3d_function.h (+0/-41)
3rdparty/qwtplot3d/include/qwt3d_global.h (+0/-58)
3rdparty/qwtplot3d/include/qwt3d_graphplot.h (+0/-24)
3rdparty/qwtplot3d/include/qwt3d_gridmapping.h (+0/-34)
3rdparty/qwtplot3d/include/qwt3d_helper.h (+0/-36)
3rdparty/qwtplot3d/include/qwt3d_io.h (+0/-141)
3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h (+0/-94)
3rdparty/qwtplot3d/include/qwt3d_io_reader.h (+0/-35)
3rdparty/qwtplot3d/include/qwt3d_label.h (+0/-78)
3rdparty/qwtplot3d/include/qwt3d_mapping.h (+0/-27)
3rdparty/qwtplot3d/include/qwt3d_multiplot.h (+0/-24)
3rdparty/qwtplot3d/include/qwt3d_openglhelper.h (+0/-130)
3rdparty/qwtplot3d/include/qwt3d_parametricsurface.h (+0/-44)
3rdparty/qwtplot3d/include/qwt3d_plot.h (+0/-320)
3rdparty/qwtplot3d/include/qwt3d_portability.h (+0/-91)
3rdparty/qwtplot3d/include/qwt3d_scale.h (+0/-89)
3rdparty/qwtplot3d/include/qwt3d_surfaceplot.h (+0/-130)
3rdparty/qwtplot3d/include/qwt3d_types.h (+0/-455)
3rdparty/qwtplot3d/include/qwt3d_volumeplot.h (+0/-24)
3rdparty/qwtplot3d/qwtplot3d.pri (+0/-71)
3rdparty/qwtplot3d/qwtplot3d.pro (+0/-96)
3rdparty/qwtplot3d/src/qwt3d_autoscaler.cpp (+0/-253)
3rdparty/qwtplot3d/src/qwt3d_axis.cpp (+0/-359)
3rdparty/qwtplot3d/src/qwt3d_color.cpp (+0/-63)
3rdparty/qwtplot3d/src/qwt3d_colorlegend.cpp (+0/-229)
3rdparty/qwtplot3d/src/qwt3d_coordsys.cpp (+0/-725)
3rdparty/qwtplot3d/src/qwt3d_curve.cpp (+741/-0)
3rdparty/qwtplot3d/src/qwt3d_dataviews.cpp (+0/-10)
3rdparty/qwtplot3d/src/qwt3d_drawable.cpp (+0/-140)
3rdparty/qwtplot3d/src/qwt3d_enrichment_std.cpp (+0/-347)
3rdparty/qwtplot3d/src/qwt3d_extglwidget.cpp (+136/-0)
3rdparty/qwtplot3d/src/qwt3d_function.cpp (+0/-102)
3rdparty/qwtplot3d/src/qwt3d_gridmapping.cpp (+0/-32)
3rdparty/qwtplot3d/src/qwt3d_gridplot.cpp (+0/-595)
3rdparty/qwtplot3d/src/qwt3d_io.cpp (+0/-365)
3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp (+0/-417)
3rdparty/qwtplot3d/src/qwt3d_io_reader.cpp (+0/-225)
3rdparty/qwtplot3d/src/qwt3d_label.cpp (+0/-304)
3rdparty/qwtplot3d/src/qwt3d_lighting.cpp (+0/-192)
3rdparty/qwtplot3d/src/qwt3d_meshplot.cpp (+0/-318)
3rdparty/qwtplot3d/src/qwt3d_mousekeyboard.cpp (+0/-387)
3rdparty/qwtplot3d/src/qwt3d_movements.cpp (+0/-106)
3rdparty/qwtplot3d/src/qwt3d_parametricsurface.cpp (+0/-104)
3rdparty/qwtplot3d/src/qwt3d_plot.cpp (+0/-500)
3rdparty/qwtplot3d/src/qwt3d_scale.cpp (+0/-312)
3rdparty/qwtplot3d/src/qwt3d_surfaceplot.cpp (+0/-183)
3rdparty/qwtplot3d/src/qwt3d_types.cpp (+0/-222)
3rdparty/zlib/README.txt (+0/-29)
3rdparty/zlib/minigzip.c (+0/-258)
3rdparty/zlib/zconf.h (+0/-332)
3rdparty/zlib/zlib.h (+0/-1357)
README.html (+5/-1)
build.conf.example (+38/-7)
debian/build.conf (+12/-1)
debian/changelog (+37/-0)
debian/control (+8/-5)
debian/patches/01_build_system.diff (+57/-64)
debian/patches/02_docbook_stylesheet.diff (+0/-11)
debian/patches/02_fix_paths.diff (+11/-0)
debian/patches/03_fix_qti_wordlist.txt_path.diff (+0/-13)
debian/patches/04_add_includes.diff (+0/-10)
debian/patches/debian-changes-0.9.7.14-1 (+187/-0)
debian/patches/series (+2/-2)
debian/rules (+6/-8)
debian/source/format (+1/-0)
fitPlugins/exp_saturation/exp_saturation.c (+0/-70)
fitPlugins/exp_saturation/exp_saturation.pro (+0/-29)
fitPlugins/explin/explin.c (+0/-76)
fitPlugins/explin/explin.pro (+0/-29)
fitPlugins/fitPlugins.pro (+0/-7)
fitPlugins/fitRational0/fitRational0.cpp (+32/-0)
fitPlugins/fitRational1/fitRational1.cpp (+32/-0)
fitPlugins/planck_wavelength/planck_wavelength.c (+0/-70)
fitPlugins/planck_wavelength/planck_wavelength.pro (+0/-27)
manual/docbook-en/appendix.docbook (+14/-2)
manual/docbook-en/dialogs.docbook (+85/-62)
manual/docbook-en/index.docbook (+7/-7)
manual/docbook-en/scripting.docbook (+252/-21)
manual/html/icons/icons.qrc (+225/-0)
manual/html/qtiplot.adp (+381/-367)
qtiplot.pro (+3/-4)
qtiplot/examples/python/filter_table.py (+0/-50)
qtiplot/examples/python/strd_nist_fit.py (+0/-163)
qtiplot/icons/axes_icons.h (+0/-1275)
qtiplot/icons/pixmaps.h (+0/-12630)
qtiplot/python-includepath.py (+28/-0)
qtiplot/python-libs-win.py (+28/-0)
qtiplot/python-sipcmd.py (+28/-0)
qtiplot/qtiUtil.py (+29/-0)
qtiplot/qti_wordlist.txt (+24/-0)
qtiplot/qtiplot.pro (+64/-29)
qtiplot/qtiplot.rc (+40/-0)
qtiplot/qtiplotrc.py (+37/-17)
qtiplot/src/analysis/Convolution.cpp (+1/-1)
qtiplot/src/analysis/Correlation.cpp (+1/-1)
qtiplot/src/analysis/FFT.cpp (+1/-1)
qtiplot/src/analysis/Filter.cpp (+106/-58)
qtiplot/src/analysis/Filter.h (+4/-3)
qtiplot/src/analysis/Fit.cpp (+35/-25)
qtiplot/src/analysis/Fit.h (+2/-2)
qtiplot/src/analysis/Integration.cpp (+21/-13)
qtiplot/src/analysis/Interpolation.cpp (+81/-74)
qtiplot/src/analysis/MultiPeakFit.cpp (+48/-20)
qtiplot/src/analysis/MultiPeakFit.h (+4/-3)
qtiplot/src/analysis/NonLinearFit.cpp (+47/-14)
qtiplot/src/analysis/NonLinearFit.h (+2/-2)
qtiplot/src/analysis/SmoothFilter.cpp (+1/-1)
qtiplot/src/analysis/analysis.pri (+0/-70)
qtiplot/src/analysis/dialogs/ExpDecayDialog.cpp (+17/-16)
qtiplot/src/analysis/dialogs/ExpDecayDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/FFTDialog.cpp (+11/-3)
qtiplot/src/analysis/dialogs/FilterDialog.cpp (+10/-7)
qtiplot/src/analysis/dialogs/FilterDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/FitDialog.cpp (+163/-146)
qtiplot/src/analysis/dialogs/FitDialog.h (+10/-6)
qtiplot/src/analysis/dialogs/FrequencyCountDialog.cpp (+1/-1)
qtiplot/src/analysis/dialogs/IntDialog.cpp (+26/-26)
qtiplot/src/analysis/dialogs/IntDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/InterpolationDialog.cpp (+19/-20)
qtiplot/src/analysis/dialogs/InterpolationDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/PolynomFitDialog.cpp (+14/-12)
qtiplot/src/analysis/dialogs/PolynomFitDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/SmoothCurveDialog.cpp (+22/-19)
qtiplot/src/analysis/dialogs/SmoothCurveDialog.h (+5/-5)
qtiplot/src/analysis/dialogs/SubtractDataDialog.cpp (+337/-0)
qtiplot/src/analysis/dialogs/SubtractDataDialog.h (+73/-0)
qtiplot/src/analysis/fit_gsl.cpp (+32/-0)
qtiplot/src/analysis/fit_gsl.h (+32/-0)
qtiplot/src/analysis/nrutil.cpp (+0/-14)
qtiplot/src/analysis/nrutil.h (+0/-2)
qtiplot/src/core/ApplicationWindow.cpp (+0/-17557)
qtiplot/src/core/ApplicationWindow.h (+0/-1411)
qtiplot/src/core/ConfigDialog.cpp (+0/-2736)
qtiplot/src/core/ConfigDialog.h (+0/-232)
qtiplot/src/core/CustomActionDialog.cpp (+0/-787)
qtiplot/src/core/CustomActionDialog.h (+0/-135)
qtiplot/src/core/FindDialog.cpp (+0/-144)
qtiplot/src/core/FindDialog.h (+0/-75)
qtiplot/src/core/Folder.cpp (+0/-495)
qtiplot/src/core/Folder.h (+0/-226)
qtiplot/src/core/ImportASCIIDialog.cpp (+0/-811)
qtiplot/src/core/ImportASCIIDialog.h (+0/-189)
qtiplot/src/core/MdiSubWindow.cpp (+0/-344)
qtiplot/src/core/MdiSubWindow.h (+0/-205)
qtiplot/src/core/MultiPeakFitTool.cpp (+0/-150)
qtiplot/src/core/MultiPeakFitTool.h (+0/-74)
qtiplot/src/core/OdsFileHandler.cpp (+165/-0)
qtiplot/src/core/OdsFileHandler.h (+82/-0)
qtiplot/src/core/OpenProjectDialog.cpp (+0/-98)
qtiplot/src/core/OpenProjectDialog.h (+0/-53)
qtiplot/src/core/PlotWizard.cpp (+0/-400)
qtiplot/src/core/PlotWizard.h (+0/-126)
qtiplot/src/core/QtiPlotApplication.cpp (+124/-0)
qtiplot/src/core/QtiPlotApplication.h (+57/-0)
qtiplot/src/core/RenameWindowDialog.cpp (+0/-154)
qtiplot/src/core/RenameWindowDialog.h (+0/-75)
qtiplot/src/core/core.pri (+0/-31)
qtiplot/src/core/globals.h (+0/-41)
qtiplot/src/core/main.cpp (+0/-151)
qtiplot/src/lib/3rdparty/qtcolorpicker/LGPL_EXCEPTION.txt (+0/-10)
qtiplot/src/lib/3rdparty/qtcolorpicker/LICENSE.GPL3 (+0/-674)
qtiplot/src/lib/3rdparty/qtcolorpicker/LICENSE.LGPL (+0/-504)
qtiplot/src/lib/3rdparty/qtcolorpicker/README.TXT (+0/-7)
qtiplot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp (+0/-1144)
qtiplot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.h (+0/-121)
qtiplot/src/lib/CHANGES.txt (+0/-14)
qtiplot/src/lib/INSTALL (+0/-37)
qtiplot/src/lib/README (+0/-25)
qtiplot/src/lib/doc/Doxyfile (+0/-236)
qtiplot/src/lib/doc/qti.dox (+0/-60)
qtiplot/src/lib/gpl-3.0.txt (+0/-674)
qtiplot/src/lib/include/ColorBox.h (+0/-73)
qtiplot/src/lib/include/ColorButton.h (+0/-58)
qtiplot/src/lib/include/ColorMapEditor.h (+0/-96)
qtiplot/src/lib/include/DoubleSpinBox.h (+0/-105)
qtiplot/src/lib/include/ExtensibleFileDialog.h (+0/-78)
qtiplot/src/lib/include/LineNumberDisplay.h (+0/-61)
qtiplot/src/lib/include/PatternBox.h (+0/-61)
qtiplot/src/lib/include/PenStyleBox.h (+0/-58)
qtiplot/src/lib/include/SymbolBox.h (+0/-63)
qtiplot/src/lib/include/SymbolDialog.h (+0/-106)
qtiplot/src/lib/include/TextFormatButtons.h (+0/-90)
qtiplot/src/lib/libqti.pri (+0/-37)
qtiplot/src/lib/qti.pro (+0/-50)
qtiplot/src/lib/src/ColorBox.cpp (+0/-160)
qtiplot/src/lib/src/ColorButton.cpp (+0/-43)
qtiplot/src/lib/src/ColorMapEditor.cpp (+0/-308)
qtiplot/src/lib/src/DoubleSpinBox.cpp (+0/-207)
qtiplot/src/lib/src/ExtensibleFileDialog.cpp (+0/-85)
qtiplot/src/lib/src/LineNumberDisplay.cpp (+0/-118)
qtiplot/src/lib/src/PatternBox.cpp (+0/-187)
qtiplot/src/lib/src/PenStyleBox.cpp (+0/-84)
qtiplot/src/lib/src/SymbolBox.cpp (+0/-182)
qtiplot/src/lib/src/SymbolDialog.cpp (+0/-678)
qtiplot/src/lib/src/TextFormatButtons.cpp (+0/-639)
qtiplot/src/matrix/ColorMapDialog.cpp (+0/-89)
qtiplot/src/matrix/ColorMapDialog.h (+0/-54)
qtiplot/src/matrix/Matrix.cpp (+24/-3)
qtiplot/src/matrix/Matrix.h (+2/-0)
qtiplot/src/matrix/MatrixValuesDialog.cpp (+25/-1)
qtiplot/src/matrix/MatrixValuesDialog.h (+3/-0)
qtiplot/src/matrix/matrix.pri (+0/-21)
qtiplot/src/origin/importOPJ.cpp (+0/-1873)
qtiplot/src/origin/importOPJ.h (+0/-69)
qtiplot/src/origin/origin.pri (+0/-17)
qtiplot/src/plot2D/BoxCurve.cpp (+3/-3)
qtiplot/src/plot2D/BoxCurve.h (+1/-1)
qtiplot/src/plot2D/CanvasPicker.cpp (+14/-15)
qtiplot/src/plot2D/DataPickerTool.cpp (+58/-42)
qtiplot/src/plot2D/DataPickerTool.h (+6/-0)
qtiplot/src/plot2D/EllipseWidget.cpp (+0/-140)
qtiplot/src/plot2D/EllipseWidget.h (+0/-50)
qtiplot/src/plot2D/FunctionCurve.cpp (+85/-37)
qtiplot/src/plot2D/FunctionCurve.h (+1/-1)
qtiplot/src/plot2D/Graph.cpp (+637/-429)
qtiplot/src/plot2D/Graph.h (+52/-30)
qtiplot/src/plot2D/Grid.cpp (+2/-2)
qtiplot/src/plot2D/ImageWidget.cpp (+39/-5)
qtiplot/src/plot2D/ImageWidget.h (+11/-1)
qtiplot/src/plot2D/LegendWidget.cpp (+41/-25)
qtiplot/src/plot2D/LineProfileTool.cpp (+41/-28)
qtiplot/src/plot2D/LineProfileTool.h (+1/-1)
qtiplot/src/plot2D/LnScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/LogitScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/MultiLayer.cpp (+416/-178)
qtiplot/src/plot2D/MultiLayer.h (+29/-3)
qtiplot/src/plot2D/MultiPeakFitTool.cpp (+29/-14)
qtiplot/src/plot2D/PlotCurve.cpp (+29/-3)
qtiplot/src/plot2D/PlotToolInterface.h (+5/-2)
qtiplot/src/plot2D/ProbabilityScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/QwtBarCurve.cpp (+1/-1)
qtiplot/src/plot2D/QwtErrorPlotCurve.cpp (+15/-9)
qtiplot/src/plot2D/QwtHistogram.cpp (+4/-1)
qtiplot/src/plot2D/RangeSelectorTool.cpp (+3/-4)
qtiplot/src/plot2D/RangeSelectorTool.h (+2/-0)
qtiplot/src/plot2D/ScaleDraw.cpp (+81/-54)
qtiplot/src/plot2D/ScaleDraw.h (+11/-4)
qtiplot/src/plot2D/ScaleEngine.cpp (+15/-7)
qtiplot/src/plot2D/ScalePicker.cpp (+13/-13)
qtiplot/src/plot2D/ScreenPickerTool.cpp (+216/-5)
qtiplot/src/plot2D/ScreenPickerTool.h (+42/-1)
qtiplot/src/plot2D/SelectionMoveResizer.cpp (+5/-4)
qtiplot/src/plot2D/Spectrogram.cpp (+21/-10)
qtiplot/src/plot2D/SubtractLineTool.cpp (+122/-0)
qtiplot/src/plot2D/SubtractLineTool.h (+69/-0)
qtiplot/src/plot2D/TranslateCurveTool.cpp (+0/-1)
qtiplot/src/plot2D/VectorCurve.cpp (+1/-1)
qtiplot/src/plot2D/cursors.h (+0/-142)
qtiplot/src/plot2D/dialogs/AxesDialog.cpp (+152/-86)
qtiplot/src/plot2D/dialogs/AxesDialog.h (+9/-6)
qtiplot/src/plot2D/dialogs/ContourLinesEditor.cpp (+0/-412)
qtiplot/src/plot2D/dialogs/ContourLinesEditor.h (+0/-102)
qtiplot/src/plot2D/dialogs/CurvesDialog.cpp (+55/-47)
qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (+17/-41)
qtiplot/src/plot2D/dialogs/ErrDialog.cpp (+1/-2)
qtiplot/src/plot2D/dialogs/FunctionDialog.cpp (+494/-271)
qtiplot/src/plot2D/dialogs/FunctionDialog.h (+33/-21)
qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (+34/-1)
qtiplot/src/plot2D/dialogs/ImageExportDialog.h (+3/-0)
qtiplot/src/plot2D/dialogs/LayerDialog.cpp (+374/-108)
qtiplot/src/plot2D/dialogs/LayerDialog.h (+27/-3)
qtiplot/src/plot2D/dialogs/PlotDialog.cpp (+466/-115)
qtiplot/src/plot2D/dialogs/PlotDialog.h (+28/-118)
qtiplot/src/plot2D/plot2D.pri (+0/-114)
qtiplot/src/plot3D/Bar.cpp (+52/-46)
qtiplot/src/plot3D/ColorMapPreviewDialog.cpp (+0/-95)
qtiplot/src/plot3D/ColorMapPreviewDialog.h (+0/-49)
qtiplot/src/plot3D/Cone3D.cpp (+1/-0)
qtiplot/src/plot3D/Graph3D.cpp (+539/-324)
qtiplot/src/plot3D/Graph3D.h (+27/-9)
qtiplot/src/plot3D/Plot3DDialog.cpp (+87/-60)
qtiplot/src/plot3D/Plot3DDialog.h (+5/-4)
qtiplot/src/plot3D/SurfaceDialog.cpp (+174/-96)
qtiplot/src/plot3D/SurfaceDialog.h (+15/-9)
qtiplot/src/plot3D/plot3D.pri (+0/-19)
qtiplot/src/scripting/FindReplaceDialog.cpp (+0/-215)
qtiplot/src/scripting/FindReplaceDialog.h (+0/-73)
qtiplot/src/scripting/MyParser.cpp (+0/-143)
qtiplot/src/scripting/MyParser.h (+0/-61)
qtiplot/src/scripting/Note.cpp (+0/-415)
qtiplot/src/scripting/Note.h (+0/-105)
qtiplot/src/scripting/PythonScript.cpp (+0/-300)
qtiplot/src/scripting/PythonScript.h (+0/-70)
qtiplot/src/scripting/PythonScripting.cpp (+0/-409)
qtiplot/src/scripting/PythonScripting.h (+0/-103)
qtiplot/src/scripting/PythonSyntaxHighlighter.cpp (+0/-189)
qtiplot/src/scripting/PythonSyntaxHighlighter.h (+0/-89)
qtiplot/src/scripting/Script.cpp (+0/-113)
qtiplot/src/scripting/Script.h (+0/-163)
qtiplot/src/scripting/ScriptEdit.cpp (+0/-819)
qtiplot/src/scripting/ScriptEdit.h (+0/-171)
qtiplot/src/scripting/ScriptWindow.cpp (+0/-482)
qtiplot/src/scripting/ScriptWindow.h (+0/-107)
qtiplot/src/scripting/ScriptingEnv.cpp (+0/-70)
qtiplot/src/scripting/ScriptingEnv.h (+0/-115)
qtiplot/src/scripting/ScriptingLangDialog.cpp (+0/-81)
qtiplot/src/scripting/ScriptingLangDialog.h (+0/-59)
qtiplot/src/scripting/customevents.h (+0/-40)
qtiplot/src/scripting/muParserScript.cpp (+0/-478)
qtiplot/src/scripting/muParserScript.h (+0/-85)
qtiplot/src/scripting/muParserScripting.cpp (+0/-108)
qtiplot/src/scripting/muParserScripting.h (+0/-134)
qtiplot/src/scripting/qti.sip (+0/-2824)
qtiplot/src/scripting/scripting.pri (+0/-117)
qtiplot/src/table/ExportDialog.cpp (+0/-296)
qtiplot/src/table/ExportDialog.h (+0/-100)
qtiplot/src/table/ExtractDataDialog.cpp (+229/-0)
qtiplot/src/table/ExtractDataDialog.h (+88/-0)
qtiplot/src/table/SetColValuesDialog.cpp (+0/-292)
qtiplot/src/table/SetColValuesDialog.h (+0/-96)
qtiplot/src/table/SortDialog.cpp (+0/-102)
qtiplot/src/table/SortDialog.h (+0/-62)
qtiplot/src/table/Table.cpp (+0/-3412)
qtiplot/src/table/Table.h (+0/-365)
qtiplot/src/table/TableDialog.cpp (+0/-576)
qtiplot/src/table/TableDialog.h (+0/-96)
qtiplot/src/table/TableStatistics.cpp (+0/-344)
qtiplot/src/table/TableStatistics.h (+0/-74)
qtiplot/src/table/table.pri (+0/-19)
qtiplot/translations/qtiplot_cn.ts (+0/-18144)
qtiplot/translations/qtiplot_cz.ts (+10940/-15639)
qtiplot/translations/qtiplot_de.ts (+4175/-5305)
qtiplot/translations/qtiplot_es.ts (+4031/-6180)
qtiplot/translations/qtiplot_fr.ts (+1992/-14588)
qtiplot/translations/qtiplot_ja.ts (+3100/-6775)
qtiplot/translations/qtiplot_ro.ts (+0/-18434)
qtiplot/translations/qtiplot_ru.ts (+1023/-4728)
qtiplot/translations/qtiplot_sv.ts (+4292/-5470)
qtiplot_0.9.7.14-1_amd64.build (+156/-0)

lp://staging/~valavanisalex/ubuntu/maverick/qtiplot/qtiplot-fix-605027-merge0.9.8-1

On hold for merging into lp://staging/ubuntu/maverick/qtiplot

Ubuntu Sponsors: Pending requested 2010-07-29

Diff: 453941 lines (+62608/-191682)

382 files modified

.pc/.version (+1/-0)
.pc/01_build_system.diff/qtiplot.pro (+7/-0)
.pc/01_build_system.diff/qtiplot/qtiplot.pro (+248/-0)
.pc/01_build_system.diff/qtiplot/src/origin/origin.pri (+27/-0)
.pc/02_fix_paths.diff/qtiplot/src/core/ApplicationWindow.cpp (+18713/-0)
.pc/applied-patches (+2/-0)
3rdparty/liborigin/FORMAT (+0/-77)
3rdparty/liborigin/Origin750Parser.cpp (+0/-2413)
3rdparty/liborigin/Origin750Parser.h (+0/-65)
3rdparty/liborigin/OriginDefaultParser.cpp (+0/-481)
3rdparty/liborigin/OriginDefaultParser.h (+0/-47)
3rdparty/liborigin/OriginFile.cpp (+0/-175)
3rdparty/liborigin/OriginFile.h (+0/-75)
3rdparty/liborigin/OriginObj.h (+0/-703)
3rdparty/liborigin/OriginParser.cpp (+0/-189)
3rdparty/liborigin/OriginParser.h (+0/-67)
3rdparty/liborigin/copying (+0/-674)
3rdparty/liborigin/doc/Doxyfile (+0/-236)
3rdparty/liborigin/doc/liborigin2.dox (+0/-66)
3rdparty/liborigin/endianfstream.hh (+0/-225)
3rdparty/liborigin/liborigin.pro (+0/-26)
3rdparty/liborigin/logging.hpp (+0/-619)
3rdparty/liborigin/readme (+0/-27)
3rdparty/liborigin/tree.hh (+0/-2663)
3rdparty/qwtplot3d/3rdparty/gl2ps/COPYING.GL2PS (+0/-25)
3rdparty/qwtplot3d/3rdparty/gl2ps/COPYING.LGPL (+0/-482)
3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c (+0/-6061)
3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h (+0/-199)
3rdparty/qwtplot3d/include/qwt3d_autoptr.h (+0/-75)
3rdparty/qwtplot3d/include/qwt3d_autoscaler.h (+0/-51)
3rdparty/qwtplot3d/include/qwt3d_axis.h (+0/-127)
3rdparty/qwtplot3d/include/qwt3d_color.h (+0/-63)
3rdparty/qwtplot3d/include/qwt3d_colorlegend.h (+0/-80)
3rdparty/qwtplot3d/include/qwt3d_coordsys.h (+0/-125)
3rdparty/qwtplot3d/include/qwt3d_curve.h (+258/-0)
3rdparty/qwtplot3d/include/qwt3d_drawable.h (+0/-70)
3rdparty/qwtplot3d/include/qwt3d_enrichment.h (+0/-62)
3rdparty/qwtplot3d/include/qwt3d_enrichment_std.h (+0/-116)
3rdparty/qwtplot3d/include/qwt3d_extglwidget.h (+203/-0)
3rdparty/qwtplot3d/include/qwt3d_function.h (+0/-41)
3rdparty/qwtplot3d/include/qwt3d_global.h (+0/-58)
3rdparty/qwtplot3d/include/qwt3d_graphplot.h (+0/-24)
3rdparty/qwtplot3d/include/qwt3d_gridmapping.h (+0/-34)
3rdparty/qwtplot3d/include/qwt3d_helper.h (+0/-36)
3rdparty/qwtplot3d/include/qwt3d_io.h (+0/-141)
3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h (+0/-94)
3rdparty/qwtplot3d/include/qwt3d_io_reader.h (+0/-35)
3rdparty/qwtplot3d/include/qwt3d_label.h (+0/-78)
3rdparty/qwtplot3d/include/qwt3d_mapping.h (+0/-27)
3rdparty/qwtplot3d/include/qwt3d_multiplot.h (+0/-24)
3rdparty/qwtplot3d/include/qwt3d_openglhelper.h (+0/-130)
3rdparty/qwtplot3d/include/qwt3d_parametricsurface.h (+0/-44)
3rdparty/qwtplot3d/include/qwt3d_plot.h (+0/-320)
3rdparty/qwtplot3d/include/qwt3d_portability.h (+0/-91)
3rdparty/qwtplot3d/include/qwt3d_scale.h (+0/-89)
3rdparty/qwtplot3d/include/qwt3d_surfaceplot.h (+0/-130)
3rdparty/qwtplot3d/include/qwt3d_types.h (+0/-455)
3rdparty/qwtplot3d/include/qwt3d_volumeplot.h (+0/-24)
3rdparty/qwtplot3d/qwtplot3d.pri (+0/-71)
3rdparty/qwtplot3d/qwtplot3d.pro (+0/-96)
3rdparty/qwtplot3d/src/qwt3d_autoscaler.cpp (+0/-253)
3rdparty/qwtplot3d/src/qwt3d_axis.cpp (+0/-359)
3rdparty/qwtplot3d/src/qwt3d_color.cpp (+0/-63)
3rdparty/qwtplot3d/src/qwt3d_colorlegend.cpp (+0/-229)
3rdparty/qwtplot3d/src/qwt3d_coordsys.cpp (+0/-725)
3rdparty/qwtplot3d/src/qwt3d_curve.cpp (+741/-0)
3rdparty/qwtplot3d/src/qwt3d_dataviews.cpp (+0/-10)
3rdparty/qwtplot3d/src/qwt3d_drawable.cpp (+0/-140)
3rdparty/qwtplot3d/src/qwt3d_enrichment_std.cpp (+0/-347)
3rdparty/qwtplot3d/src/qwt3d_extglwidget.cpp (+136/-0)
3rdparty/qwtplot3d/src/qwt3d_function.cpp (+0/-102)
3rdparty/qwtplot3d/src/qwt3d_gridmapping.cpp (+0/-32)
3rdparty/qwtplot3d/src/qwt3d_gridplot.cpp (+0/-595)
3rdparty/qwtplot3d/src/qwt3d_io.cpp (+0/-365)
3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp (+0/-417)
3rdparty/qwtplot3d/src/qwt3d_io_reader.cpp (+0/-225)
3rdparty/qwtplot3d/src/qwt3d_label.cpp (+0/-304)
3rdparty/qwtplot3d/src/qwt3d_lighting.cpp (+0/-192)
3rdparty/qwtplot3d/src/qwt3d_meshplot.cpp (+0/-318)
3rdparty/qwtplot3d/src/qwt3d_mousekeyboard.cpp (+0/-387)
3rdparty/qwtplot3d/src/qwt3d_movements.cpp (+0/-106)
3rdparty/qwtplot3d/src/qwt3d_parametricsurface.cpp (+0/-104)
3rdparty/qwtplot3d/src/qwt3d_plot.cpp (+0/-500)
3rdparty/qwtplot3d/src/qwt3d_scale.cpp (+0/-312)
3rdparty/qwtplot3d/src/qwt3d_surfaceplot.cpp (+0/-183)
3rdparty/qwtplot3d/src/qwt3d_types.cpp (+0/-222)
3rdparty/zlib/README.txt (+0/-29)
3rdparty/zlib/minigzip.c (+0/-258)
3rdparty/zlib/zconf.h (+0/-332)
3rdparty/zlib/zlib.h (+0/-1357)
README.html (+5/-1)
build.conf.example (+38/-7)
debian/build.conf (+12/-1)
debian/changelog (+43/-0)
debian/control (+8/-5)
debian/patches/01_build_system.diff (+47/-46)
debian/patches/02_docbook_stylesheet.diff (+0/-11)
debian/patches/02_fix_paths.diff (+11/-0)
debian/patches/03_fix_qti_wordlist.txt_path.diff (+0/-13)
debian/patches/04_add_includes.diff (+0/-10)
debian/patches/series (+1/-2)
debian/rules (+6/-8)
debian/source/format (+1/-0)
fitPlugins/exp_saturation/exp_saturation.c (+0/-70)
fitPlugins/exp_saturation/exp_saturation.pro (+0/-29)
fitPlugins/explin/explin.c (+0/-76)
fitPlugins/explin/explin.pro (+0/-29)
fitPlugins/fitPlugins.pro (+0/-7)
fitPlugins/fitRational0/fitRational0.cpp (+32/-0)
fitPlugins/fitRational1/fitRational1.cpp (+32/-0)
fitPlugins/planck_wavelength/planck_wavelength.c (+0/-70)
fitPlugins/planck_wavelength/planck_wavelength.pro (+0/-27)
manual/docbook-en/appendix.docbook (+14/-2)
manual/docbook-en/dialogs.docbook (+87/-62)
manual/docbook-en/index.docbook (+7/-7)
manual/docbook-en/scripting.docbook (+303/-22)
manual/html/icons/icons.qrc (+227/-0)
manual/html/qtiplot.adp (+381/-367)
qtiplot.pro (+3/-4)
qtiplot/examples/python/filter_table.py (+0/-50)
qtiplot/examples/python/strd_nist_fit.py (+0/-163)
qtiplot/icons/axes_icons.h (+0/-1275)
qtiplot/icons/pixmaps.h (+0/-12630)
qtiplot/python-includepath.py (+28/-0)
qtiplot/python-libs-win.py (+28/-0)
qtiplot/python-sipcmd.py (+28/-0)
qtiplot/qtiUtil.py (+29/-0)
qtiplot/qti_wordlist.txt (+44/-0)
qtiplot/qtiplot.pro (+74/-32)
qtiplot/qtiplot.rc (+40/-0)
qtiplot/qtiplotrc.py (+37/-17)
qtiplot/src/analysis/Convolution.cpp (+1/-1)
qtiplot/src/analysis/Correlation.cpp (+1/-1)
qtiplot/src/analysis/FFT.cpp (+53/-12)
qtiplot/src/analysis/Filter.cpp (+106/-58)
qtiplot/src/analysis/Filter.h (+4/-3)
qtiplot/src/analysis/Fit.cpp (+40/-30)
qtiplot/src/analysis/Fit.h (+2/-2)
qtiplot/src/analysis/Integration.cpp (+21/-13)
qtiplot/src/analysis/Interpolation.cpp (+81/-74)
qtiplot/src/analysis/MultiPeakFit.cpp (+48/-20)
qtiplot/src/analysis/MultiPeakFit.h (+4/-3)
qtiplot/src/analysis/NonLinearFit.cpp (+47/-14)
qtiplot/src/analysis/NonLinearFit.h (+2/-2)
qtiplot/src/analysis/SmoothFilter.cpp (+1/-1)
qtiplot/src/analysis/analysis.pri (+0/-70)
qtiplot/src/analysis/dialogs/BaselineDialog.cpp (+419/-0)
qtiplot/src/analysis/dialogs/BaselineDialog.h (+92/-0)
qtiplot/src/analysis/dialogs/ExpDecayDialog.cpp (+17/-16)
qtiplot/src/analysis/dialogs/ExpDecayDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/FFTDialog.cpp (+11/-3)
qtiplot/src/analysis/dialogs/FilterDialog.cpp (+10/-7)
qtiplot/src/analysis/dialogs/FilterDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/FitDialog.cpp (+182/-186)
qtiplot/src/analysis/dialogs/FitDialog.h (+10/-6)
qtiplot/src/analysis/dialogs/FrequencyCountDialog.cpp (+1/-1)
qtiplot/src/analysis/dialogs/IntDialog.cpp (+26/-26)
qtiplot/src/analysis/dialogs/IntDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/InterpolationDialog.cpp (+19/-20)
qtiplot/src/analysis/dialogs/InterpolationDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/PolynomFitDialog.cpp (+14/-12)
qtiplot/src/analysis/dialogs/PolynomFitDialog.h (+2/-2)
qtiplot/src/analysis/dialogs/SmoothCurveDialog.cpp (+22/-19)
qtiplot/src/analysis/dialogs/SmoothCurveDialog.h (+5/-5)
qtiplot/src/analysis/dialogs/SubtractDataDialog.cpp (+335/-0)
qtiplot/src/analysis/dialogs/SubtractDataDialog.h (+71/-0)
qtiplot/src/analysis/fit_gsl.cpp (+32/-0)
qtiplot/src/analysis/fit_gsl.h (+32/-0)
qtiplot/src/analysis/nrutil.cpp (+0/-14)
qtiplot/src/analysis/nrutil.h (+0/-2)
qtiplot/src/core/ApplicationWindow.cpp (+0/-17557)
qtiplot/src/core/ApplicationWindow.h (+0/-1411)
qtiplot/src/core/ConfigDialog.cpp (+0/-2736)
qtiplot/src/core/ConfigDialog.h (+0/-232)
qtiplot/src/core/CustomActionDialog.cpp (+0/-787)
qtiplot/src/core/CustomActionDialog.h (+0/-135)
qtiplot/src/core/ExcelImport.cpp (+977/-0)
qtiplot/src/core/FindDialog.cpp (+0/-144)
qtiplot/src/core/FindDialog.h (+0/-75)
qtiplot/src/core/Folder.cpp (+0/-495)
qtiplot/src/core/Folder.h (+0/-226)
qtiplot/src/core/ImportASCIIDialog.cpp (+0/-811)
qtiplot/src/core/ImportASCIIDialog.h (+0/-189)
qtiplot/src/core/MdiSubWindow.cpp (+0/-344)
qtiplot/src/core/MdiSubWindow.h (+0/-205)
qtiplot/src/core/MultiPeakFitTool.cpp (+0/-150)
qtiplot/src/core/MultiPeakFitTool.h (+0/-74)
qtiplot/src/core/OdsFileHandler.cpp (+173/-0)
qtiplot/src/core/OdsFileHandler.h (+82/-0)
qtiplot/src/core/OpenProjectDialog.cpp (+0/-98)
qtiplot/src/core/OpenProjectDialog.h (+0/-53)
qtiplot/src/core/PlotWizard.cpp (+0/-400)
qtiplot/src/core/PlotWizard.h (+0/-126)
qtiplot/src/core/QtiPlotApplication.cpp (+124/-0)
qtiplot/src/core/QtiPlotApplication.h (+57/-0)
qtiplot/src/core/RenameWindowDialog.cpp (+0/-154)
qtiplot/src/core/RenameWindowDialog.h (+0/-75)
qtiplot/src/core/core.pri (+0/-31)
qtiplot/src/core/globals.h (+0/-41)
qtiplot/src/core/main.cpp (+0/-151)
qtiplot/src/lib/3rdparty/qtcolorpicker/LGPL_EXCEPTION.txt (+0/-10)
qtiplot/src/lib/3rdparty/qtcolorpicker/LICENSE.GPL3 (+0/-674)
qtiplot/src/lib/3rdparty/qtcolorpicker/LICENSE.LGPL (+0/-504)
qtiplot/src/lib/3rdparty/qtcolorpicker/README.TXT (+0/-7)
qtiplot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp (+0/-1144)
qtiplot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.h (+0/-121)
qtiplot/src/lib/CHANGES.txt (+0/-14)
qtiplot/src/lib/INSTALL (+0/-37)
qtiplot/src/lib/README (+0/-25)
qtiplot/src/lib/doc/Doxyfile (+0/-236)
qtiplot/src/lib/doc/qti.dox (+0/-60)
qtiplot/src/lib/gpl-3.0.txt (+0/-674)
qtiplot/src/lib/include/ColorBox.h (+0/-73)
qtiplot/src/lib/include/ColorButton.h (+0/-58)
qtiplot/src/lib/include/ColorMapEditor.h (+0/-96)
qtiplot/src/lib/include/DoubleSpinBox.h (+0/-105)
qtiplot/src/lib/include/ExtensibleFileDialog.h (+0/-78)
qtiplot/src/lib/include/LineNumberDisplay.h (+0/-61)
qtiplot/src/lib/include/PatternBox.h (+0/-61)
qtiplot/src/lib/include/PenStyleBox.h (+0/-58)
qtiplot/src/lib/include/SymbolBox.h (+0/-63)
qtiplot/src/lib/include/SymbolDialog.h (+0/-106)
qtiplot/src/lib/include/TextFormatButtons.h (+0/-90)
qtiplot/src/lib/libqti.pri (+0/-37)
qtiplot/src/lib/qti.pro (+0/-50)
qtiplot/src/lib/src/ColorBox.cpp (+0/-160)
qtiplot/src/lib/src/ColorButton.cpp (+0/-43)
qtiplot/src/lib/src/ColorMapEditor.cpp (+0/-308)
qtiplot/src/lib/src/DoubleSpinBox.cpp (+0/-207)
qtiplot/src/lib/src/ExtensibleFileDialog.cpp (+0/-85)
qtiplot/src/lib/src/LineNumberDisplay.cpp (+0/-118)
qtiplot/src/lib/src/PatternBox.cpp (+0/-187)
qtiplot/src/lib/src/PenStyleBox.cpp (+0/-84)
qtiplot/src/lib/src/SymbolBox.cpp (+0/-182)
qtiplot/src/lib/src/SymbolDialog.cpp (+0/-678)
qtiplot/src/lib/src/TextFormatButtons.cpp (+0/-639)
qtiplot/src/matrix/ColorMapDialog.cpp (+0/-89)
qtiplot/src/matrix/ColorMapDialog.h (+0/-54)
qtiplot/src/matrix/Matrix.cpp (+129/-38)
qtiplot/src/matrix/Matrix.h (+5/-0)
qtiplot/src/matrix/MatrixModel.cpp (+3/-3)
qtiplot/src/matrix/MatrixValuesDialog.cpp (+38/-2)
qtiplot/src/matrix/MatrixValuesDialog.h (+7/-3)
qtiplot/src/matrix/matrix.pri (+0/-21)
qtiplot/src/origin/importOPJ.cpp (+0/-1873)
qtiplot/src/origin/importOPJ.h (+0/-69)
qtiplot/src/origin/origin.pri (+0/-17)
qtiplot/src/plot2D/ArrowMarker.cpp (+10/-7)
qtiplot/src/plot2D/BoxCurve.cpp (+3/-3)
qtiplot/src/plot2D/BoxCurve.h (+1/-1)
qtiplot/src/plot2D/CanvasPicker.cpp (+31/-18)
qtiplot/src/plot2D/DataPickerTool.cpp (+72/-42)
qtiplot/src/plot2D/DataPickerTool.h (+22/-3)
qtiplot/src/plot2D/EllipseWidget.cpp (+0/-140)
qtiplot/src/plot2D/EllipseWidget.h (+0/-50)
qtiplot/src/plot2D/FrameWidget.cpp (+17/-1)
qtiplot/src/plot2D/FrameWidget.h (+6/-1)
qtiplot/src/plot2D/FunctionCurve.cpp (+85/-37)
qtiplot/src/plot2D/FunctionCurve.h (+1/-1)
qtiplot/src/plot2D/Graph.cpp (+871/-578)
qtiplot/src/plot2D/Graph.h (+62/-32)
qtiplot/src/plot2D/Grid.cpp (+2/-2)
qtiplot/src/plot2D/ImageWidget.cpp (+43/-5)
qtiplot/src/plot2D/ImageWidget.h (+11/-1)
qtiplot/src/plot2D/LegendWidget.cpp (+79/-65)
qtiplot/src/plot2D/LineProfileTool.cpp (+41/-28)
qtiplot/src/plot2D/LineProfileTool.h (+1/-1)
qtiplot/src/plot2D/LnScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/LogitScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/MultiLayer.cpp (+434/-186)
qtiplot/src/plot2D/MultiLayer.h (+29/-11)
qtiplot/src/plot2D/MultiPeakFitTool.cpp (+29/-14)
qtiplot/src/plot2D/PlotCurve.cpp (+104/-40)
qtiplot/src/plot2D/PlotCurve.h (+11/-0)
qtiplot/src/plot2D/PlotToolInterface.h (+5/-2)
qtiplot/src/plot2D/ProbabilityScaleEngine.cpp (+1/-1)
qtiplot/src/plot2D/QwtBarCurve.cpp (+8/-7)
qtiplot/src/plot2D/QwtErrorPlotCurve.cpp (+15/-9)
qtiplot/src/plot2D/QwtHistogram.cpp (+4/-1)
qtiplot/src/plot2D/QwtPieCurve.cpp (+17/-8)
qtiplot/src/plot2D/QwtPieCurve.h (+1/-0)
qtiplot/src/plot2D/RangeSelectorTool.cpp (+3/-4)
qtiplot/src/plot2D/RangeSelectorTool.h (+2/-0)
qtiplot/src/plot2D/RectangleWidget.cpp (+2/-0)
qtiplot/src/plot2D/ScaleDraw.cpp (+203/-169)
qtiplot/src/plot2D/ScaleDraw.h (+18/-4)
qtiplot/src/plot2D/ScaleEngine.cpp (+15/-7)
qtiplot/src/plot2D/ScalePicker.cpp (+13/-13)
qtiplot/src/plot2D/ScreenPickerTool.cpp (+216/-5)
qtiplot/src/plot2D/ScreenPickerTool.h (+42/-1)
qtiplot/src/plot2D/SelectionMoveResizer.cpp (+29/-6)
qtiplot/src/plot2D/SelectionMoveResizer.h (+1/-0)
qtiplot/src/plot2D/Spectrogram.cpp (+75/-45)
qtiplot/src/plot2D/Spectrogram.h (+5/-0)
qtiplot/src/plot2D/SubtractLineTool.cpp (+122/-0)
qtiplot/src/plot2D/SubtractLineTool.h (+69/-0)
qtiplot/src/plot2D/TexWidget.cpp (+4/-0)
qtiplot/src/plot2D/TranslateCurveTool.cpp (+0/-1)
qtiplot/src/plot2D/VectorCurve.cpp (+1/-1)
qtiplot/src/plot2D/cursors.h (+0/-142)
qtiplot/src/plot2D/dialogs/AxesDialog.cpp (+167/-89)
qtiplot/src/plot2D/dialogs/AxesDialog.h (+11/-6)
qtiplot/src/plot2D/dialogs/ContourLinesEditor.cpp (+0/-412)
qtiplot/src/plot2D/dialogs/ContourLinesEditor.h (+0/-102)
qtiplot/src/plot2D/dialogs/CurvesDialog.cpp (+55/-47)
qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (+22/-41)
qtiplot/src/plot2D/dialogs/ErrDialog.cpp (+1/-2)
qtiplot/src/plot2D/dialogs/FunctionDialog.cpp (+494/-271)
qtiplot/src/plot2D/dialogs/FunctionDialog.h (+33/-21)
qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (+38/-4)
qtiplot/src/plot2D/dialogs/ImageExportDialog.h (+3/-0)
qtiplot/src/plot2D/dialogs/LayerDialog.cpp (+374/-108)
qtiplot/src/plot2D/dialogs/LayerDialog.h (+27/-3)
qtiplot/src/plot2D/dialogs/PlotDialog.cpp (+478/-124)
qtiplot/src/plot2D/dialogs/PlotDialog.h (+28/-118)
qtiplot/src/plot2D/dialogs/TextDialog.cpp (+29/-6)
qtiplot/src/plot2D/dialogs/TextEditor.cpp (+36/-5)
qtiplot/src/plot2D/plot2D.pri (+0/-114)
qtiplot/src/plot3D/Bar.cpp (+52/-46)
qtiplot/src/plot3D/ColorMapPreviewDialog.cpp (+0/-95)
qtiplot/src/plot3D/ColorMapPreviewDialog.h (+0/-49)
qtiplot/src/plot3D/Cone3D.cpp (+1/-0)
qtiplot/src/plot3D/Graph3D.cpp (+536/-324)
qtiplot/src/plot3D/Graph3D.h (+27/-9)
qtiplot/src/plot3D/Plot3DDialog.cpp (+87/-60)
qtiplot/src/plot3D/Plot3DDialog.h (+5/-4)
qtiplot/src/plot3D/SurfaceDialog.cpp (+174/-96)
qtiplot/src/plot3D/SurfaceDialog.h (+15/-9)
qtiplot/src/plot3D/plot3D.pri (+0/-19)
qtiplot/src/scripting/FindReplaceDialog.cpp (+0/-215)
qtiplot/src/scripting/FindReplaceDialog.h (+0/-73)
qtiplot/src/scripting/MyParser.cpp (+0/-143)
qtiplot/src/scripting/MyParser.h (+0/-61)
qtiplot/src/scripting/Note.cpp (+0/-415)
qtiplot/src/scripting/Note.h (+0/-105)
qtiplot/src/scripting/PythonScript.cpp (+0/-300)
qtiplot/src/scripting/PythonScript.h (+0/-70)
qtiplot/src/scripting/PythonScripting.cpp (+0/-409)
qtiplot/src/scripting/PythonScripting.h (+0/-103)
qtiplot/src/scripting/PythonSyntaxHighlighter.cpp (+0/-189)
qtiplot/src/scripting/PythonSyntaxHighlighter.h (+0/-89)
qtiplot/src/scripting/Script.cpp (+0/-113)
qtiplot/src/scripting/Script.h (+0/-163)
qtiplot/src/scripting/ScriptEdit.cpp (+0/-819)
qtiplot/src/scripting/ScriptEdit.h (+0/-171)
qtiplot/src/scripting/ScriptWindow.cpp (+0/-482)
qtiplot/src/scripting/ScriptWindow.h (+0/-107)
qtiplot/src/scripting/ScriptingEnv.cpp (+0/-70)
qtiplot/src/scripting/ScriptingEnv.h (+0/-115)
qtiplot/src/scripting/ScriptingLangDialog.cpp (+0/-81)
qtiplot/src/scripting/ScriptingLangDialog.h (+0/-59)
qtiplot/src/scripting/customevents.h (+0/-40)
qtiplot/src/scripting/muParserScript.cpp (+0/-478)
qtiplot/src/scripting/muParserScript.h (+0/-85)
qtiplot/src/scripting/muParserScripting.cpp (+0/-108)
qtiplot/src/scripting/muParserScripting.h (+0/-134)
qtiplot/src/scripting/qti.sip (+0/-2824)
qtiplot/src/scripting/scripting.pri (+0/-117)
qtiplot/src/table/ExportDialog.cpp (+0/-296)
qtiplot/src/table/ExportDialog.h (+0/-100)
qtiplot/src/table/ExtractDataDialog.cpp (+229/-0)
qtiplot/src/table/ExtractDataDialog.h (+88/-0)
qtiplot/src/table/SetColValuesDialog.cpp (+0/-292)
qtiplot/src/table/SetColValuesDialog.h (+0/-96)
qtiplot/src/table/SortDialog.cpp (+0/-102)
qtiplot/src/table/SortDialog.h (+0/-62)
qtiplot/src/table/Table.cpp (+0/-3412)
qtiplot/src/table/Table.h (+0/-365)
qtiplot/src/table/TableDialog.cpp (+0/-576)
qtiplot/src/table/TableDialog.h (+0/-96)
qtiplot/src/table/TableStatistics.cpp (+0/-344)
qtiplot/src/table/TableStatistics.h (+0/-74)
qtiplot/src/table/table.pri (+0/-19)
qtiplot/translations/qtiplot_cn.ts (+0/-18144)
qtiplot/translations/qtiplot_cz.ts (+11250/-15644)
qtiplot/translations/qtiplot_de.ts (+4481/-5306)
qtiplot/translations/qtiplot_es.ts (+4281/-6212)
qtiplot/translations/qtiplot_fr.ts (+2405/-14681)
qtiplot/translations/qtiplot_ja.ts (+3281/-6806)
qtiplot/translations/qtiplot_ro.ts (+0/-18434)
qtiplot/translations/qtiplot_ru.ts (+1340/-4748)
qtiplot/translations/qtiplot_sv.ts (+4506/-5308)

lp://staging/ubuntu/natty/qtiplot

Bug Watch Updater (bug-watch-updater) on 2010-06-30

Changed in qtiplot (Debian):
status:	Unknown → New

Revision history for this message

Alex Valavanis (valavanisalex) wrote on 2010-07-13:

Just add Build-Depends: libqtassistantclient-dev and Depends: qt-assistant-compat to debian/control. That should fix it

Changed in qtiplot (Ubuntu):
status:	New → Confirmed

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-13:

If nobody has any objections m willing to work on this bug :)

regards

Revision history for this message

Scott Howard (showard314) wrote on 2010-07-13: Re: [Bug 598826] Re: qtiplot FTBFS using qt > 4.6 (Maverick has 4.7)

I've actually done the merge with qtiplot in unstable already
including qt-assistant-compat, but I won't be able to upload it for a
few days. Feel free to work on it and upload, but please do a merge at
the same time.

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-13:

yes I ll take care of the merge

Regards

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-13:

the patch to fix FTBFS Edit (1.7 KiB, text/plain)

Scott:

Instead of merging it through here is the patch attached

when you upload a new version containing all the ubuntu changes it can be synced again :)

regards

Brian Murray (brian-murray) on 2010-07-13

tags:

added: patch

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-14:

fabrice,

please upload this patch now as it fixes FTBFS

regards

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-14:

Oops this needs more work I think its FTB on my PPA today :(

http://launchpadlibrarian.net/51899645/buildlog_ubuntu-maverick-i386.qtiplot_0.9.7.10%2Br1453-1ubuntu5_FAILEDTOBUILD.txt.gz

Changed in qtiplot (Ubuntu):
status:	Confirmed → Incomplete

Revision history for this message

Bhavani Shankar (bhavi) wrote on 2010-07-14:

the ftb bug has been reported here:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=583021

Revision history for this message

Launchpad Janitor (janitor) wrote on 2010-08-25:

This bug was fixed in the package qtiplot - 0.9.8-1ubuntu1

---------------
qtiplot (0.9.8-1ubuntu1) maverick; urgency=low

  * Merge from debian unstable(LP: #605027). Remaining changes:
    - Build-Depends on libqtassistantclient-dev
      Recommends qt-assistant-compat to fix a FTBFS since qtassistant
      is removed in qt > 4.6 (LP: #598826)

qtiplot (0.9.8-1) unstable; urgency=low

  * New upstream release
  * Bump standards version to 3.9.0
  * Change python version to 2.6

qtiplot (0.9.7.14-1) unstable; urgency=low

  * New upstream release
  * Build QTeXEngine into program
  * Bump liborigin2 dependency to >=1:06042009+svn1724
  * Bump muparser dependency to 1.32

qtiplot (0.9.7.13-1) UNRELEASED; urgency=low

  * New upstream release
  * Switch to dpkg-source 3.0 (quilt) format
  * Minor fix to patch 01_build_system.diff
  * Add qwtplot3d to build.conf
  * Bump standards version to 3.8.4
  * Fix spelling errors in description
  * Add misc depends in qtiplot-doc
  * Remove patch 02_docbook_stylesheet and
    04_add_includes.diff
  * Rename 03_fix_qti_wordlist.txt_path to
    02_fix_paths.diff
-- Scott Howard <email address hidden> Tue, 24 Aug 2010 18:09:11 -0400