summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/tdelibs/debian/patches
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-10 16:16:32 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-10 16:16:32 -0500
commit02dc85a95b228b7242b0d11ea35619faad96db03 (patch)
treee161ba877a0720bbdf7818bdec06eb239d8ad271 /ubuntu/precise/tdelibs/debian/patches
parent6f2c7dc70e77d2f768d687838b6cc9f7632f609e (diff)
downloadtde-packaging-02dc85a95b228b7242b0d11ea35619faad96db03.tar.gz
tde-packaging-02dc85a95b228b7242b0d11ea35619faad96db03.zip
Split precise from maverick
Diffstat (limited to 'ubuntu/precise/tdelibs/debian/patches')
-rw-r--r--ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff39
-rw-r--r--ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff11
2 files changed, 50 insertions, 0 deletions
diff --git a/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
new file mode 100644
index 000000000..715b2bd22
--- /dev/null
+++ b/ubuntu/precise/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
@@ -0,0 +1,39 @@
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -450,14 +450,19 @@
+ return d->useragent;
+
+ TQString supp;
++ int debian_append = 0;
+ struct utsname nam;
+ if( uname(&nam) >= 0 )
+ {
+ if( modifiers.contains('o') )
+ {
+ supp += TQString("; %1").arg(nam.sysname);
++ debian_append = 1;
+ if ( modifiers.contains('v') )
++ {
+ supp += TQString(" %1").arg(nam.release);
++ debian_append = 2;
++ }
+ }
+ if( modifiers.contains('p') )
+ {
+@@ -485,6 +490,16 @@
+ }
+ d->modifiers = modifiers;
+ d->useragent = CFG_DEFAULT_UAGENT(supp);
++
++ if (debian_append == 1)
++ d->useragent.append(" (Debian)");
++ else if (debian_append == 2)
++ {
++#define STRINGIFY(macro_or_string) STRINGIFY_ARG(macro_or_string)
++#define STRINGIFY_ARG(contents) #contents
++ d->useragent.append(" (Debian package " STRINGIFY(DEBIAN_VERSION) ")");
++ }
++
+ return d->useragent;
+ }
+
diff --git a/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
new file mode 100644
index 000000000..b224a4d11
--- /dev/null
+++ b/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -0,0 +1,11 @@
+--- tdelibs/tdecore/kaboutdata.cpp 2006-03-17 10:19:05.000000000 +0000
++++ tdelibs/tdecore/kaboutdata.cpp 2006-12-05 19:46:12.000000000 +0000
+@@ -389,7 +389,7 @@
+ "of the translation teams all over the world.</p>"
+ "<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 TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>");
+ }
+
+ TQString