deb control + cpack changes

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2107 e4b6dbb4-9209-464b-83f7-6257456c460c

masschroq/CMakeLists.txt

@@ -82,7 +82,7 @@ SET (MASSCHROQ_XML_VERSION "1.0")
 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
 SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
 SET(CPACK_OUTPUT_CONFIG_FILE "./CPackConfig.cmake")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE ${masschroq_SOURCE_DIR}/COPYING)
+#SET(CPACK_PACKAGE_DESCRIPTION_FILE ${masschroq_SOURCE_DIR}/COPYING)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MassChroQ : Mass Chromatogram Quantification")
 SET(CPACK_PACKAGE_EXECUTABLES "masschroq")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "masschroq-${MASSCHROQ_VERSION}")
@@ -96,8 +96,8 @@ SET(CPACK_PACKAGE_VERSION ${MASSCHROQ_VERSION})
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_RESOURCE_FILE_LICENSE ${masschroq_SOURCE_DIR}/COPYING)
-SET(CPACK_RESOURCE_FILE_README ${masschroq_SOURCE_DIR}/README)
+SET(CPACK_RESOURCE_FILE_LICENSE ${masschroq_SOURCE_DIR}/debian/copyright)
+#SET(CPACK_RESOURCE_FILE_README ${masschroq_SOURCE_DIR}/README)
 SET(CPACK_RESOURCE_FILE_WELCOME ${masschroq_SOURCE_DIR}/INSTALL)
 SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
 SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "./CPackSourceConfig.cmake")

masschroq/LICENCE

-MassChroQ: Mass Chromatogram Quantification software.
-Copyright (C) 2010-2011 Benoit Valot, Olivier Langella, Edlira Nano, Michel Zivy.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

masschroq/debian/control

@@ -5,13 +5,13 @@ Maintainer: Olivier Langella <olivier.langella@moulon.inra.fr>
 DM-Upload-Allowed: yes
 Uploaders: Olivier Langella <olivier.langella@moulon.inra.fr>
 Standards-Version: 3.9.1.0
-Build-Depends: debhelper (>= 5), cmake (>= 2.6), libx11-dev, libc6-dev,libqt4-dev (>= 4.5.2)
+Build-Depends: debhelper (>= 5), cmake (>= 2.6), libx11-dev, libc6-dev, libqt4-dev (>= 4.5.2)
 Build-Conflicts: qt3-dev-tools
 Homepage: http://pappso.inra.fr/bioinfo/masschroq/
 
 Package: masschroq
 Architecture: any
-Depends: ${shlibs:Depends}, libqt4 (>= 4.5.2), libqtcore4 (>= 4.5.2), libqt4-network (>= 4.5.2), libqt4-xmlpatterns (>= 4.5.2), libqt4-xml (>= 4.5.2),libqt4-svg (>= 4.5.2)
+Depends: ${shlibs:Depends}, libqtcore4 (>= 4.5.2), libqt4-network (>= 4.5.2), libqt4-xmlpatterns (>= 4.5.2), libqt4-xml (>= 4.5.2)
 Description: Mass Chromatogram Quantification
  MassChroQ (Mass Chromatogram Quantification) software performs quantification 
  of data  obtained from LC-MS (Liquid Chromatography - Mass Spectrometry) techniques. 

masschroq/win32/LICENCE

+MassChroQ: Mass Chromatogram Quantification software.
+Copyright (C) 2010-2011 Benoit Valot, Olivier Langella, Edlira Nano, Michel Zivy.
+Licence: GPL-3+	   
+    	 This program is free software: you can redistribute it and/or modify
+    	 it under the terms of the GNU General Public License as published by
+    	 the Free Software Foundation, either version 3 of the License, or
+    	 (at your option) any later version.
+    	 This program is distributed in the hope that it will be useful,
+    	 but WITHOUT ANY WARRANTY; without even the implied warranty of
+    	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    	 GNU General Public License for more details.
+    	 You should have received a copy of the GNU General Public License
+    	 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+The OBI-Warp alignment library in MassChroQ is copyright The University 
+of Texas at Austin("U.T. Austin") under the following licence: 
+   	
+	 Software by John T. Prince under the direction of Edward M. Marcotte. 
+	 By using this software the USER indicates that he or she has read,
+	 understood and will comply with the following:
+	 U. T. Austin hereby grants USER permission to use, copy, modify,
+	 merge, publish, distribute, sublicense, and/or sell copies of this
+	 software and its documentation for any purpose and without fee,
+	 provided that a full copy of this notice is included with the software
+	 and its documentation.
+	 Title to copyright to this software and its associated documentation
+	 shall at all times remain with U. T. Austin. No right is granted to
+	 use in advertising, publicity or otherwise any trademark, service
+	 mark, or the name of U. T. Austin.
+	 This software and any associated documentation are provided "as is,"
+	 and U. T. AUSTIN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESSED OR
+	 IMPLIED, INCLUDING THOSE OF MERCHANTABILITY OR FITNESS FOR A
+	 PARTICULAR PURPOSE, OR THAT USE OF THE SOFTWARE, MODIFICATIONS, OR
+	 ASSOCIATED DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS,
+	 TRADEMARKS OR OTHER INTELLECTUAL PROPERTY RIGHTS OF A THIRD
+	 PARTY. U. T. Austin, The University of Texas System, its Regents,
+	 officers, and employees shall not be liable under any circumstances
+	 for any direct, indirect, special, incidental, or consequential
+	 damages with respect to any claim by USER or any third party on
+	 account of or arising from the use, or inability to use, this software
+	 or its associated documentation, even if U. T. Austin has been advised
+	 of the possibility of those damages.
+	 Submit software operation questions to: Edward M. Marcotte, Department
+	 of Chemistry and Biochemistry, U. T. Austin, Austin, Texas 78712.

masschroq/win32/masschroq_innosetup-1.0.iss

@@ -39,7 +39,7 @@ AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
-LicenseFile=C:\developpement\masschroq\LICENCE
+LicenseFile=C:\developpement\masschroq\win32\LICENCE
 OutputDir=C:\developpement\masschroq\win32
 OutputBaseFilename=masschroq_setup
 ; set this to true if you want to perform file associations in the registry