diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-09-09 11:41:58 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-09-14 03:02:47 +0200 |
| commit | f13388df64f546ccad0578e0832c2d013ae225e6 (patch) | |
| tree | 491f1ab7a08195c7ef115659240388c3414d416b /ubuntu/maverick | |
| parent | cab5a344c5af48ae18da7b717f3c97ee951aa9d6 (diff) | |
| download | tde-packaging-f13388df64f546ccad0578e0832c2d013ae225e6.tar.gz tde-packaging-f13388df64f546ccad0578e0832c2d013ae225e6.zip | |
Fix inadvertent moving files from /usr in tdebase on Debian and Ubuntu
(cherry picked from commit e9a174ab6caaded468c452c8bde8a64b9acc6e69)
Diffstat (limited to 'ubuntu/maverick')
| -rwxr-xr-x | ubuntu/maverick/kdebase/debian/rules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/kdebase/debian/rules b/ubuntu/maverick/kdebase/debian/rules index cd6b4b409..0bda870cf 100755 --- a/ubuntu/maverick/kdebase/debian/rules +++ b/ubuntu/maverick/kdebase/debian/rules @@ -219,8 +219,8 @@ clean:: rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png binary-install/kate-trinity:: - cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/ - rm -rf debian/kate-trinity/usr + #cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/ + #rm -rf debian/kate-trinity/usr binary-install/kdebase-data-trinity:: # hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time @@ -248,15 +248,15 @@ binary-install/kcontrol-trinity:: binary-install/konqueror-trinity:: install -p -D -m644 debian/edit-as-root.desktop debian/konqueror-trinity/opt/trinity/share/apps/konqueror/servicemenus/edit-as-root.desktop - cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/ - rm -rf debian/konqueror-trinity/usr + #cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/ + #rm -rf debian/konqueror-trinity/usr install/klipper-trinity:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc binary-install/klipper-trinity:: - cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/ - rm -rf debian/klipper-trinity/usr + #cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/ + #rm -rf debian/klipper-trinity/usr binary-install/kdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/kdebase-trinity-bin/etc/pam.d/kcheckpass-trinity |