[med-svn] r9149 - in trunk/packages/dicompyler/trunk/debian: . bin patches
Andreas Tille
tille at alioth.debian.org
Tue Jan 3 17:50:39 UTC 2012
Author: tille
Date: 2012-01-03 17:50:39 +0000 (Tue, 03 Jan 2012)
New Revision: 9149
Added:
trunk/packages/dicompyler/trunk/debian/patches/
trunk/packages/dicompyler/trunk/debian/patches/do_not_download_distribute.patch
trunk/packages/dicompyler/trunk/debian/patches/series
trunk/packages/dicompyler/trunk/debian/pydist-overrides
Modified:
trunk/packages/dicompyler/trunk/debian/bin/dicompyler
trunk/packages/dicompyler/trunk/debian/changelog
trunk/packages/dicompyler/trunk/debian/control
trunk/packages/dicompyler/trunk/debian/docs
trunk/packages/dicompyler/trunk/debian/install
trunk/packages/dicompyler/trunk/debian/rules
Log:
Further adaptations to new upstream version
Modified: trunk/packages/dicompyler/trunk/debian/bin/dicompyler
===================================================================
--- trunk/packages/dicompyler/trunk/debian/bin/dicompyler 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/bin/dicompyler 2012-01-03 17:50:39 UTC (rev 9149)
@@ -4,10 +4,10 @@
NAME=`basename $0`
OPTIONS=$@
-# packages which install the dicompyler python modules into a path not
-# already accessible for imports via sys.path (say, /usr/share/dicompyler/)
+# packages which install the GNUmed python modules into a path not
+# already accessible for imports via sys.path (say, /usr/share/gnumed/)
# may need to adjust PYTHONPATH appropriately here
-export PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}/usr/share/${NAME}/"
-export PATH="${PATH}:/usr/share/${NAME}"
+export PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}/usr/share/pyshared/${NAME}/"
+export PATH="${PATH}:/usr/share/pyshared/${NAME}"
python -m main ${OPTIONS}
Modified: trunk/packages/dicompyler/trunk/debian/changelog
===================================================================
--- trunk/packages/dicompyler/trunk/debian/changelog 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/changelog 2012-01-03 17:50:39 UTC (rev 9149)
@@ -6,6 +6,11 @@
* debian/docs: Adapted to new directory layout
* debian/lintian-overrides: license.txt file is referenced from
the code so it needs to be installed
+ * debian/control: Moved now available python-dicom to Depends
+ * debian/bin/dicompyler: Adapt PATH
+ * debian/patches/do_not_download_distribute.patch: Prevent setup
+ from downloading distribute
+ * debian/rules: No need to fix permissions any more
-- Andreas Tille <tille at debian.org> Tue, 03 Jan 2012 17:15:29 +0100
Modified: trunk/packages/dicompyler/trunk/debian/control
===================================================================
--- trunk/packages/dicompyler/trunk/debian/control 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/control 2012-01-03 17:50:39 UTC (rev 9149)
@@ -13,10 +13,10 @@
Package: dicompyler
Architecture: all
-X-Only-in-experimental: python-dicom (>= 0.9.5~rc1)
Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8 (>= 2.8.8.1),
python-imaging (>= 1.1.7), python-dicom, python-numpy (>= 1.2.1),
- python-matplotlib (>= 0.99), python-sqlalchemy (>= 0.5.4), python-elixir (>= 0.6.1)
+ python-matplotlib (>= 0.99), python-sqlalchemy (>= 0.5.4), python-elixir (>= 0.6.1),
+ python-dicom (>= 0.9.5~rc1)
Description: radiation therapy research platform
Dicompyler is an extensible, fully open source radiation therapy
research platform based on the DICOM standard. It also functions as a
Modified: trunk/packages/dicompyler/trunk/debian/docs
===================================================================
--- trunk/packages/dicompyler/trunk/debian/docs 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/docs 2012-01-03 17:50:39 UTC (rev 9149)
@@ -1,2 +1 @@
README.txt
-dicompyler/credits.txt
Modified: trunk/packages/dicompyler/trunk/debian/install
===================================================================
--- trunk/packages/dicompyler/trunk/debian/install 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/install 2012-01-03 17:50:39 UTC (rev 9149)
@@ -1,6 +1,3 @@
-dicompyler/*.py usr/share/dicompyler
-dicompyler/baseplugins usr/share/dicompyler
-dicompyler/resources usr/share/dicompyler
debian/bin/* usr/bin
debian/*.xpm usr/share/pixmaps
debian/*.desktop usr/share/applications
Added: trunk/packages/dicompyler/trunk/debian/patches/do_not_download_distribute.patch
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/do_not_download_distribute.patch (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/patches/do_not_download_distribute.patch 2012-01-03 17:50:39 UTC (rev 9149)
@@ -0,0 +1,27 @@
+--- dicompyler-0.4.1-1.orig/distribute_setup.py
++++ dicompyler-0.4.1-1/distribute_setup.py
+@@ -117,15 +117,16 @@
+
+
+ def _do_download(version, download_base, to_dir, download_delay):
+- egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+- % (version, sys.version_info[0], sys.version_info[1]))
+- if not os.path.exists(egg):
+- tarball = download_setuptools(version, download_base,
+- to_dir, download_delay)
+- _build_egg(egg, tarball, to_dir)
+- sys.path.insert(0, egg)
++ print "There is no need to download setuptools!"
++ #egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
++ # % (version, sys.version_info[0], sys.version_info[1]))
++ #if not os.path.exists(egg):
++ # tarball = download_setuptools(version, download_base,
++ # to_dir, download_delay)
++ # _build_egg(egg, tarball, to_dir)
++ #sys.path.insert(0, egg)
+ import setuptools
+- setuptools.bootstrap_install_from = egg
++ #setuptools.bootstrap_install_from = egg
+
+
+ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
Added: trunk/packages/dicompyler/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/series (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/patches/series 2012-01-03 17:50:39 UTC (rev 9149)
@@ -0,0 +1 @@
+do_not_download_distribute.patch
Added: trunk/packages/dicompyler/trunk/debian/pydist-overrides
===================================================================
--- trunk/packages/dicompyler/trunk/debian/pydist-overrides (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/pydist-overrides 2012-01-03 17:50:39 UTC (rev 9149)
@@ -0,0 +1 @@
+pil python-imaging
Modified: trunk/packages/dicompyler/trunk/debian/rules
===================================================================
--- trunk/packages/dicompyler/trunk/debian/rules 2012-01-03 16:43:54 UTC (rev 9148)
+++ trunk/packages/dicompyler/trunk/debian/rules 2012-01-03 17:50:39 UTC (rev 9149)
@@ -9,15 +9,5 @@
%:
dh $@ --with python2
-override_dh_auto_clean:
- # somehow this target does:
- # Downloading http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz
- # which is not wanted at all
-
-override_dh_install:
- dh_install
- # fix some permissions
- find debian -name __init__.py -o -name wxmpl.py -o -name dvhdoses.py | xargs -r chmod a-x
-
get-orig-source:
uscan --verbose --force-download --repack
More information about the debian-med-commit
mailing list