diff options
Diffstat (limited to 'ubuntu/_base/applications')
| -rwxr-xr-x | ubuntu/_base/applications/multimedia/k3b/debian/rules | 7 | ||||
| -rw-r--r-- | ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules index 0cd87b24d..70fead837 100755 --- a/ubuntu/_base/applications/multimedia/k3b/debian/rules +++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules @@ -57,6 +57,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff index 1ee900501..bc9f7dace 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff +++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff @@ -59,7 +59,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + bool exists = TQFile::exists(url.path()); + return exists; @@ -88,7 +88,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + TQProcess proc2; @@ -96,7 +96,7 @@ + proc2.addArgument("chmod 0644 " + dest.path()); + proc2.launch(buffer); + while (!proc2.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + bool exists = TQFile::exists(dest.path()); @@ -116,7 +116,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + bool exists = !TQFile::exists(url.path()); + return exists; @@ -135,7 +135,7 @@ + TQByteArray buffer; + proc.launch(buffer); + while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); ++ TDEApplication::tdeApp->processEvents(); + } + + bool exists = TQFile::exists(target.path()); |