Fix inadvertent moving files from /usr in tdebase on Debian and Ubuntu

pull/3/head
Slávek Banko 12 years ago
parent b60c8df9f7
commit e9a174ab6c

@ -210,8 +210,8 @@ clean::
rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
binary-install/kate-trinity:: binary-install/kate-trinity::
cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/ #cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/
rm -rf debian/kate-trinity/usr #rm -rf debian/kate-trinity/usr
binary-install/tdebase-data-trinity:: 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 # 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:: 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 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/ #cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/
rm -rf debian/konqueror-trinity/usr #rm -rf debian/konqueror-trinity/usr
install/klipper-trinity:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
binary-install/klipper-trinity:: binary-install/klipper-trinity::
cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/ #cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/
rm -rf debian/klipper-trinity/usr #rm -rf debian/klipper-trinity/usr
binary-install/tdebase-trinity-bin:: binary-install/tdebase-trinity-bin::
install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity

@ -210,8 +210,8 @@ clean::
rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
binary-install/kate-trinity:: binary-install/kate-trinity::
cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/ #cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/
rm -rf debian/kate-trinity/usr #rm -rf debian/kate-trinity/usr
binary-install/tdebase-data-trinity:: 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 # 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:: 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 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/ #cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/
rm -rf debian/konqueror-trinity/usr #rm -rf debian/konqueror-trinity/usr
install/klipper-trinity:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
binary-install/klipper-trinity:: binary-install/klipper-trinity::
cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/ #cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/
rm -rf debian/klipper-trinity/usr #rm -rf debian/klipper-trinity/usr
binary-install/tdebase-trinity-bin:: binary-install/tdebase-trinity-bin::
install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity

@ -210,8 +210,8 @@ clean::
rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png rm -f pics/crystalsvg/cr*decrypt.png pics/crystalsvg/cr*encrypt.png
binary-install/kate-trinity:: binary-install/kate-trinity::
cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/ #cp -Rp debian/kate-trinity/usr/* debian/kate-trinity/opt/trinity/
rm -rf debian/kate-trinity/usr #rm -rf debian/kate-trinity/usr
binary-install/tdebase-data-trinity:: 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 # 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:: 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 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/ #cp -Rp debian/konqueror-trinity/usr/* debian/konqueror-trinity/opt/trinity/
rm -rf debian/konqueror-trinity/usr #rm -rf debian/konqueror-trinity/usr
install/klipper-trinity:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
binary-install/klipper-trinity:: binary-install/klipper-trinity::
cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/ #cp -Rp debian/klipper-trinity/usr/* debian/klipper-trinity/opt/trinity/
rm -rf debian/klipper-trinity/usr #rm -rf debian/klipper-trinity/usr
binary-install/tdebase-trinity-bin:: binary-install/tdebase-trinity-bin::
install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity install -p -D -m644 debian/kcheckpass-trinity.pam debian/tdebase-trinity-bin/etc/pam.d/kcheckpass-trinity

Loading…
Cancel
Save