rev 5142 - in kde-extras/strigi: tags/0.3.10-1/debian tags/0.3.10-1/debian/patches trunk/debian trunk/debian/patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-12-14 10:13:54 +0100 (Thu, 14 Dec 2006)
New Revision: 5142

Added:
   kde-extras/strigi/tags/0.3.10-1/debian/patches/
   kde-extras/strigi/tags/0.3.10-1/debian/patches/10_ftbfs_amd64.diff
   kde-extras/strigi/trunk/debian/patches/
   kde-extras/strigi/trunk/debian/patches/10_ftbfs_amd64.diff
Modified:
   kde-extras/strigi/tags/0.3.10-1/debian/changelog
   kde-extras/strigi/trunk/debian/changelog
Log:
update strigi 0.3.10-1, package already uploaded to experimental

Modified: kde-extras/strigi/tags/0.3.10-1/debian/changelog
===================================================================
--- kde-extras/strigi/tags/0.3.10-1/debian/changelog	2006-12-13 13:00:05 UTC (rev 5141)
+++ kde-extras/strigi/tags/0.3.10-1/debian/changelog	2006-12-14 09:13:54 UTC (rev 5142)
@@ -3,6 +3,7 @@
   [ Fathi Boudra ]
   * Add debian/rules get-orig-source target for http://buildserver.net
   * Add Section entry for strigi to fix linda error
+  * Add patch to fix FTBFS on amd64
 
   [ Mark Purcell ]
   * Update debian/watch

Added: kde-extras/strigi/tags/0.3.10-1/debian/patches/10_ftbfs_amd64.diff
===================================================================
--- kde-extras/strigi/tags/0.3.10-1/debian/patches/10_ftbfs_amd64.diff	2006-12-13 13:00:05 UTC (rev 5141)
+++ kde-extras/strigi/tags/0.3.10-1/debian/patches/10_ftbfs_amd64.diff	2006-12-14 09:13:54 UTC (rev 5142)
@@ -0,0 +1,19 @@
+diff -Nur strigi-0.3.10/src/daemon/xsd/CMakeLists.txt strigi-0.3.10.new/src/daemon/xsd/CMakeLists.txt
+--- strigi-0.3.10/src/daemon/xsd/CMakeLists.txt	2006-12-02 12:25:51.000000000 +0100
++++ strigi-0.3.10.new/src/daemon/xsd/CMakeLists.txt	2006-12-12 19:39:53.000000000 +0100
+@@ -7,10 +7,12 @@
+ # java is required to compile the xsd parser
+ find_package(Java REQUIRED)
+ 
+-# loop over all xsd files
+-file(GLOB XSDFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xsd)
++# loop over all xsd files, the next line does not work everywhere,
++# so we dont use it currently
++# file(GLOB XSDFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xsd)
+ # if the previous line does not work, try this:
+-# set(XSDFILES "strigidaemonconfiguration.xsd")
++set(XSDFILES "strigidaemonconfiguration.xsd")
++
+ foreach (XSDFILE ${XSDFILES})
+   string(REPLACE ".xsd" "" XSDNAME ${XSDFILE})
+ 

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2006-12-13 13:00:05 UTC (rev 5141)
+++ kde-extras/strigi/trunk/debian/changelog	2006-12-14 09:13:54 UTC (rev 5142)
@@ -3,6 +3,7 @@
   [ Fathi Boudra ]
   * Add debian/rules get-orig-source target for http://buildserver.net
   * Add Section entry for strigi to fix linda error
+  * Add patch to fix FTBFS on amd64
 
   [ Mark Purcell ]
   * Update debian/watch

Added: kde-extras/strigi/trunk/debian/patches/10_ftbfs_amd64.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/10_ftbfs_amd64.diff	2006-12-13 13:00:05 UTC (rev 5141)
+++ kde-extras/strigi/trunk/debian/patches/10_ftbfs_amd64.diff	2006-12-14 09:13:54 UTC (rev 5142)
@@ -0,0 +1,19 @@
+diff -Nur strigi-0.3.10/src/daemon/xsd/CMakeLists.txt strigi-0.3.10.new/src/daemon/xsd/CMakeLists.txt
+--- strigi-0.3.10/src/daemon/xsd/CMakeLists.txt	2006-12-02 12:25:51.000000000 +0100
++++ strigi-0.3.10.new/src/daemon/xsd/CMakeLists.txt	2006-12-12 19:39:53.000000000 +0100
+@@ -7,10 +7,12 @@
+ # java is required to compile the xsd parser
+ find_package(Java REQUIRED)
+ 
+-# loop over all xsd files
+-file(GLOB XSDFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xsd)
++# loop over all xsd files, the next line does not work everywhere,
++# so we dont use it currently
++# file(GLOB XSDFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xsd)
+ # if the previous line does not work, try this:
+-# set(XSDFILES "strigidaemonconfiguration.xsd")
++set(XSDFILES "strigidaemonconfiguration.xsd")
++
+ foreach (XSDFILE ${XSDFILES})
+   string(REPLACE ".xsd" "" XSDNAME ${XSDFILE})
+