rev 8820 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-01-08 14:24:21 +0000 (Tue, 08 Jan 2008)
New Revision: 8820

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/02_macro_optional_find_package.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
* Add patch to fix detection of optional features


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-08 10:19:02 UTC (rev 8819)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-08 14:24:21 UTC (rev 8820)
@@ -1,12 +1,20 @@
-kdebase-workspace (4:4.0.0-1) experimental; urgency=low
+kdebase-workspace (4:4.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
   * Update *.install files.
-  * Bump build-depends to >=4.0.0-1.
+  * Bump build-depends to >= 4.0.0-1.
   * Remove patch 15_fix_kdm_crash no needed now.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 05 Jan 2008 08:05:28 +0100
+  +++ Changes by Fathi Boudra:
 
+  * Add patch to fix detection of optional features
+    from upstream revision 758600.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Jan 2008 08:05:28 +0100
+
 kdebase-workspace (4:3.98.0~svn755919-1) experimental; urgency=low
 
   * New svn snapshot release to revision 755919.

Added: branches/kde4/packages/kdebase-workspace/debian/patches/02_macro_optional_find_package.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/02_macro_optional_find_package.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/02_macro_optional_find_package.diff	2008-01-08 14:24:21 UTC (rev 8820)
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,10 @@
+ find_package(Strigi REQUIRED)
+ find_package(Blitz REQUIRED)
+ 
++macro_optional_find_package(USB)
++macro_optional_find_package(Fontconfig)
++macro_optional_find_package(OpenGL)
++
+ include (MacroLibrary)
+ include (KDE4Defaults)
+ 

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-08 10:19:02 UTC (rev 8819)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-08 14:24:21 UTC (rev 8820)
@@ -1,3 +1,4 @@
+02_macro_optional_find_package.diff
 06_kdehome_kde4.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff