From aefdbbfbc8224b3ae1d7e1744763b9ee2383bc69 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 26 Mar 2012 23:55:34 -0500 Subject: Fix tdebase FTBFS on Debian and Ubuntu --- debian/lenny/tdebase/debian/rules | 8 ++++---- debian/lenny/tdebase/debian/tdebase-data-trinity.preinst | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/lenny') diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index aee72896e..823a90869 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/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/lenny/tdebase/debian/tdebase-data-trinity.preinst b/debian/lenny/tdebase/debian/tdebase-data-trinity.preinst index 87dc6edc8..9c62c3209 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.preinst +++ b/debian/lenny/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 -- cgit v1.2.3