Branch: master

ed3904e5 2014-08-01 10:42:18 Michele Calgaro
Fixed location of installed Python scripts in Debian/Ubuntu distros. This should resolve bug 1146.
M debian/lenny/applications/fusion-icon/debian/rules
M debian/squeeze/applications/fusion-icon/debian/rules
M ubuntu/maverick/applications/fusion-icon/debian/rules
diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules
index 3c129a5..23683ea 100755
--- a/debian/lenny/applications/fusion-icon/debian/rules
+++ b/debian/lenny/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@
 	mkdir -p debian/fusion-icon-trinity/usr/local/lib
 	cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
 	rm -rf debian/fusion-icon-trinity/usr/local
+	mkdir -p debian/fusion-icon-trinity/temp
+	mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
 	dh_pysupport -pfusion-icon-trinity
+	### 
+	# Must be done after invoking dh_pysupport, otherwise python scripts will
+	# end up in /usr/share/pyshare instead of dist-packages
+	mkdir -p debian/fusion-icon-trinity/usr
+	mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
+	rm -rf debian/fusion-icon-trinity/temp
+	###
 	dh_icons
diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules
index 88040a5..3fe3dd8 100755
--- a/debian/squeeze/applications/fusion-icon/debian/rules
+++ b/debian/squeeze/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@
 	mkdir -p debian/fusion-icon-trinity/usr/local/lib
 	cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
 	rm -rf debian/fusion-icon-trinity/usr/local
+	mkdir -p debian/fusion-icon-trinity/temp
+	mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
 	dh_pysupport -pfusion-icon-trinity
+	### 
+	# Must be done after invoking dh_pysupport, otherwise python scripts will
+	# end up in /usr/share/pyshare instead of dist-packages
+	mkdir -p debian/fusion-icon-trinity/usr
+	mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
+	rm -rf debian/fusion-icon-trinity/temp
+	###
 	dh_icons
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules
index 88040a5..3fe3dd8 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@
 	mkdir -p debian/fusion-icon-trinity/usr/local/lib
 	cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
 	rm -rf debian/fusion-icon-trinity/usr/local
+	mkdir -p debian/fusion-icon-trinity/temp
+	mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
 	mkdir -p debian/fusion-icon-trinity/opt/trinity
 	cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
 	rm -rf debian/fusion-icon-trinity/usr
 	dh_pysupport -pfusion-icon-trinity
+	### 
+	# Must be done after invoking dh_pysupport, otherwise python scripts will
+	# end up in /usr/share/pyshare instead of dist-packages
+	mkdir -p debian/fusion-icon-trinity/usr
+	mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
+	rm -rf debian/fusion-icon-trinity/temp
+	###
 	dh_icons