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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-05 15:17:29 +0000 (Mon, 05 Dec 2011)
New Revision: 8769

Modified:
   trunk/packages/cellprofiler/trunk/debian/copyright
   trunk/packages/cellprofiler/trunk/debian/orig-tar.sh
   trunk/packages/cellprofiler/trunk/debian/watch
Log:
ready to roll

Modified: trunk/packages/cellprofiler/trunk/debian/copyright
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/copyright	2011-12-05 14:31:24 UTC (rev 8768)
+++ trunk/packages/cellprofiler/trunk/debian/copyright	2011-12-05 15:17:29 UTC (rev 8769)
@@ -3,18 +3,16 @@
 Source: http://cellprofiler.org
 
 Files: *
-Copyright: 2003-2009 Massachusetts Institute of Technology
+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
+Comment: 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
+Copyright: © 2003-2009 Massachusetts Institute of Technology
+           © 2009-2010 Broad Institute
 Licence: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:

Modified: trunk/packages/cellprofiler/trunk/debian/orig-tar.sh
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/orig-tar.sh	2011-12-05 14:31:24 UTC (rev 8768)
+++ trunk/packages/cellprofiler/trunk/debian/orig-tar.sh	2011-12-05 15:17:29 UTC (rev 8769)
@@ -6,6 +6,16 @@
 
 # clean up the upstream tarball
 tar -zxvf $3
+find $DIR -name *.py -exec chmod -x {} \;
+# license are not clear, remove them until fixed upstream
+rm $DIR/contrib/asizeof.py
+rm $DIR/contrib/english.py
+rm $DIR/contrib/objgraph.py
+rm $DIR/contrib/mexLap.c
+rm $DIR/contrib/mexLap.h
+rm $DIR/contrib/LAP.pyx
+# debian package: tifffile:
+rm $DIR/contrib/tifffile.py
 tar -czf $TAR --exclude '*/contrib/include' --exclude '*/pymex/*' $DIR
 rm -rf $DIR $3
 

Modified: trunk/packages/cellprofiler/trunk/debian/watch
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/watch	2011-12-05 14:31:24 UTC (rev 8768)
+++ trunk/packages/cellprofiler/trunk/debian/watch	2011-12-05 15:17:29 UTC (rev 8769)
@@ -1,4 +1,4 @@
 version=3
-opts="dversionmangle=s/2.0~svn(\d+)\.dfsg/$1/" \
-http://githubredir.debian.net/github/CellProfiler/CellProfiler/ release_svn_(.*).tar.gz \
+opts="dversionmangle=s/\.dfsg//,uversionmangle=s/svn_/2.0~svn/" \
+http://githubredir.debian.net/github/CellProfiler/CellProfiler/ release_(.*).tar.gz \
 debian debian/orig-tar.sh