From 2d52a82a6995133cca3822526cba2be7f1f44c77 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Mon, 14 Dec 2009 15:17:28 +0000 Subject: [PATCH] Rely on system to find the library vs. hard coding the path. --- debian/changelog | 6 ++++++ usr/lib/linuxmint/mintMenu/compile.pyc | Bin 189 -> 189 bytes usr/lib/linuxmint/mintMenu/mintMenu.py | 3 +-- usr/lib/linuxmint/mintMenu/mintMenu.pyc | Bin 29671 -> 29610 bytes usr/lib/linuxmint/mintMenu/mintMenuConfig.pyc | Bin 19581 -> 19581 bytes usr/lib/linuxmint/mintMenu/mintRemove.pyc | Bin 5842 -> 5842 bytes .../linuxmint/mintMenu/plugins/__init__.pyc | Bin 108 -> 108 bytes .../mintMenu/plugins/applications.pyc | Bin 39485 -> 39669 bytes .../mintMenu/plugins/easybuttons.pyc | Bin 18652 -> 18652 bytes .../linuxmint/mintMenu/plugins/easyfiles.pyc | Bin 465 -> 465 bytes .../linuxmint/mintMenu/plugins/easygconf.pyc | Bin 3895 -> 3895 bytes .../linuxmint/mintMenu/plugins/execute.pyc | Bin 1248 -> 1248 bytes .../mintMenu/plugins/filemonitor.pyc | Bin 4307 -> 4307 bytes usr/lib/linuxmint/mintMenu/plugins/places.pyc | Bin 8813 -> 8813 bytes usr/lib/linuxmint/mintMenu/plugins/recent.pyc | Bin 7642 -> 7642 bytes .../mintMenu/plugins/system_management.pyc | Bin 7218 -> 7218 bytes 16 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 738ad4b..24a3ad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mintmenu (4.9.2) helena; urgency=low + + * Fixed: https://bugs.launchpad.net/mintmenu/+bug/490174 + + -- Clement Lefebvre Mon, 14 Dec 2009 15:14:00 +0000 + mintmenu (4.9.1) helena; urgency=low * Split Others, Administration and System tools categories (if we do it again we have to patch Alacarte to reflect this) diff --git a/usr/lib/linuxmint/mintMenu/compile.pyc b/usr/lib/linuxmint/mintMenu/compile.pyc index 1517a06279639d86246723054941e7e725d3566d..27fb234f50df15876c75ed0ca23addb39f6b2d25 100644 GIT binary patch delta 15 XcmdnXxR;Ur;wN6N>Px~C*|z}zFgpee delta 15 XcmdnXxR;Ur;wN6NiR;)VvTp+bFV_X} diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index b8015d7..25812e3 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -22,8 +22,7 @@ except Exception, e: global mbindkey # Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency) try: - sys.path.append('/usr/lib/pyshared/python2.6/deskbar/core/keybinder') - from _keybinder import tomboy_keybinder_bind as bind_key + from deskbar.core.keybinder import tomboy_keybinder_bind as bind_key except Exception, cause: print "*********** Keybind Driver Load Failure **************" print "Error Report : ", str(cause) diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.pyc b/usr/lib/linuxmint/mintMenu/mintMenu.pyc index bec86848f9e73f337213ad0eae5a4b81043bed0b..432a21d080dd90d36ca12ba1c0eab82e22a59d3e 100644 GIT binary patch delta 1009 zcmX|ATWl0n82-MQU3%NL+wFF@+ikZuTd9S`7Eoy`)EM0+1W5z|2LX3`hC1EarClDZ zw}LD9q*ae-j2L4zgm^*pywLDq?1MyOYJ4EXfMTd*I=~`+v4QRcmCV_|M&gL z}rgbBhv)Z zssn`=i6OB92|EP44moOf+yHk?-BbLYNQYsCVTa+=LzK7`Rs?ngP6I?KL>WXmM8)#S ztpMFz6cstR6KnOvM)@Lx(@n)fA9A|89fPPWwrYm$fztw~^@h;~8*tj)h7mo?op%#N z6|9b8LYH>lD7_iBPF1@tbs23RoRx68ApAw&)n9}3Eg0*DHQlYn>OcVLRTx_hYxR;} zi*y{@MG*EH>?cGWo&_}b2d!Hn^iGzd;s2vO5cRHO^+H67##-3xmN{z{q5-1@GBujc zk_;0O5yhySHC9zMFY(*}ryrtGUNS~vO|ZRi2H@y@>#gX0^djfg+=y)}TV&DR~cv@av zcb1>4x7QDmU&z93*LYd|aC;efRTl18WI--$nBs48sP9w$DNFmmS3q4uvshI zD(~KMg1cp5%TexC6Zf@}NhP-)^Ke9UZJ#G!P(MGgo;;@7cD_%(r51KwF!-T5vAcx) zTAg}mEqPvD+0$U~vb?@;hQF)lAFeVq#p9_-`9`Wtg@->PtJFDhhWtw&+Mj1YJ~DEM zA@$QpJsFXP^CR13-kD;zN{;R@8JA}s{fw4;d|a_Z#xrNRM;0=#G9?cm_%3iTq<=tR zXVa~_ z=REg)r+`8Mfp70rmY=>H~0_v!pFCkc$jg%*=qf2!R@(kS5tBQe@lvmY_CK6S}QXw+z zMbzQ@%Ie}A%~mm=YG(CYL!z2uYyTf`C1)KO>dI-ARADeG$Xrim3yGSdZQ-w_WGhW< zpxE?=WkOt(Y@>;GinTA>Zc1*Xr$ikYIvoKC54}Vd_NQZ;NO;LmUM8anou?Pu& zQRyIK^9p8#LIh}BqjZgeqn<;JVI!YtpmBaxYpV(^C5((r*lZQp!O801ah!*oOE@7rYm&gra=x|}V7}t|7;nf)H-K}Tsk@Gg zJn0T{rS}n@^9_2 zpX$ot4@UQ=_>-@7|A4>vOwTVGX>w*;58#kjw}$}_|Fq*r1o@NRvk1$foerQ!j_fLR zU^|<8X8Cxuj1heiy>dG0v}2uoWv`n13I1o_TR6n?kDkP^Y<(;Q#O1!nU$bLO{ycCU zn3WgzZvp1y(t&q@^YYZ-_ZlwA;h|FC8<{xN0emOVJmc4Ji?0mN;*Q+&Y?Y=U?vH2i zxBMdhAy6%6#7DqA?mAL{i$jSSc;$seJ>chsv0u^5=gl12q<{Q?4LVOfcMU__k&;-; zh13EL^L%;^quf1t)7c+X^z^S*;%K=N!`w2JtXpOInk*5v#H`}6e~pw=F96T8o^64X I4`v7c1utPx~K*-wiB06t9y*#H0l delta 16 Ycmcbldr6o5;wN6NiR;)lvY!?M06oqIz5oCK diff --git a/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc b/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc index e411138a9517b42057664afaec2a4c57f7df34fd..6a56540a677bdb5a49b838bee157b1f9e4ddd8d2 100644 GIT binary patch delta 13 Ucmd1FVZZo^m#g}c@I>}h041&k7XSbN delta 13 Ucmd1FVZZo^muuoWwu$Vi03}KU`~Uy| diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.pyc b/usr/lib/linuxmint/mintMenu/plugins/applications.pyc index d39a78d51fc6d5dba5234ff2059aad302d408664..ae240576631afa7655b054b97f2e6dbab5fcc775 100644 GIT binary patch delta 993 zcmY*XziSjx5dPlo-R|ASBw{p+h31SA&sb@379nR7iPec~ae_(+cloh;=5pCpPuSyx z;IB&JBZ4Wc>_ybV;+jA@A=nBQDf|Zn#nNxyCjMBMxASJ^&3yCC^xj)PK3MMO@BQBR z*P*xW`kM6(`qkQWcLNC!+L*fW3>_Qo1c{9>gD{I#(0U7<3=-ZQxyLTT9Bx`@UV@7A z#$jPqp_4_T5PDdo!stHKEtEvFP`6W!w(K9xrAF8BJW717T6H5;v3WSxvCyiZ%9K}% zeR}hG#VYR8S9Qs$C?MFdOkv@B(a5^eBkYcnic3b)Ay$@$`&~WoShDwgUsyCwx8Jl&FY%02h;Y+0E;q>^v+01wGPf*fL5YDo|EZU zE|&|Dv{9HW1lt~!-~=aK%;}aMTJYt*Y1TsyvnU5>D@xO`Y{KmF@=PO);y|8qlY!c7 zT$#N+7aXQul%N5;(g!G5arD$elu6Ac73h&M}?(56f$4>4rw#U5D0K=jB z&F&S{2sbd;rX|JY=>3Zg@yq@Vs$;W> delta 832 zcmb7?J!lhQ9LAsjd&ymMNouryKq)qhC5Uy*C>DieX$o=ZASxj_n+xXiZitYOp@ZO- zoMv=%5>Zsd!9l@A1aS}-C+ALrAc)}ezKOw(4wrkL|Hob4=XXC|sMpVx^XYrq{q@*> z>f9fztV9pSh0$jW0N=vpYwt0%(0_@61wRHqj(xED5W^S-^tSe)1Ahq(h4x)Ym@o~6 zeZeq}K^(QD>17~#!_|+zkwi=A*-W8fp}jpbX=5&K(Fyz%>U@CNsVU^OQm9!o<)Ri} zD2Ixz1oC{VbX|!WlQmh6?o3L>;23~T&%5dMyjIln2?NH)z(!5!-9bVBYG+fwnV5v^gj0OwXPUldS$jm7gp?@TE%AD<4E#=g)0^;Pk5)-<)L& Xhlr*P*96I~lI^-Wp`QJo{Hz>x6$kSG delta 18 acmcaJk@3z%M)r%Jc)2F7W827n)dK)dmIv4X diff --git a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc b/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc index 9babfc7296b7c0c45be1c98a14dcccbb6182698f..7674872b0c620f85a28ede931e0f4c5778b1587a 100644 GIT binary patch delta 16 Ycmcb}e36;`;wN6N>Px~K*-tS706BmLZ2$lO delta 16 Ycmcb}e36;`;wN6NiR;)lvY%oE0675$QUCw| diff --git a/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc b/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc index 28047d5b00d206b9ea7def78646ec44efc0ab3eb..115b10f8b8432585441f16057e01633125b520f0 100755 GIT binary patch delta 16 Xcmdlkw_T3?;wN6N>Px~K*$wysI6?*E delta 16 Ycmdlkw_T3?;wN6NiR;)lvK#ON05`)0$N&HU diff --git a/usr/lib/linuxmint/mintMenu/plugins/execute.pyc b/usr/lib/linuxmint/mintMenu/plugins/execute.pyc index 121e1c937073485a5e5bd7c3690433aef6941f50..f90de2f404810e4bd445ae2457630a12b2e8c6b7 100755 GIT binary patch delta 16 YcmaFB`GAxC;wN6N>Px~K*>AD{06Yr@sQ>@~ delta 16 YcmaFB`GAxC;wN6NiR;)lvfpF@06UBZjsO4v diff --git a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc index 3e7ce3f0f2f71ad6c8337ecf9b3ba921b5fe067c..93580c4fa9f2ba60c9a475e651a74317f9be794f 100755 GIT binary patch delta 16 Ycmcbtcv+GC;wN6N>Px~K+0O_706iB5z5oCK delta 16 Ycmcbtcv+GC;wN6NiR;)lvY!zE06drmqW}N^ diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.pyc b/usr/lib/linuxmint/mintMenu/plugins/places.pyc index 49f96af1899608a244f771bb0fd5b9900764b3e2..1695902f48295bd58ee25d0c85154b988a96fca7 100644 GIT binary patch delta 16 XcmaFs^45j@;wN6N>Px~K+0&E&Lp=uM delta 16 YcmaFs^45j@;wN6NiR;)lvZpBl07AY7$p8QV diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.pyc b/usr/lib/linuxmint/mintMenu/plugins/recent.pyc index b35ea24876abc067401537e6a79d38323e962f78..bf86c51e354340ad1ca585f0d719d418049c93fc 100644 GIT binary patch delta 16 Ycmca*eao8t;wN6N>Px~K*)Pii06^Ra6aWAK delta 16 Ycmca*eao8t;wN6NiR;)lvR{@306<*^`2YX_ diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc b/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc index 03c7bf3cd4daf04d1d40026eb0af9bdf0ac10815..8a0731364eba30bc9623da03bf77faa6107082b8 100644 GIT binary patch delta 16 XcmdmFvB`q{;wN6N>Px~K*|lW=I)?@o delta 16 YcmdmFvB`q{;wN6NiR;)lvTMr#06GW-`Tzg`