[med-svn] r8649 - trunk/packages/cellprofiler/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-11-22 15:12:24 +0000 (Tue, 22 Nov 2011)
New Revision: 8649

Added:
   trunk/packages/cellprofiler/trunk/debian/README.source
Modified:
   trunk/packages/cellprofiler/trunk/debian/changelog
   trunk/packages/cellprofiler/trunk/debian/control
   trunk/packages/cellprofiler/trunk/debian/copyright
   trunk/packages/cellprofiler/trunk/debian/get-orig-source
   trunk/packages/cellprofiler/trunk/debian/rules
Log:
fix a bunch of lintian warnings/errors

Added: trunk/packages/cellprofiler/trunk/debian/README.source
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/cellprofiler/trunk/debian/README.source	2011-11-22 15:12:24 UTC (rev 8649)
@@ -0,0 +1,8 @@
+CellProfiler setup.py is used for building the binary for Mac, but not for
+installation.
+The actual process for installing CellProfiler is to put it in the installation
+directory, and run
+
+	python CellProfiler.py --build-and-exit
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 12 Sep 2011 09:56:16 +0200

Modified: trunk/packages/cellprofiler/trunk/debian/changelog
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/changelog	2011-11-22 14:48:03 UTC (rev 8648)
+++ trunk/packages/cellprofiler/trunk/debian/changelog	2011-11-22 15:12:24 UTC (rev 8649)
@@ -2,8 +2,4 @@
 
   * Initial Debian Upload (Closes: #647995)
 
-  [ Thorsten Alteholz ]
-  * debian/get-orig-source: put orig.tar.gz in ../tarballs to allow
-    automatic build with svn-buildpackage
-
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 12 Sep 2011 09:56:16 +0200

Modified: trunk/packages/cellprofiler/trunk/debian/control
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/control	2011-11-22 14:48:03 UTC (rev 8648)
+++ trunk/packages/cellprofiler/trunk/debian/control	2011-11-22 15:12:24 UTC (rev 8649)
@@ -4,10 +4,9 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8)
-Build-Depends-Indep: python-nose (>= 1.0), cython, python-mysqldb, python-numpy,
+Build-Depends: debhelper (>= 8), python-nose (>= 1.0), cython, python-mysqldb, python-numpy,
  python-scipy, python-setuptools, python-matplotlib, python-wxgtk2.8,
- python-decorator, python-dev (>= 2.6.6-3~), python-libtiff, tifffile, default-jdk
+ python-decorator, python-dev (>= 2.6.6-3~), python-libtiff, default-jdk
 Standards-Version: 3.9.2
 X-Python-Version: 2.7
 Homepage: http://cellprofiler.org
@@ -16,12 +15,12 @@
 
 
 Package: cellprofiler
-Architecture: all
+Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: tifffile
 Provides: ${python:Provides}
 Description: quantitatively measure phenotypes from images automatically
  CellProfiler is cell image analysis software designed to enable
  biologists without training in computer vision or programming to
  quantitatively measure phenotypes from thousands of images
  automatically.
-

Modified: trunk/packages/cellprofiler/trunk/debian/copyright
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/copyright	2011-11-22 14:48:03 UTC (rev 8648)
+++ trunk/packages/cellprofiler/trunk/debian/copyright	2011-11-22 15:12:24 UTC (rev 8649)
@@ -5,7 +5,13 @@
 Files: *
 Copyright: 2003-2009 Massachusetts Institute of Technology
 License: GPL-2
+ CellProfiler is licensed under the GNU General Public License version
+ 2.  See the file COPYING for the terms of the GNU GPL license.
 
+On Debian systems, the complete text of the GNU General Public
+License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
+
+
 Files: CellProfiler/cpmath, CellProfiler/utilities, bioformats
 Copyright: © C0203-2009 Massachusetts Institute of Technology
            © C2009-2010 Broad Institute

Modified: trunk/packages/cellprofiler/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/get-orig-source	2011-11-22 14:48:03 UTC (rev 8648)
+++ trunk/packages/cellprofiler/trunk/debian/get-orig-source	2011-11-22 15:12:24 UTC (rev 8649)
@@ -35,6 +35,8 @@
 rm ${FOLDER}/contrib/tifffile.py
 # remove fake C99/stdint.h for M$ compiler:
 rm -rf ${FOLDER}/contrib/include
+# fix exe bit
+find ${FOLDER} -name *.py -exec chmod -x {} \;
 
 GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
 rm -rf ${FOLDER}

Modified: trunk/packages/cellprofiler/trunk/debian/rules
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/rules	2011-11-22 14:48:03 UTC (rev 8648)
+++ trunk/packages/cellprofiler/trunk/debian/rules	2011-11-22 15:12:24 UTC (rev 8649)
@@ -3,10 +3,6 @@
 %:
 	dh $@ --with python2
 
-#We should have noted in the README that CellProfiler setup.py is used
-#for building the binary for Mac, but not for installation.
-#The actual process for installing CellProfiler is to put it in the
-#installation directory, and run
 override_dh_auto_configure:
 	python CellProfiler.py --build-and-exit