summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-11-14 18:27:00 -0600
committerTimothy Pearson <[email protected]>2011-11-14 18:27:00 -0600
commit9cdd60304e49a4037b326ddbaac7c038383fbdf7 (patch)
tree3e3b7b7af37a1753191423a45ca57f3e03ad046b /ubuntu
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-9cdd60304e49a4037b326ddbaac7c038383fbdf7.tar.gz
tde-packaging-9cdd60304e49a4037b326ddbaac7c038383fbdf7.zip
Fix tdelibs FTBFS on Ubuntu
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff14
-rw-r--r--ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff2
2 files changed, 1 insertions, 15 deletions
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
deleted file mode 100644
index 06bd685ca..000000000
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- tdelibs/Makefile.am.in 2006-06-26 16:14:54.000000000 +0000
-+++ tdelibs/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 ./tdecore/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)/tdelibs.pot
-- $(XGETTEXT) common_texts.cpp -o kde.pot
- rm -f dirs
-
- EXTRA_DIST = admin kde.pot \
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index a0db3e5c7..b224a4d11 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/maverick/tdelibs/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