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-09 11:41:58 +0200 |
| commit | e9a174ab6caaded468c452c8bde8a64b9acc6e69 (patch) | |
| tree | f9589ce1c81809af70746d73d6fed5251d39ed20 /debian | |
| parent | b60c8df9f7b91899327fd77d4a99fbabab5b230f (diff) | |
| download | tde-packaging-e9a174ab6caaded468c452c8bde8a64b9acc6e69.tar.gz tde-packaging-e9a174ab6caaded468c452c8bde8a64b9acc6e69.zip | |
Fix inadvertent moving files from /usr in tdebase on Debian and Ubuntu
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/lenny/tdebase/debian/rules | 12 | ||||
| -rwxr-xr-x | debian/squeeze/tdebase/debian/rules | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index 1c6e9be7a..a5183fe19 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/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 diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 1c6e9be7a..a5183fe19 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/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 |