diff --git a/xtandempipeline/CMakeLists.txt b/xtandempipeline/CMakeLists.txt index b49a31d58ab58a439a812cb4f70bb6fa6c22c03c..c8fb4ebef6270d3d22efe663dfdba498e39cafa7 100644 --- a/xtandempipeline/CMakeLists.txt +++ b/xtandempipeline/CMakeLists.txt @@ -20,7 +20,7 @@ MESSAGE("Java_JAVAC_EXECUTABLE : ${Java_JAVAC_EXECUTABLE} ") cmake_minimum_required(VERSION 2.6) -SET (XTANDEMPIPELINE_VERSION "3.2.1") +SET (XTANDEMPIPELINE_VERSION "3.2.2") SET(CPACK_CMAKE_GENERATOR "Unix Makefiles") SET(CPACK_GENERATOR "STGZ;TGZ;TZ") @@ -39,7 +39,7 @@ SET(CPACK_PACKAGE_VENDOR "INRA") SET(CPACK_PACKAGE_VERSION ${XTANDEMPIPELINE_VERSION}) SET(CPACK_PACKAGE_VERSION_MAJOR "3") SET(CPACK_PACKAGE_VERSION_MINOR "2") -SET(CPACK_PACKAGE_VERSION_PATCH "1") +SET(CPACK_PACKAGE_VERSION_PATCH "2") SET(CPACK_RESOURCE_FILE_LICENSE ./COPYING) SET(CPACK_RESOURCE_FILE_README ./README) #SET(CPACK_RESOURCE_FILE_WELCOME ${xtandemparser_SOURCE_DIR}/INSTALL) @@ -49,7 +49,7 @@ SET(CPACK_SOURCE_STRIP_FILES "") SET(CPACK_SOURCE_IGNORE_FILES "/bin/" - "/doc\\/files/" + "/doc\\\\/files/" "/build/" "/dist/" "/lib/" @@ -66,16 +66,16 @@ SET(CPACK_SOURCE_IGNORE_FILES "/_CPack_Packages/" "/Debug/" "/Release/" - "/\\.externalToolBuilders/" - "/\\.svn/" - "/\\.settings/" + "/\\\\.externalToolBuilders/" + "/\\\\.svn/" + "/\\\\.settings/" "Makefile" - "\\.cdtbuild" - "\\.cdtproject" - "\\.project" - "\\.cproject" + "\\\\.cdtbuild" + "\\\\.cdtproject" + "\\\\.project" + "\\\\.cproject" "beads$" - ".*\\.tar\\.gz" + ".*\\\\.tar\\\\.gz" "XTandem_Pipeline.jar" "XtandemPipeline.jar" ) diff --git a/xtandempipeline/debian/changelog b/xtandempipeline/debian/changelog index 13e3fecb8bbed86da30dbe47d7ae50e1e69ba5bf..9f8ea4dbfea894f345a1912dfd70dc3c508bc4dd 100644 --- a/xtandempipeline/debian/changelog +++ b/xtandempipeline/debian/changelog @@ -1,3 +1,15 @@ +xtandempipeline (3.2.2-1) lucid; urgency=low + + * 3.2.2 : Corrected report of input parameter on X!Tandem output result (thanks to T. Greko) + + -- Olivier Langella <Olivier.Langella@moulon.inra.fr> Wed, 16 May 2012 08:18:51 +0200 + +xtandempipeline (3.2.1-2) lucid; urgency=low + + * ant version fixed + + -- Olivier Langella <Olivier.Langella@moulon.inra.fr> Fri, 6 Apr 2012 10:18:51 +0200 + xtandempipeline (3.2.1-1) lucid; urgency=low * tubuline étayée package diff --git a/xtandempipeline/debian/control b/xtandempipeline/debian/control index b50f1ad50b95b4816d771237422c9848a0b02029..904a2d62a98dffbe63a5c4b37bdbc3c1b360ff50 100644 --- a/xtandempipeline/debian/control +++ b/xtandempipeline/debian/control @@ -6,7 +6,7 @@ Homepage: http://pappso.inra.fr/ DM-Upload-Allowed: yes Uploaders: Olivier Langella <olivier.langella@moulon.inra.fr> Standards-Version: 1.0 -Build-Depends: debhelper (>= 5), cmake (>= 2.6), ant (>=1.8), openjdk-6-jdk (>=1.6), libswt-gtk-3.5-java | libswt-gtk-3.6-java | libswt-gtk-3-java, libbatik-java (>=1.7), libswt-mozilla-gtk-3.5-jni | libswt-webkit-gtk-3.6-jni | libswt-webkit-gtk-3-jni, liblog4j1.2-java (>=1.2.15), libcommons-httpclient-java (>=3.1), libcommons-codec-java (>=1.4), libcommons-logging-java (>=1.1.1) +Build-Depends: debhelper (>= 5), cmake (>= 2.6), ant (>=1.7), openjdk-6-jdk (>=1.6), libswt-gtk-3.5-java | libswt-gtk-3.6-java | libswt-gtk-3-java, libbatik-java (>=1.7), libswt-mozilla-gtk-3.5-jni | libswt-webkit-gtk-3.6-jni | libswt-webkit-gtk-3-jni, liblog4j1.2-java (>=1.2.15), libcommons-httpclient-java (>=3.1), libcommons-codec-java (>=1.4), libcommons-logging-java (>=1.1.1) Package: xtandempipeline Architecture: all diff --git a/xtandempipeline/share/applications/xtandempipeline.desktop b/xtandempipeline/share/applications/xtandempipeline.desktop index 3e5834efca00930402fc513e05ee4fac6f1097fa..eebba4e1b3272a8440f9ab5e41d16a2e142cdb03 100644 --- a/xtandempipeline/share/applications/xtandempipeline.desktop +++ b/xtandempipeline/share/applications/xtandempipeline.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Xtandem pipeline 3.2.0 +Name=Xtandem pipeline 3.2.2 Categories=Education;Science;Math; Comment=loads and parses the xml results product by X!Tandem Comment[fr]=chargement et exploitation des résultats du logiciel X!Tandem diff --git a/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar b/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar index 9f1e43c58e8a88b3bb26354018d76c4cebbb9f69..9d30437ac6bdcbe9f29f5305c12eb5e364b4b459 100644 Binary files a/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar and b/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar differ