[med-svn] r17938 - in trunk/packages/dicompyler/trunk/debian: . bin

[Andreas Tille]

Author: tille
Date: 2014-09-03 22:23:55 +0000 (Wed, 03 Sep 2014)
New Revision: 17938

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/lintian-overrides
   trunk/packages/dicompyler/trunk/debian/rules
Log:
Adapt to new installation location suggested for Python applications


Modified: trunk/packages/dicompyler/trunk/debian/bin/dicompyler
===================================================================
--- trunk/packages/dicompyler/trunk/debian/bin/dicompyler	2014-09-03 10:20:57 UTC (rev 17937)
+++ trunk/packages/dicompyler/trunk/debian/bin/dicompyler	2014-09-03 22:23:55 UTC (rev 17938)
@@ -7,7 +7,7 @@
 # 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/pyshared/${NAME}/"
-export PATH="${PATH}:/usr/share/pyshared/${NAME}"
+export PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}/usr/share/${NAME}/"
+export PATH="${PATH}:/usr/share/${NAME}"
 
 python -m main ${OPTIONS}

Modified: trunk/packages/dicompyler/trunk/debian/changelog
===================================================================
--- trunk/packages/dicompyler/trunk/debian/changelog	2014-09-03 10:20:57 UTC (rev 17937)
+++ trunk/packages/dicompyler/trunk/debian/changelog	2014-09-03 22:23:55 UTC (rev 17938)
@@ -3,6 +3,7 @@
   * Adapt to wxpython3.0 using wx-migration-tools
     Closes: #759056
   * Use buildsystem=pybuild
+  * Adapt to new installation location suggested for Python applications
 
  -- Andreas Tille <tille at debian.org>  Mon, 25 Aug 2014 10:08:49 +0200
 

Modified: trunk/packages/dicompyler/trunk/debian/control
===================================================================
--- trunk/packages/dicompyler/trunk/debian/control	2014-09-03 10:20:57 UTC (rev 17937)
+++ trunk/packages/dicompyler/trunk/debian/control	2014-09-03 22:23:55 UTC (rev 17938)
@@ -5,6 +5,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                python,
+               dh-python,
                python-setuptools
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicompyler/trunk/

Modified: trunk/packages/dicompyler/trunk/debian/lintian-overrides
===================================================================
--- trunk/packages/dicompyler/trunk/debian/lintian-overrides	2014-09-03 10:20:57 UTC (rev 17937)
+++ trunk/packages/dicompyler/trunk/debian/lintian-overrides	2014-09-03 22:23:55 UTC (rev 17938)
@@ -1,2 +1,2 @@
 # This license file is referenced inside the code so we need to leave it were it is
-dicompyler: extra-license-file usr/share/pyshared/dicompyler/license.txt
+dicompyler: extra-license-file usr/share/dicompyler/license.txt

Modified: trunk/packages/dicompyler/trunk/debian/rules
===================================================================
--- trunk/packages/dicompyler/trunk/debian/rules	2014-09-03 10:20:57 UTC (rev 17937)
+++ trunk/packages/dicompyler/trunk/debian/rules	2014-09-03 22:23:55 UTC (rev 17938)
@@ -8,15 +8,19 @@
 
 DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
-export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/$(DEBPKGNAME) --install-scripts=/usr/share/$(DEBPKGNAME)
-
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_install:
 	dh_install
-	# fix some permissions
+	mkdir -p debian/$(DEBPKGNAME)/usr/share
+	mv debian/$(DEBPKGNAME)/usr/lib/python*/dist-packages/$(DEBPKGNAME) debian/$(DEBPKGNAME)/usr/share
+	rm -rf debian/$(DEBPKGNAME)/usr/lib
+
+override_dh_fixperms:
+	dh_fixperms
 	find debian -name __init__.py | xargs -r chmod a-x
+	find debian -name "*.png" | xargs -r chmod a-x
 
 get-orig-source:
 	uscan --verbose --force-download --repack