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

[Andreas Tille]

Author: tille
Date: 2013-02-24 12:27:40 +0000 (Sun, 24 Feb 2013)
New Revision: 13081

Removed:
   trunk/packages/cellprofiler/trunk/debian/orig-tar.sh
Modified:
   trunk/packages/cellprofiler/trunk/debian/copyright
   trunk/packages/cellprofiler/trunk/debian/rules
   trunk/packages/cellprofiler/trunk/debian/watch
Log:
Apply changes to work together with new uscan available from
  git clone git://tille@git.debian.org/git/users/tille/devscripts.git
(and then use scripts/uscan.pl)


Modified: trunk/packages/cellprofiler/trunk/debian/copyright
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/copyright	2013-02-24 11:45:16 UTC (rev 13080)
+++ trunk/packages/cellprofiler/trunk/debian/copyright	2013-02-24 12:27:40 UTC (rev 13081)
@@ -1,6 +1,16 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cellprofiler
 Source: http://cellprofiler.org
+Files-Excluded:
+    contrib/asizeof.py
+    contrib/english.py
+    contrib/objgraph.py
+    contrib/mexLap.c
+    contrib/mexLap.h
+    contrib/LAP.pyx
+    contrib/tifffile.py
+    contrib/include
+    pymex
 
 Files: *
 Copyright: (c) 2003-2012 Massachusetts Institute of Technology

Deleted: trunk/packages/cellprofiler/trunk/debian/orig-tar.sh
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/orig-tar.sh	2013-02-24 11:45:16 UTC (rev 13080)
+++ trunk/packages/cellprofiler/trunk/debian/orig-tar.sh	2013-02-24 12:27:40 UTC (rev 13081)
@@ -1,27 +0,0 @@
-#!/bin/sh -ex
-
-# called by uscan with '--upstream-version' <version> <file>
-TAR=../cellprofiler_$2.dfsg.orig.tar.gz
-DIR=CellProfiler-*
-
-# 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
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi

Modified: trunk/packages/cellprofiler/trunk/debian/rules
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/rules	2013-02-24 11:45:16 UTC (rev 13080)
+++ trunk/packages/cellprofiler/trunk/debian/rules	2013-02-24 12:27:40 UTC (rev 13081)
@@ -13,5 +13,11 @@
 	find debian/ -name "*.jar" -exec chmod 644 {} + || true
 	find debian/ -name "*.png" -exec chmod 644 {} + || true
 
+# Remark: The following uscan command requires devscripts > 2.12.4 which is not
+#         yet released at the time of this package release.  The code can be obtained
+#         via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then use scripts/uscan.pl
 get-orig-source:
-	./debian/get-orig-source
+	mkdir -p ../tarballs
+	uscan --verbose --force-download  --destdir=../tarballs --repack-compression xz

Modified: trunk/packages/cellprofiler/trunk/debian/watch
===================================================================
--- trunk/packages/cellprofiler/trunk/debian/watch	2013-02-24 11:45:16 UTC (rev 13080)
+++ trunk/packages/cellprofiler/trunk/debian/watch	2013-02-24 12:27:40 UTC (rev 13081)
@@ -1,4 +1,5 @@
 version=3
 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
+
+# debian debian/orig-tar.sh