Commit af25d087 authored by Olivier Langella's avatar Olivier Langella
Browse files

masschroq (2.2.0-15) jessie

parent 3523cf92
......@@ -16,7 +16,7 @@ PROJECT(masschroq CXX C)
#depending on libpappsomspp version :
SET(LIBPAPPSOMSPP_VERSION "0.2.29-1")
SET(LIBPAPPSOMSPP_VERSION "0.2.30-1")
configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY)
# Project version
......
masschroq (2.2.0-15) jessie; urgency=medium
* qwt6 switch
-- Olivier Langella <Olivier.Langella@moulon.inra.fr> Wed, 19 Oct 2016 22:37:53 +0200
masschroq (2.2.0-14) jessie; urgency=medium
* new pappsomspp library
......
......@@ -6,8 +6,8 @@ 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),
libqwt5-qt4-dev (>=5.2.0), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
texlive-science, hevea, inkscape, doxygen, libpappsomspp-dev (= 0.2.29-1), libodsstream-dev (>=0.4.4)
libqwt-dev (>=6.0.0), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
texlive-science, hevea, inkscape, doxygen, libpappsomspp-dev (= 0.2.30-1), libodsstream-dev (>=0.4.4)
Build-Conflicts: qt3-dev-tools
Homepage: http://pappso.inra.fr/bioinfo/masschroq/
......@@ -15,7 +15,7 @@ Homepage: http://pappso.inra.fr/bioinfo/masschroq/
Package: masschroq-common
Architecture: linux-any
Depends: ${shlibs:Depends}, libqtcore4 (>= 4.6.3), libpappsomspp-qt4 (= 0.2.29-1), libodsstream-qt4
Depends: ${shlibs:Depends}, libqtcore4 (>= 4.6.3), libpappsomspp-qt4 (= 0.2.30-1), libodsstream-qt4
Replaces: masschroq (<< 1.5.0)
Conflicts: masschroq (<< 1.5.0)
Suggests: masschroq, masschroq-gui, masschroq-studio
......@@ -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),libqwt5-qt4 (>= 5.2.0), libqt4-xml (>= 4.6.3)
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
......
......@@ -6,7 +6,7 @@ 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),
libqwt5-qt4-dev (>=5.2.0), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
libqwt-dev (>=6.0.0), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
texlive-science, hevea, inkscape, doxygen, libpappsomspp-dev (= @LIBPAPPSOMSPP_VERSION@), libodsstream-dev (>=0.4.4)
Build-Conflicts: qt3-dev-tools
Homepage: http://pappso.inra.fr/bioinfo/masschroq/
......@@ -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),libqwt5-qt4 (>= 5.2.0), libqt4-xml (>= 4.6.3)
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
......
......@@ -25,7 +25,7 @@ INCLUDE( ${QT_USE_FILE} )
#sudo apt-get install libpappsomspp-dev
if (NOT PAPPSOMSPP_DIR)
# FIND_PACKAGE( Pappsomspp REQUIRED )
FIND_PACKAGE( Pappsomspp REQUIRED )
endif (NOT PAPPSOMSPP_DIR)
#SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
......
......@@ -35,7 +35,6 @@
#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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment