diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-14 18:27:00 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-23 23:17:27 +0200 |
| commit | 0d699fa3cb208408972499e26f3c7d205232cadd (patch) | |
| tree | 242ca47797f6fcbec7d965bca6fe135691cf9d8e /ubuntu/maverick/kdelibs | |
| parent | 6a2c4d436944390c16266544e383f99246fd8da4 (diff) | |
| download | tde-packaging-0d699fa3cb208408972499e26f3c7d205232cadd.tar.gz tde-packaging-0d699fa3cb208408972499e26f3c7d205232cadd.zip | |
Fix tdelibs FTBFS on Ubuntu
(cherry picked from commit 9cdd60304e49a4037b326ddbaac7c038383fbdf7)
Diffstat (limited to 'ubuntu/maverick/kdelibs')
| -rw-r--r-- | ubuntu/maverick/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff | 14 | ||||
| -rw-r--r-- | ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff deleted file mode 100644 index d5b892428..000000000 --- a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- kdelibs/Makefile.am.in 2006-06-26 16:14:54.000000000 +0000 -+++ kdelibs/Makefile.am.in 2006-06-26 16:16:33.000000000 +0000 -@@ -54,10 +54,8 @@ - find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ - find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ - echo ./kdecore/kde-config.cpp.in >> files ;\ -- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ -- : > kde.pot ;\ -+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; - $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot -- $(XGETTEXT) common_texts.cpp -o kde.pot - rm -f dirs - - EXTRA_DIST = admin kde.pot \ diff --git a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff index b21ebe312..ca532e2a1 100644 --- a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff +++ b/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff @@ -5,7 +5,7 @@ "<p>For more information on KDE internationalization " "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>" - ); -+ ) + i18n("<p>Debian includes additions and alterations to the KDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); ++ ) + i18n("<p>Debian includes additions and alterations to the TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); } TQString |