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

[Andreas Tille]

Author: tille
Date: 2014-09-10 13:23:45 +0000 (Wed, 10 Sep 2014)
New Revision: 17976

Added:
   trunk/packages/dicompyler/trunk/debian/bin/
   trunk/packages/dicompyler/trunk/debian/bin/dicompyler
Modified:
   trunk/packages/dicompyler/trunk/debian/changelog
   trunk/packages/dicompyler/trunk/debian/install
   trunk/packages/dicompyler/trunk/debian/rules
Log:
We really need a wrapper to set PYTHONPATH (strange - but I did not found a better clue)


Added: trunk/packages/dicompyler/trunk/debian/bin/dicompyler
===================================================================
--- trunk/packages/dicompyler/trunk/debian/bin/dicompyler	                        (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/bin/dicompyler	2014-09-10 13:23:45 UTC (rev 17976)
@@ -0,0 +1,6 @@
+#!/bin/bash
+# set -x
+
+NAME=`basename $0`
+
+PYTHONPATH="${PYTHONPATH:+$PYTHONPATH:}/usr/share" python /usr/share/${NAME}/dicompyler_app.py $@


Property changes on: trunk/packages/dicompyler/trunk/debian/bin/dicompyler
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/packages/dicompyler/trunk/debian/changelog
===================================================================
--- trunk/packages/dicompyler/trunk/debian/changelog	2014-09-10 12:55:30 UTC (rev 17975)
+++ trunk/packages/dicompyler/trunk/debian/changelog	2014-09-10 13:23:45 UTC (rev 17976)
@@ -4,7 +4,7 @@
     Closes: #759056
   * Use buildsystem=pybuild
   * Adapt to new installation location suggested for Python applications
-  * Use provided starter instead of own shellscript
+  * Fix wrapper
   * Provide properly sized icon in proper dir
 
  -- Andreas Tille <tille at debian.org>  Sat, 06 Sep 2014 15:57:29 +0200

Modified: trunk/packages/dicompyler/trunk/debian/install
===================================================================
--- trunk/packages/dicompyler/trunk/debian/install	2014-09-10 12:55:30 UTC (rev 17975)
+++ trunk/packages/dicompyler/trunk/debian/install	2014-09-10 13:23:45 UTC (rev 17976)
@@ -1,3 +1,5 @@
+debian/bin/*		usr/bin
 debian/*.xpm		usr/share/pixmaps
 debian/*.desktop	usr/share/applications
 debian/dicompyler.png	usr/share/icons/hicolor/128x128/apps/
+dicompyler_app.py	usr/share/dicompyler

Modified: trunk/packages/dicompyler/trunk/debian/rules
===================================================================
--- trunk/packages/dicompyler/trunk/debian/rules	2014-09-10 12:55:30 UTC (rev 17975)
+++ trunk/packages/dicompyler/trunk/debian/rules	2014-09-10 13:23:45 UTC (rev 17976)
@@ -12,11 +12,9 @@
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_install:
-	dh_install
 	mkdir -p debian/$(DEBPKGNAME)/usr/share
 	mv debian/$(DEBPKGNAME)/usr/lib/python*/dist-packages/$(DEBPKGNAME) debian/$(DEBPKGNAME)/usr/share
-	mkdir -p debian/$(DEBPKGNAME)/usr/bin
-	cp -a dicompyler_app.py debian/$(DEBPKGNAME)/usr/bin/$(DEBPKGNAME)
+	dh_install
 	rm -rf debian/$(DEBPKGNAME)/usr/lib
 
 override_dh_fixperms: