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

[Sune Vuorela]

Author: pusling-guest
Date: 2009-01-09 21:52:59 +0000 (Fri, 09 Jan 2009)
New Revision: 13258

Removed:
   branches/kde4/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
   branches/kde4/packages/kdelibs/debian/patches/series
   branches/kde4/packages/kdelibs/debian/rules
Log:
* New upstream release.
+++ Changes by Sune Vuorela:
* shlibs bump.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2009-01-09 20:31:44 UTC (rev 13257)
+++ branches/kde4/packages/kdelibs/debian/changelog	2009-01-09 21:52:59 UTC (rev 13258)
@@ -1,5 +1,11 @@
-kde4libs (4:4.1.3-3) UNRELEASED; urgency=low
+kde4libs (4:4.1.4-1) experimental; urgency=low
 
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela:
+
+  * shlibs bump.
+
   +++ Changes by Modestas Vainius:
 
   * Use better approach to enforcing kde4- prefix to applications.menu. The
@@ -8,7 +14,7 @@
     11_default_kde4_xdg_menu_prefix.diff. Thanks to Harald Sitter for the
     heads up.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Nov 2008 00:21:43 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Jan 2009 22:00:46 +0100
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Deleted: branches/kde4/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff

Modified: branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-01-09 20:31:44 UTC (rev 13257)
+++ branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-01-09 21:52:59 UTC (rev 13258)
@@ -11,7 +11,7 @@
  
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
-@@ -771,8 +771,10 @@
+@@ -775,8 +775,10 @@
     QString result;
  
     QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +24,7 @@
        QFileInfo fileInfo(fileName);
  
        QString fileNameOnly = fileInfo.fileName();
-@@ -782,7 +784,6 @@
+@@ -786,7 +788,6 @@
        QString baseName = QDir::cleanPath(m_docInfo.baseDir +
                                           fileInfo.path() + '/' + fileNameOnly);
        result = KStandardDirs::locate("xdgconf-menu", baseName);

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2009-01-09 20:31:44 UTC (rev 13257)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2009-01-09 21:52:59 UTC (rev 13258)
@@ -1,4 +1,3 @@
-01_http_cache_cleaner_branch_881252.diff
 01_kross_version_11_r838337.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2009-01-09 20:31:44 UTC (rev 13257)
+++ branches/kde4/packages/kdelibs/debian/rules	2009-01-09 21:52:59 UTC (rev 13258)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 #UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
-UPSTREAMVERSION ?= 4:4.1.3-2
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.3)
+UPSTREAMVERSION ?= 4:4.1.4
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.4)
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg