rev 12654 - in branches/kde4-backports/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-11-17 13:25:46 +0000 (Mon, 17 Nov 2008)
New Revision: 12654

Added:
   branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff
Removed:
   branches/kde4-backports/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff
Modified:
   branches/kde4-backports/packages/kdelibs/debian/changelog
   branches/kde4-backports/packages/kdelibs/debian/patches/series
   branches/kde4-backports/packages/kdelibs/debian/rules
Log:
kde4libs 4.1.3 backport



Modified: branches/kde4-backports/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/changelog	2008-11-17 11:34:16 UTC (rev 12653)
+++ branches/kde4-backports/packages/kdelibs/debian/changelog	2008-11-17 13:25:46 UTC (rev 12654)
@@ -1,15 +1,47 @@
-kde4libs (4:4.1.2-1~lenny+2) lenny; urgency=low
+kde4libs (4:4.1.3-2~lenny+1) lenny; urgency=low
 
-  * Fix kdedglobalaccel crashes. Patch 02.
+  * Backport for Lenny.
+  * Using UPSTREAMVERSION ?= 4:4.1.3-2~lenny+1 instead of 4:4.1.3-2.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 13 Oct 2008 09:26:54 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 17 Nov 2008 13:47:53 +0100
 
-kde4libs (4:4.1.2-1~lenny+1) lenny; urgency=low
+kde4libs (4:4.1.3-2) experimental; urgency=low
 
-  * Backport for Lenny.
+  +++ Changes by Modestas Vainius:
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 07 Oct 2008 18:16:31 +0200
+  * Bump kdebase-runtime dependency back to 4.1.3. The previous change was
+    a mistake.
+  * Bump kdelibs5 shlibs to 4.1.3-2 to ease the pain.
 
+  +++ Changes by Sune Vuorela:
+
+  * Add patch for http cache cleaner to keep the cache revision in sync.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Nov 2008 22:18:05 +0200
+
+kde4libs (4:4.1.3-1) experimental; urgency=low
+
+  * New upstream release
+
+  +++ Changes by Sune Vuorela:
+
+  * Remove kdedglobalaccel crash patch. Merged upstream.
+  
+  +++ Changes by Modestas Vainius:
+
+  * Bump shlibs to 4.1.3.
+  * Loosen kdebase-runtime dependency back to 4.1.0. There seems to be no
+    other easy way to solve experimental buildd failures. This should not
+    hurt too much.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Nov 2008 09:56:56 +0200
+
+kde4libs (4:4.1.2-2) experimental; urgency=low
+
+  * Fix kdedglobalaccel crashes. Patch 02. 
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 12 Oct 2008 20:00:14 +0200
+
 kde4libs (4:4.1.2-1) experimental; urgency=low
 
   * New upstream release.

Copied: branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff (from rev 12638, branches/kde4/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff)
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff	                        (rev 0)
+++ branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff	2008-11-17 13:25:46 UTC (rev 12654)
@@ -0,0 +1,22 @@
+--- kdelibs/kioslave/http/http_cache_cleaner.cpp
++++ kdelibs/kioslave/http/http_cache_cleaner.cpp
+@@ -50,7 +50,7 @@
+ static const char appFullName[] = "org.kde.kio_http_cache_cleaner";
+ static const char appName[] = "kio_http_cache_cleaner";
+ 
+-static const char version[] = "1.0.0";
++static const char version[] = "9";
+ 
+ struct FileInfo {
+    QString name;
+@@ -73,8 +73,8 @@
+ };
+ 
+ // !START OF SYNC!
+-// Keep the following in sync with the cache code in http.cc
+-#define CACHE_REVISION "7\n"
++// Keep the following in sync with the cache code in http.cpp
++#define CACHE_REVISION "9\n"
+ 
+ FileInfo *readEntry( const QString &filename)
+ {

Deleted: branches/kde4-backports/packages/kdelibs/debian/patches/02_r866736_kdedglobalaccel_crashes.diff

Modified: branches/kde4-backports/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/patches/series	2008-11-17 11:34:16 UTC (rev 12653)
+++ branches/kde4-backports/packages/kdelibs/debian/patches/series	2008-11-17 13:25:46 UTC (rev 12654)
@@ -1,5 +1,5 @@
+01_http_cache_cleaner_branch_881252.diff
 01_kross_version_11_r838337.diff
-02_r866736_kdedglobalaccel_crashes.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 11_kde4_applications_menu.diff

Modified: branches/kde4-backports/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/rules	2008-11-17 11:34:16 UTC (rev 12653)
+++ branches/kde4-backports/packages/kdelibs/debian/rules	2008-11-17 13:25:46 UTC (rev 12654)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 #UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
-UPSTREAMVERSION ?= 4:4.1.2
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.2)
+UPSTREAMVERSION ?= 4:4.1.3-2~lenny+1
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.3)
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg