From e9a174ab6caaded468c452c8bde8a64b9acc6e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 9 Sep 2012 11:41:58 +0200 Subject: Fix inadvertent moving files from /usr in tdebase on Debian and Ubuntu --- ubuntu/maverick/tdebase/debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 29d999bff..1ddae9c58 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -210,8 +210,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/tdebase-data-trinity:: # hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time @@ -239,15 +239,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/tdebase-trinity-bin:: install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity -- cgit v1.2.3