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

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-09 01:41:42 +0000 (Tue, 09 Dec 2008)
New Revision: 12886

Removed:
   branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
try to use plain upstream kdepimlibs cmake stuff

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-08 19:01:15 UTC (rev 12885)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-09 01:41:42 UTC (rev 12886)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.82+svn893527-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.82+svn894637-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -52,8 +52,6 @@
     add appropriate hooks to debian/rules.
   * kdelibs5-dev conflicts with kdepimlibs5-dev (<< 4:4.1.81+svn891439) because
     of upstream changes.
-  * Add 24_findkdepimlibs_no_hardcoded_paths.diff to remove hardcoded cmake
-    modules paths from FindKdepimLibs.cmake.
 
   +++ Changes by George Kiagiadakis:
 
@@ -63,10 +61,8 @@
   
   * Rework slightly patch 15_kfreebsd_support.diff.
   * Redo patch 20_use_dejavu_as_default_font.diff.
-  * Update 24_findkdepimlibs_no_hardcoded_paths.diff after updates in the
-    KDE's SVN.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Dec 2008 16:02:04 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Dec 2008 03:16:59 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-08 19:01:15 UTC (rev 12885)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-09 01:41:42 UTC (rev 12886)
@@ -1295,9 +1295,9 @@
 usr/include/ktextedit.h
 usr/include/ktexteditor/annotationinterface.h
 usr/include/ktexteditor/attribute.h
-usr/include/ktexteditor/codecompletionmodelcontrollerinterface.h
 usr/include/ktexteditor/codecompletioninterface.h
 usr/include/ktexteditor/codecompletionmodel.h
+usr/include/ktexteditor/codecompletionmodelcontrollerinterface.h
 usr/include/ktexteditor/commandinterface.h
 usr/include/ktexteditor/configinterface.h
 usr/include/ktexteditor/configpage.h
@@ -1530,6 +1530,7 @@
 usr/share/kde4/apps/cmake/modules/FindGettext.cmake
 usr/share/kde4/apps/cmake/modules/FindGphoto2.cmake
 usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake
+usr/share/kde4/apps/cmake/modules/FindKDE4Workspace.cmake
 usr/share/kde4/apps/cmake/modules/FindKDEWIN32.cmake
 usr/share/kde4/apps/cmake/modules/FindKDEWIN_Packager.cmake
 usr/share/kde4/apps/cmake/modules/FindKNepomuk.cmake

Deleted: branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-08 19:01:15 UTC (rev 12885)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-09 01:41:42 UTC (rev 12886)
@@ -10,4 +10,3 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
-24_findkdepimlibs_no_hardcoded_paths.diff