[pkg-kde-commits] rev 2726 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-30 23:03:34 +0000 (Fri, 30 Dec 2005)
New Revision: 2726

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
Log:
This should resolve user anxieties over having too much package information
exposed (even though Debian's other browsers worked the same way).


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-12-30 22:56:25 UTC (rev 2725)
+++ trunk/packages/kdelibs/debian/changelog	2005-12-30 23:03:34 UTC (rev 2726)
@@ -5,6 +5,11 @@
   * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
     be fixed. (Closes: #342984)
 
+  * Adjust the Debianization of the Konqueror user agent string. The package
+    version is not exposed by default. Rather, the level of information
+    presented is tied to the level of general operating system the user has
+    configured to be sent.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 kdelibs (4:3.5.0-2) experimental; urgency=low

Modified: trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff	2005-12-30 22:56:25 UTC (rev 2725)
+++ trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff	2005-12-30 23:03:34 UTC (rev 2726)
@@ -1,14 +1,39 @@
 --- kde.orig/kio/kio/kprotocolmanager.cpp
 +++ kde.patched/kio/kio/kprotocolmanager.cpp
-@@ -482,6 +482,11 @@
+@@ -447,14 +447,19 @@
+      return d->useragent;
+ 
+   QString supp;
++  int debian_append = 0;
+   struct utsname nam;
+   if( uname(&nam) >= 0 )
+   {
+     if( modifiers.contains('o') )
+     {
+       supp += QString("; %1").arg(nam.sysname);
++      debian_append = 1;
+       if ( modifiers.contains('v') )
++      {
+         supp += QString(" %1").arg(nam.release);
++        debian_append = 2;
++      }
+     }
+     if( modifiers.contains('p') )
+     {
+@@ -482,6 +487,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) ")");
-+
++    d->useragent.append(" (Debian package " STRINGIFY(DEBIAN_VERSION) ")");
++  }
++  
    return d->useragent;
  }