summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-08-02 00:42:18 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-08-02 00:42:18 +0900
commited3904e5ed6b37c34d03c182df0534c2ae9f5fb1 (patch)
tree158a1146e9f71720931f2051959435a7dd5c4687
parent979a963690b573ae42f0fc43c356de3136a95438 (diff)
downloadtde-packaging-ed3904e5ed6b37c34d03c182df0534c2ae9f5fb1.tar.gz
tde-packaging-ed3904e5ed6b37c34d03c182df0534c2ae9f5fb1.zip
Fixed location of installed Python scripts in Debian/Ubuntu distros. This should resolve bug 1146.
-rwxr-xr-xdebian/lenny/applications/fusion-icon/debian/rules9
-rwxr-xr-xdebian/squeeze/applications/fusion-icon/debian/rules9
-rwxr-xr-xubuntu/maverick/applications/fusion-icon/debian/rules9
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules
index 3c129a596..23683eab2 100755
--- a/debian/lenny/applications/fusion-icon/debian/rules
+++ b/debian/lenny/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
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 88040a563..3fe3dd8ea 100755
--- a/debian/squeeze/applications/fusion-icon/debian/rules
+++ b/debian/squeeze/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
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 88040a563..3fe3dd8ea 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/applications/fusion-icon/debian/rules
@@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
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