[med-svn] r19947 - trunk/packages/mgltools/vision/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-08-15 12:15:23 +0000 (Sat, 15 Aug 2015)
New Revision: 19947

Removed:
   trunk/packages/mgltools/vision/trunk/debian/pycompat
Modified:
   trunk/packages/mgltools/vision/trunk/debian/changelog
   trunk/packages/mgltools/vision/trunk/debian/rules
Log:
Fix image moving around, drop outdated pycompat


Modified: trunk/packages/mgltools/vision/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/vision/trunk/debian/changelog	2015-08-15 11:40:27 UTC (rev 19946)
+++ trunk/packages/mgltools/vision/trunk/debian/changelog	2015-08-15 12:15:23 UTC (rev 19947)
@@ -5,6 +5,7 @@
   * remove non-free lena.jpg from source
     Closes: #794855
   * debhelper 9
+  * Move images to /usr/share
 
  -- Andreas Tille <tille at debian.org>  Sat, 15 Aug 2015 10:33:41 +0200
 

Deleted: trunk/packages/mgltools/vision/trunk/debian/pycompat
===================================================================
--- trunk/packages/mgltools/vision/trunk/debian/pycompat	2015-08-15 11:40:27 UTC (rev 19946)
+++ trunk/packages/mgltools/vision/trunk/debian/pycompat	2015-08-15 12:15:23 UTC (rev 19947)
@@ -1 +0,0 @@
-2

Modified: trunk/packages/mgltools/vision/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/vision/trunk/debian/rules	2015-08-15 11:40:27 UTC (rev 19946)
+++ trunk/packages/mgltools/vision/trunk/debian/rules	2015-08-15 12:15:23 UTC (rev 19947)
@@ -10,6 +10,7 @@
 BRANCH=`cat debian/get-orig-source/current-branch`
 RCVERSION=`cat debian/get-orig-source/rc-version`
 SRC=VisionDIST
+DISTDIR:=/usr/lib/python2.7/dist-packages/Vision
 
 %:
 	dh $@ --with python2
@@ -19,12 +20,13 @@
 	dh_numpy
 	find debian -name "runVision" | xargs -r chmod +x
 	find debian -name *.jpg -o -name *.png -o -name *.pdb -o -name *.gif | xargs -r chmod 644
-	mkdir -p debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/Vision
+	mkdir -p debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)
 	for dir in Icons doc icons ; do \
-	    mv debian/$(DEBPKGNAME)/usr/lib/python*/dist-packages/Vision/$${dir} debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/Vision ; \
-	    ln -sf ../../../../../share/$(DEBPKGNAME)/$${dir} debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/Vision/$${dir} ; \
+	    mv debian/$(DEBPKGNAME)/$(DISTDIR)/$${dir} debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME) ; \
+	    ln -sf ../../../../share/$(DEBPKGNAME)/$${dir} debian/$(DEBPKGNAME)/$(DISTDIR)/$${dir} ; \
 	done
-	cp -a debian/lena-replacement/lena.jpg debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/Vision/doc/Examples
+	cp -a debian/lena-replacement/lena.jpg debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/doc/Examples
+	cp -a debian/lena-replacement/lena.jpg debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME)/doc/Examples/matplotlib/Data
 
 get-orig-source:
 	./debian/get-orig-source/get-orig-source $(SRC) $(BRANCH) $(RCVERSION)