From 11394aecd1f906fee2ebd2b90412aeba4651fbff Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 3 Apr 2019 22:56:40 +0900 Subject: DEB: use _base folder for a distro instead of specific distros (squeeze and maverick). Signed-off-by: Michele Calgaro --- .../patches/kubuntu_19_debianize_useragent.diff | 39 ++++++++++++++++++++++ ubuntu/_base/tdelibs/debian/patches/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff create mode 100644 ubuntu/_base/tdelibs/debian/patches/series (limited to 'ubuntu/_base/tdelibs/debian/patches') diff --git a/ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff new file mode 100644 index 000000000..184591207 --- /dev/null +++ b/ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff @@ -0,0 +1,39 @@ +--- a/tdeio/tdeio/tdeprotocolmanager.cpp ++++ b/tdeio/tdeio/tdeprotocolmanager.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/_base/tdelibs/debian/patches/series b/ubuntu/_base/tdelibs/debian/patches/series new file mode 100644 index 000000000..b5490e13d --- /dev/null +++ b/ubuntu/_base/tdelibs/debian/patches/series @@ -0,0 +1 @@ +kubuntu_19_debianize_useragent.diff -- cgit v1.2.3