From 0d699fa3cb208408972499e26f3c7d205232cadd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 14 Nov 2011 18:27:00 -0600
Subject: Fix tdelibs FTBFS on Ubuntu (cherry picked from commit
 9cdd60304e49a4037b326ddbaac7c038383fbdf7)

---
 .../debian/patches/kubuntu_38_no_generate_kdepot.diff      | 14 --------------
 .../debian/patches/kubuntu_64_rosetta_translation.diff     |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 ubuntu/maverick/kdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff

(limited to 'ubuntu/maverick/kdelibs')

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
-- 
cgit v1.2.1