lp:~valavanisalex/ubuntu/maverick/scidavis/fix-604811
Created by
Alex Valavanis
and last modified
- Get this branch:
- bzr branch lp:~valavanisalex/ubuntu/maverick/scidavis/fix-604811
Only
Alex Valavanis
can upload to this branch. If you are
Alex Valavanis
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Ubuntu Sponsors: Pending requested
- Registry Administrators: Pending requested
-
Diff: 140484 lines (+71072/-37806)150 files modified.pc/.version (+1/-0)
.pc/applied-patches (+2/-0)
.pc/scidavis_pro.diff/scidavis/scidavis.pro (+145/-0)
.pc/sourcefiles_pri.diff/scidavis/sourcefiles.pri (+425/-0)
CHANGES (+49/-0)
Doxyfile (+1/-1)
README (+3/-0)
README.installer (+19/-0)
debian/changelog (+21/-0)
debian/control (+7/-6)
debian/patches/makefile.patch (+0/-42)
debian/patches/package-contains-upstream-install-documentation.patch (+0/-15)
debian/patches/reorder-updatehorizontalheader.patch (+0/-16)
debian/patches/scidavis_pro.diff (+40/-0)
debian/patches/series (+2/-4)
debian/patches/sip49.patch (+0/-29)
debian/patches/sourcefiles_pri.diff (+17/-0)
debian/rules (+0/-1)
debian/source/format (+1/-0)
debian/source/options (+2/-0)
debian/watch (+2/-1)
scidavis/python-sipcmd.py (+5/-1)
scidavis/python.pri (+13/-1)
scidavis/scidavis.pro (+12/-13)
scidavis/scidavisrc.py (+41/-0)
scidavis/sourcefiles.pri (+10/-5)
scidavis/src/ApplicationWindow.cpp (+237/-168)
scidavis/src/ApplicationWindow.h (+8/-4)
scidavis/src/AssociationsDialog.cpp (+1/-1)
scidavis/src/AxesDialog.cpp (+32/-3)
scidavis/src/BoxCurve.cpp (+3/-1)
scidavis/src/BoxCurve.h (+1/-1)
scidavis/src/Correlation.cpp (+3/-5)
scidavis/src/DataPickerTool.cpp (+6/-4)
scidavis/src/DataPickerTool.h (+2/-0)
scidavis/src/DataPointPicker.cpp (+80/-0)
scidavis/src/DataPointPicker.h (+57/-0)
scidavis/src/Differentiation.cpp (+10/-16)
scidavis/src/Filter.cpp (+51/-65)
scidavis/src/Filter.h (+10/-4)
scidavis/src/Folder.cpp (+1/-1)
scidavis/src/Folder.h (+18/-4)
scidavis/src/FunctionCurve.cpp (+12/-3)
scidavis/src/Graph.cpp (+115/-242)
scidavis/src/Graph.h (+5/-0)
scidavis/src/IntDialog.cpp (+7/-32)
scidavis/src/IntDialog.h (+1/-3)
scidavis/src/Integration.cpp (+72/-120)
scidavis/src/Integration.h (+14/-5)
scidavis/src/Interpolation.cpp (+10/-48)
scidavis/src/Interpolation.h (+3/-1)
scidavis/src/LineDialog.cpp (+2/-2)
scidavis/src/LineProfileTool.h (+1/-0)
scidavis/src/Matrix.cpp (+8/-1)
scidavis/src/MuParserScript.cpp (+23/-9)
scidavis/src/MuParserScripting.cpp (+48/-48)
scidavis/src/MuParserScripting.h (+1/-1)
scidavis/src/MultiLayer.cpp (+1/-0)
scidavis/src/MultiLayer.h (+1/-0)
scidavis/src/MultiPeakFitTool.h (+1/-0)
scidavis/src/Plot3DDialog.cpp (+24/-19)
scidavis/src/Plot3DDialog.h (+4/-2)
scidavis/src/PlotCurve.cpp (+183/-185)
scidavis/src/PlotCurve.h (+2/-1)
scidavis/src/PlotToolInterface.h (+3/-0)
scidavis/src/PythonScript.cpp (+4/-4)
scidavis/src/QwtErrorPlotCurve.cpp (+26/-65)
scidavis/src/QwtErrorPlotCurve.h (+1/-1)
scidavis/src/QwtHistogram.cpp (+8/-6)
scidavis/src/QwtHistogram.h (+2/-2)
scidavis/src/QwtPieCurve.cpp (+3/-1)
scidavis/src/QwtPieCurve.h (+1/-1)
scidavis/src/RangeSelectorTool.h (+1/-0)
scidavis/src/ScaleDraw.cpp (+19/-5)
scidavis/src/ScaleDraw.h (+28/-3)
scidavis/src/ScreenPickerTool.h (+1/-0)
scidavis/src/ScriptEdit.cpp (+1/-1)
scidavis/src/SelectionMoveResizer.cpp (+5/-5)
scidavis/src/SortDialog.cpp (+0/-103)
scidavis/src/SortDialog.h (+0/-62)
scidavis/src/Table.cpp (+84/-31)
scidavis/src/Table.h (+1/-0)
scidavis/src/TranslateCurveTool.h (+1/-0)
scidavis/src/VectorCurve.cpp (+33/-45)
scidavis/src/VectorCurve.h (+1/-1)
scidavis/src/future/core/AbstractColumn.h (+1/-1)
scidavis/src/future/core/AbstractExportFilter.h (+0/-60)
scidavis/src/future/core/AbstractFit.cpp (+0/-79)
scidavis/src/future/core/AbstractFit.h (+0/-129)
scidavis/src/future/core/AbstractScript.cpp (+0/-42)
scidavis/src/future/core/AbstractScript.h (+0/-111)
scidavis/src/future/core/AbstractScriptingEngine.cpp (+0/-81)
scidavis/src/future/core/AbstractScriptingEngine.h (+0/-171)
scidavis/src/future/core/CopyThroughFilter.h (+0/-54)
scidavis/src/future/core/Filter.cpp (+0/-334)
scidavis/src/future/core/Filter.h (+0/-162)
scidavis/src/future/core/FilterDialog.cpp (+0/-191)
scidavis/src/future/core/FilterDialog.h (+0/-70)
scidavis/src/future/core/MyParser.cpp (+0/-192)
scidavis/src/future/core/MyParser.h (+0/-119)
scidavis/src/future/core/Project.cpp (+1/-1)
scidavis/src/future/core/ScriptEdit.cpp (+0/-370)
scidavis/src/future/core/ScriptEdit.h (+0/-89)
scidavis/src/future/core/ScriptingEngineManager.cpp (+0/-72)
scidavis/src/future/core/ScriptingEngineManager.h (+0/-54)
scidavis/src/future/core/ScriptingLangDialog.cpp (+0/-82)
scidavis/src/future/core/ScriptingLangDialog.h (+0/-57)
scidavis/src/future/core/column/Column.cpp (+2/-2)
scidavis/src/future/core/column/Column.h (+1/-1)
scidavis/src/future/core/column/ColumnPrivate.cpp (+42/-20)
scidavis/src/future/core/column/ColumnPrivate.h (+1/-1)
scidavis/src/future/core/column/columncommands.cpp (+6/-4)
scidavis/src/future/core/column/columncommands.h (+4/-1)
scidavis/src/future/core/core.pro (+0/-179)
scidavis/src/future/core/customevents.h (+0/-43)
scidavis/src/future/core/datatypes/Double2DateTimeFilter.cpp (+104/-0)
scidavis/src/future/core/datatypes/Double2DateTimeFilter.h (+23/-15)
scidavis/src/future/core/globals.h (+0/-123)
scidavis/src/future/matrix/MatrixConfigPage.ui (+0/-27)
scidavis/src/future/matrix/MatrixModule.cpp (+0/-127)
scidavis/src/future/matrix/MatrixModule.h (+0/-76)
scidavis/src/future/matrix/MatrixView.h (+1/-1)
scidavis/src/future/matrix/future_Matrix.cpp (+2/-1)
scidavis/src/future/matrix/matrix.pro (+0/-42)
scidavis/src/future/table/ExportTableDialog.cpp (+0/-186)
scidavis/src/future/table/ExportTableDialog.h (+0/-104)
scidavis/src/future/table/ImportTableDialog.cpp (+0/-273)
scidavis/src/future/table/ImportTableDialog.h (+0/-116)
scidavis/src/future/table/TableModule.cpp (+0/-141)
scidavis/src/future/table/TableModule.h (+0/-76)
scidavis/src/future/table/TableView.cpp (+97/-21)
scidavis/src/future/table/TableView.h (+1/-0)
scidavis/src/future/table/controltabs.ui (+202/-171)
scidavis/src/future/table/future_Table.cpp (+55/-68)
scidavis/src/future/table/future_Table.h (+0/-1)
scidavis/src/future/table/table.pro (+0/-55)
scidavis/src/globals.cpp (+5/-4)
scidavis/src/nrutil.cpp (+0/-50)
scidavis/src/nrutil.h (+0/-4)
scidavis/src/scidavis.sip (+315/-39)
scidavis/translations/scidavis_cs-alt.ts (+14257/-0)
scidavis/translations/scidavis_cs.ts (+20518/-0)
scidavis/translations/scidavis_de.ts (+2133/-1673)
scidavis/translations/scidavis_es.ts (+21418/-22392)
scidavis/translations/scidavis_fr.ts (+2056/-1663)
scidavis/translations/scidavis_ja.ts (+2061/-1668)
scidavis/translations/scidavis_pt-br.ts (+1548/-1118)
scidavis/translations/scidavis_ru.ts (+2055/-1662)
scidavis/translations/scidavis_sv.ts (+2056/-1663)
scidavisScriptInstall.nsi (+8/-4)
Related source package recipes
Related bugs
| Bug #565206: Please update to 0.2.4 as it fixes compatibility issues with qt 4.6 | Undecided | Fix Released |
|
| Bug #601617: Missing dependency on qt4-assistant | Undecided | Fix Released |
|
| Bug #604811: Please merge with 0.2.4-1 from debian unstable | Undecided | Fix Released |
|
Related blueprints
Branch information
- Owner:
- Alex Valavanis
- Status:
- Development
Recent revisions
- 5. By Alex Valavanis
-
* Merge from Debian unstable (LP: #604811, LP: #565206)
* debian/control: Fix FTBFS with Qt 4.7 (LP: #601617)
+ add Build-Depends libqt4assistantclient- dev
+ add Recommends: qt-assistant-compat
* New upstream version
+ Should fix various crashes (Closes: #583226, #571462).
* debian/source/: migrate format to '3.0' in order to use bz2 tarballs
* debian/control: remove Build-Depends on quilt (not needed with 3.0)
* debian/control: bump Standards-Version to 3.8.4 (no changes needed)
* debian/control: set Priority to extra because libmuparser0 is extra
* debian/watch: update for bz2 tarballs - 4. By Angel Abad
-
New patch reorder-
updatehorizonta lheader. patch to fix Segmentation
Faults, taken from upstream. Thanks Alex Valavanis (LP: #532732) - 3. By Jonathan Thomas
-
Reubild in order to change binary dependencies from libqwtplot3d-qt4 to
libqwtplot3d-qt4-0 according to name change in qwtplot3d package
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/maverick/scidavis
