summaryrefslogtreecommitdiffstats
path: root/debian/squeeze
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-03-26 23:55:34 -0500
committerTimothy Pearson <[email protected]>2012-03-26 23:55:34 -0500
commitaefdbbfbc8224b3ae1d7e1744763b9ee2383bc69 (patch)
tree69412a115ac429543b80c68d55252caeaf052588 /debian/squeeze
parentcc2a5db0fae8890e0adcab379af20d018c439541 (diff)
downloadtde-packaging-aefdbbfbc8224b3ae1d7e1744763b9ee2383bc69.tar.gz
tde-packaging-aefdbbfbc8224b3ae1d7e1744763b9ee2383bc69.zip
Fix tdebase FTBFS on Debian and Ubuntu
Diffstat (limited to 'debian/squeeze')
-rwxr-xr-xdebian/squeeze/tdebase/debian/rules8
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst2
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index aee72896e..823a90869 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -226,10 +226,10 @@ 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
# it's in fact a linux specific file...
install -p -D -m644 kcontrol/view1394/oui.db debian/tdebase-data-trinity/opt/trinity/share/apps/kcmview1394/oui.db
- install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/kde-essential.menu
- install -p -D -m644 debian/tmp/etc/xdg/menus/kde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-information.menu
- install -p -D -m644 debian/tmp/etc/xdg/menus/kde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-screensavers.menu
- install -p -D -m644 debian/tmp/etc/xdg/menus/kde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/kde-settings.menu
+ install -p -D -m644 debian/tmp/etc/xdg/menus/applications-merged/tde-essential.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/applications-merged/tde-essential.menu
+ install -p -D -m644 debian/tmp/etc/xdg/menus/tde-information.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-information.menu
+ install -p -D -m644 debian/tmp/etc/xdg/menus/tde-screensavers.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-screensavers.menu
+ install -p -D -m644 debian/tmp/etc/xdg/menus/tde-settings.menu debian/tdebase-data-trinity/opt/trinity/etc/xdg/menus/tde-settings.menu
rm -rf debian/tmp/etc/xdg/*
rm -rf debian/tdebase-data-trinity/etc/xdg/*
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst b/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst
index 87dc6edc8..9c62c3209 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.preinst
@@ -1,6 +1,6 @@
#! /bin/sh -e
-FILE="/etc/xdg/menus/kde-applications-merged/kde-essential.menu"
+FILE="/etc/xdg/menus/kde-applications-merged/tde-essential.menu"
SUBDIR="/etc/xdg/menus/kde-applications-merged"
case "$1" in