masschroq (2.2.2-5) stretch

CMakeLists.txt

@@ -16,7 +16,7 @@ PROJECT(masschroq CXX C)
 
 
 #depending on libpappsomspp version :
-SET(LIBPAPPSOMSPP_VERSION "0.2.35-1")
+SET(LIBPAPPSOMSPP_VERSION "0.2.36-1")
 configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control  @ONLY)
 
 # Project version

debian/changelog

+masschroq (2.2.2-5) stretch; urgency=medium
+
+  * new odsstream library
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Tue, 20 Jun 2017 22:23:57 +0200
+
 masschroq (2.2.2-4) jessie; urgency=medium
 
   * new odsstream library
 
- -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Tue, 23 May 2017 22:23:07 +0200
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Tue, 23 May 2017 22:23:07 +0200
+
+masschroq (2.2.2-3~stretch) stretch; urgency=medium
+
+  * stretch package
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Thu, 11 May 2017 16:04:52 +0200
 
 masschroq (2.2.2-3) jessie; urgency=medium
 
@@ -22,6 +34,18 @@ masschroq (2.2.2-1) jessie; urgency=medium
 
  -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Tue, 18 Apr 2017 13:02:26 +0200
 
+masschroq (2.2.2-1~stretch) stretch; urgency=medium
+
+  * stretch package 
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Thu, 20 Apr 2017 09:58:04 +0200
+
+masschroq (2.2.1-4~stretch) stretch; urgency=medium
+
+  * stretch package
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Sat, 18 Mar 2017 18:05:49 +0100
+
 masschroq (2.2.1-4) jessie; urgency=medium
 
   * new pappso library

debian/control

-Source: masschroq
-Section: science
-Priority: optional
-Maintainer: Olivier Langella <Olivier.Langella@moulon.inra.fr>
-Uploaders: Olivier Langella <olivier.langella@moulon.inra.fr>
-DM-Upload-Allowed: yes
-Standards-Version: 3.9.1.0
-Build-Depends: debhelper (>= 5), cmake (>= 2.6), libx11-dev, libc6-dev, libqt4-dev (>= 4.6.3),
- libqwt-dev (>=6.0.0), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
- texlive-science, hevea, inkscape, doxygen, libpappsomspp-dev (= 0.2.35-1), libodsstream-dev (>=0.4.4)
-Build-Conflicts: qt3-dev-tools
-Homepage: http://pappso.inra.fr/bioinfo/masschroq/
-
-
-
-Package: masschroq-common
-Architecture: linux-any
-Depends: ${shlibs:Depends}, libqtcore4 (>= 4.6.3), libpappsomspp-qt4  (= 0.2.35-1), libodsstream-qt4
-Replaces: masschroq (<< 1.5.0)
-Conflicts: masschroq (<< 1.5.0)
-Suggests: masschroq, masschroq-gui, masschroq-studio
-Description: Mass Chromatogram Quantification shared libraries
- MassChroQ (Mass Chromatogram Quantification) software performs quantification 
- of data obtained from LC-MS (Liquid Chromatography - Mass Spectrometry) techniques. 
- In particular it performs : retention-time alignment of runs, XIC extraction and filtering, 
- peak detection and quantification.
-
-
-
-Package: masschroq-doc
-Architecture: all
-Depends: ${shlibs:Depends}
-Suggests: masschroq, masschroq-gui, masschroq-studio
-Description: Mass Chromatogram Quantification documentation
- Installs PDF documentation for MassChroQ in /usr/share/doc/masschroq
-
-
-
-Package: masschroq
-Architecture: any
-Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3)
-Suggests: masschroq-doc, masschroq-gui, masschroq-studio
-Description: Mass Chromatogram Quantification CLI (Command Line Interface)
- MassChroQ (Mass Chromatogram Quantification) software performs quantification 
- of data obtained from LC-MS (Liquid Chromatography - Mass Spectrometry) techniques. 
- In particular it performs : retention-time alignment of runs, XIC extraction and filtering, 
- peak detection and quantification.
-
-
-
-Package: masschroq-gui
-Architecture: any
-Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3), libqtgui4 (>= 4.6.3), libqt4-xmlpatterns (>= 4.6.3), libqt4-network (>= 4.6.3)
-Suggests: masschroq-doc, masschroq-studio
-Description: Mass Chromatogram Quantification graphical user interface
- MassChroQ (Mass Chromatogram Quantification) software performs quantification 
- of data obtained from LC-MS (Liquid Chromatography - Mass Spectrometry) techniques. 
- In particular it performs : retention-time alignment of runs, XIC extraction and filtering, 
- peak detection and quantification.
-
-
-
-Package: masschroq-studio
-Architecture: any
-Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3), libqtgui4 (>= 4.6.3),libqwt6 (>= 6.0.0), libqt4-xml (>= 4.6.3)
-Suggests: masschroq-doc, masschroq-gui
-Description: Mass Chromatogram Quantification graphical user interface to edit parameters
- MassChroQ (Mass Chromatogram Quantification) software performs quantification 
- of data obtained from LC-MS (Liquid Chromatography - Mass Spectrometry) techniques. 
- In particular it performs : retention-time alignment of runs, XIC extraction and filtering, 
- peak detection and quantification.
-
-
-Package: masschroq-condor
-Architecture: all
-Depends: ${shlibs:Depends}, masschroq, condor
-Suggests: masschroq-doc, masschroq-gui, masschroq-studio
-Description: Perl script to launch MassChroQ via condor job queue
- Perl script to launch MassChroQ via condor job queue

debian/control.cmake

 Source: masschroq
 Section: science
 Priority: optional
-Maintainer: Olivier Langella <Olivier.Langella@moulon.inra.fr>
-Uploaders: Olivier Langella <olivier.langella@moulon.inra.fr>
+Maintainer: Olivier Langella <olivier.langella@u-psud.fr>
+Uploaders: Olivier Langella <olivier.langella@u-psud.fr>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.1.0
 Build-Depends: debhelper (>= 5), cmake (>= 2.6), libx11-dev, libc6-dev, libqt4-dev (>= 4.6.3),
@@ -62,7 +62,7 @@ Description: Mass Chromatogram Quantification graphical user interface
 
 Package: masschroq-studio
 Architecture: any
-Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3), libqtgui4 (>= 4.6.3),libqwt6 (>= 6.0.0), libqt4-xml (>= 4.6.3)
+Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3), libqtgui4 (>= 4.6.3),libqwt6abi1 (>= 6.0.0), libqt4-xml (>= 4.6.3)
 Suggests: masschroq-doc, masschroq-gui
 Description: Mass Chromatogram Quantification graphical user interface to edit parameters
  MassChroQ (Mass Chromatogram Quantification) software performs quantification 

src/gui/alignementwidget/plot_aligned.h

@@ -35,6 +35,7 @@
 #include <qwt_plot.h>
 #include <qwt_plot_zoomer.h>
 #include <qwt_plot_curve.h>
+#include <qwt_point_data.h>
 #include "../treatment/treatment_box_xic_extract.h"
 #include "../treatment/treatment_box_xic_detect.h"
 #include "../treatment/treatment_box_xic_filter.h"

templates/share/applications/masschroq-gui.desktop.cmake

@@ -6,4 +6,4 @@ Exec=masschroq_gui %U
 Icon=${CMAKE_INSTALL_PREFIX}/share/masschroq/masschroq.svg
 Terminal=false
 Type=Application
-StartupNotify=true
\ No newline at end of file
+StartupNotify=true