rev 13110 - in kde-extras/strigi/branches/experimental/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Jan 3 18:28:59 UTC 2009
Author: fabo
Date: 2009-01-03 18:28:59 +0000 (Sat, 03 Jan 2009)
New Revision: 13110
Added:
kde-extras/strigi/branches/experimental/debian/libsearchclient-dev.install
kde-extras/strigi/branches/experimental/debian/libsearchclient0.install
kde-extras/strigi/branches/experimental/debian/libstreamanalyzer-dev.install
kde-extras/strigi/branches/experimental/debian/libstreamanalyzer0.install
kde-extras/strigi/branches/experimental/debian/libstreams-dev.install
kde-extras/strigi/branches/experimental/debian/libstreams0.install
kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui-dev.install
kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui0.install
kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient-dev.install
kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient0.install
kde-extras/strigi/branches/experimental/debian/patches/01_remove_FindQt4.cmake_local_copy.diff
kde-extras/strigi/branches/experimental/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff
kde-extras/strigi/branches/experimental/debian/patches/series
Removed:
kde-extras/strigi/branches/experimental/debian/README.Debian
kde-extras/strigi/branches/experimental/debian/cmake.mk
kde-extras/strigi/branches/experimental/debian/libstrigi-dev.install
kde-extras/strigi/branches/experimental/debian/libstrigi0.install
kde-extras/strigi/branches/experimental/debian/watch
Modified:
kde-extras/strigi/branches/experimental/debian/changelog
kde-extras/strigi/branches/experimental/debian/control
kde-extras/strigi/branches/experimental/debian/copyright
kde-extras/strigi/branches/experimental/debian/rules
kde-extras/strigi/branches/experimental/debian/strigi-daemon.install
kde-extras/strigi/branches/experimental/debian/strigi-utils.install
Log:
Upload Strigi 0.6.2 to experimental.
* New upstream release.
* Remove 02_strigi_branch_r872482.diff patch. Deprecated.
* Update libstreamanalyzer0 package: add strigiea_jpeg plugin.
* Fix lintian warning: debhelper-but-no-misc-depends.
Deleted: kde-extras/strigi/branches/experimental/debian/README.Debian
Modified: kde-extras/strigi/branches/experimental/debian/changelog
===================================================================
--- kde-extras/strigi/branches/experimental/debian/changelog 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/changelog 2009-01-03 18:28:59 UTC (rev 13110)
@@ -1,12 +1,160 @@
-strigi (0.3.11+svn20070502-1) experimental; urgency=low
+strigi (0.6.2-1) experimental; urgency=low
- * NOT RELEASED YET
- * New upstream release
- * Combine all libs into libstrigi0 & libstrigi-dev
- * libstrigi-dev Depends: pkg-config
+ * New upstream release.
+ * Remove 02_strigi_branch_r872482.diff patch. Deprecated.
+ * Update libstreamanalyzer0 package: add strigiea_jpeg plugin.
+ * Fix lintian warning: debhelper-but-no-misc-depends.
- -- Mark Purcell <msp at debian.org> Thu, 03 May 2007 18:20:23 +0100
+ -- Fathi Boudra <fabo at debian.org> Sat, 03 Jan 2009 18:10:23 +0100
+strigi (0.5.11-2) unstable; urgency=low
+
+ * Add 02_strigi_branch_r872482.diff patch:
+ - install header indexpluginloader.h
+ * Update debian/libstreamanalyzer-dev.install:
+ - install header indexpluginloader.h
+ * Add 03_fix_ftbfs_with_gcc_4.4_bug505624.diff patch:
+ - Fix FTBFS with GCC 4.4 . Thanks to Martin Michlmayr. (Closes: #505624)
+
+ -- Fathi Boudra <fabo at debian.org> Sun, 16 Nov 2008 13:25:39 +0100
+
+strigi (0.5.11-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump Standard-Version to 3.8.0.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 21 Jul 2008 21:37:17 +0200
+
+strigi (0.5.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove FindQt4.cmake to use cmake provided file.
+ * Cleanup rules: remove useless commented lines and g++ hack.
+
+ -- Fathi Boudra <fabo at debian.org> Wed, 04 Jun 2008 10:18:03 +0200
+
+strigi (0.5.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update FindQt4.cmake local copy.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 28 Apr 2008 22:01:19 +0200
+
+strigi (0.5.8-2) experimental; urgency=low
+
+ [Ana Beatriz Guerrero Lopez]
+
+ * Build against Qt 4.4 in experimental:
+ - Add versioned build depend for libqt4-dev on >= 4.4.0~.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 28 Mar 2008 12:54:14 +0100
+
+strigi (0.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove branch pull patch.
+ * Add Vcs-Browser and Vcs-Svn fields.
+ * Add Replaces kdegraphics-strigi-plugins as ico analyzer can be found
+ inside.
+
+ -- Fathi Boudra <fabo at debian.org> Wed, 20 Feb 2008 09:36:50 +0100
+
+strigi (0.5.7-2) unstable; urgency=low
+
+ * Update branch pull patch to r760102.
+ * Remove our cmake.mk. Merged in CDBS package.
+ * Clean up build dependencies.
+ * Update my e-mail address.
+ * Bump Standard-Version to 3.7.3.
+ * Use Homepage field.
+ * Update installed files.
+ * Build with --no-undefined and --as-needed linker flags.
+ * Remove libstreams-dev dependency on libstdc++-dev. (Closes: #454995)
+ * Add strict versioned shlibs. (Closes: #460296)
+ * Add CMAKE_CXX_COMPILER:FILEPATH=g++ to workaround g++ path not properly
+ set.
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 12 Jan 2008 22:57:56 +0100
+
+strigi (0.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update branch pull patch to r729946.
+ * Add query.h, queryparser.h and variant.h to libstreamanalyzer-dev package.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 26 Oct 2007 19:15:00 +0200
+
+strigi (0.5.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add branch pull patch to r727526.
+ * Add build dependencies: bison, libcppunit-dev, libexiv2-dev, libxml2-utils.
+ * Update libstreamanalyzer* packages:
+ * Add clucene index plugin.
+ * Add strigiea_jpeg plugin.
+ * Replace fieldproperties/strigi_* by xesam.rdfs.
+ * Add new include files.
+ * Update include files in libstreams-dev package.
+ * Remove watch file. Upstream website is not always updated with the release.
+ * Remove libcluceneindex* packages.
+ * Update Homepage.
+ * Add strict version dependency on -dev packages. Thanks to Sune.
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 20 Oct 2007 14:57:40 +0200
+
+strigi (0.5.5-2) unstable; urgency=low
+
+ * Add branch pull patch. Fixed call of endAnalysis(bool):
+ handleEnd() should not have a bool complete because dataeventinputstream
+ calls handleEnd(), so that EventThroughAnalyzer::handleEnd() now determines
+ 'complete' with datastream->status() == Eof.
+ * Add dbus as an alternative for dbus-x11. be smart with backporters.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 10 Aug 2007 22:20:33 +0200
+
+strigi (0.5.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update copyright.
+ * Update libstreams-dev install file:
+ * Add StrigiConfig.cmake.
+ * Add encodinginputstream.h.
+ * Remove stringreader.h.
+
+ -- Fathi Boudra <fboudra at free.fr> Tue, 07 Aug 2007 08:53:09 +0200
+
+strigi (0.5.4-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #430955)
+ * Add iconv.h missing include. It fixes FTBFS with g++-4.2.
+ * Add dbus-x11 dependency to strigi-daemon package. Strigi needs session dbus
+ to start on request.
+ * Remove wv dependency to strigi-daemon. Strigi has native OLE parsing now.
+ * Add deskbar-plugins-strigi package.
+ * Add strigi-daemon dependency to strigi-client.
+ * Add python and python-support build dependencies.
+ * Update strigi-daemon package. Add dbus services.
+ * Update libstreams-dev package. Add textutils.h file.
+ * Replace deprecated ${Source-Version} by ${binary:Version}.
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 28 Jul 2007 15:26:39 +0200
+
+strigi (0.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update copyright.
+ * Remove branch pull patch to r623754.
+ * Remove include path patch. Merged upstream.
+ * Update gcc 4.3 patch.
+ * Update libstreams-dev installed files.
+ * Replace libstreamindexer by libstreamanalyzer.
+ * Add libcluceneindex package.
+ * Use default options. Comment DEB_CMAKE_EXTRA_FLAGS.
+ * Remove libssl-dev, libmagic-dev, libexpat1-dev and liblog4cxx9-dev
+ from build depends.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 21:17:54 +0200
+
strigi (0.3.11-2) unstable; urgency=low
* Robust get-orig-source target
Deleted: kde-extras/strigi/branches/experimental/debian/cmake.mk
Modified: kde-extras/strigi/branches/experimental/debian/control
===================================================================
--- kde-extras/strigi/branches/experimental/debian/control 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/control 2009-01-03 18:28:59 UTC (rev 13110)
@@ -2,16 +2,19 @@
Section: utils
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, libbz2-dev, libclucene-dev,
- libssl-dev, zlib1g-dev, libattr1-dev, libmagic-dev, libxml2-dev, libqt4-dev,
- libdbus-1-dev, libexpat1-dev, liblog4cxx9-dev
-Standards-Version: 3.7.2
+Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, libbz2-dev,
+ libclucene-dev, libdbus-1-dev, libexiv2-dev, libqt4-dev (>= 4.4.0), libxml2-dev,
+ zlib1g-dev, libxml2-utils, python-support, python
+Standards-Version: 3.8.0
+Homepage: http://strigi.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/strigi/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/strigi/trunk
Package: strigi-daemon
Architecture: any
Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, wv
+Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, dbus-x11 | dbus
Suggests: strigi-plugins
Description: fast indexing and searching tool for your personal data (daemon)
Strigi is a program for fast indexing and searching your personal data. It can
@@ -26,7 +29,7 @@
* pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
are in the works
* communication between daemon and search program over an abstract interface,
- this is currently a simple socket but implementation of dbus is a
+ this is currently a simple socket but implementation of D-Bus is a
possibility. There's a small perl program in the code as an example of how
to query. This is so easy that any KDE app could implement this.
* simple interface for implementing plugins for extracting information. we'll
@@ -36,21 +39,17 @@
duplicates)
.
This package contains the Strigi daemon
- .
- Homepage: http://www.vandenoever.info/software/strigi
Package: strigi-client
Architecture: any
Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, strigi-daemon
Description: Qt4 client for Strigi Desktop Search
Strigi client is a Qt4 client (GUI) for the Strigi Desktop Search software.
.
This package is part of Strigi Desktop Search, it contains the Qt4 client.
.
See the 'strigi-daemon' package for more informations.
- .
- Homepage: http://www.vandenoever.info/software/strigi
Package: strigi-utils
Architecture: any
@@ -68,36 +67,126 @@
and other files.
* xmlindexer, a program that outputs the file parsing results as xml.
It walks through a directory and outputs an XML file containing all
- the metadata and text it can extract from the the files it encounters.
+ the metadata and text it can extract from the files it encounters.
This means that the Strigi's powers of data extraction are now available
to all applications that can parse XML simply by calling xmlindexer and
parsing the output.
.
See the 'strigi-daemon' package for more informations.
+
+Package: libstreams0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: strigi-daemon (<< 0.3.11-1)
+Description: streams library for for Strigi Desktop Search
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing clients using libstreams.
.
- Homepage: http://www.vandenoever.info/software/strigi
+ See the 'strigi-daemon' package for more informations.
-Package: libstrigi0
+Package: libstreams-dev
Architecture: any
+Section: libdevel
+Depends: ${misc:Depends}, libstreams0 (= ${binary:Version})
+Description: development files for libstreams
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files for libstreams.
+ .
+ See the 'strigi-daemon' package for more informations.
+
+Package: libstreamanalyzer0
+Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libcluceneindex0 (<< 0.5.6-1), libstreamindexer0 (<< 0.5.1-1)
+Replaces: libcluceneindex0 (<< 0.5.6-1), libstreamindexer0 (<< 0.5.1-1),
+ strigi-daemon (<< 0.3.11-1), kdegraphics-strigi-plugins (<< 4:4.0.0-2)
+Description: streamanalyzer library for Strigi Desktop Search
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing clients using libstreamanalyzer.
+ .
+ See the 'strigi-daemon' package for more informations.
+
+Package: libstreamanalyzer-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends}, libstreamanalyzer0 (= ${binary:Version}), libstreams-dev (= ${binary:Version})
+Conflicts: libcluceneindex-dev (<< 0.5.6-1), libstreamindexer-dev (<< 0.5.1-1)
+Replaces: libcluceneindex-dev (<< 0.5.6-1), libstreamindexer-dev (<< 0.5.1-1)
+Description: development files for libstreamanalyzer
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files for libstreamanalyzer.
+ .
+ See the 'strigi-daemon' package for more informations.
+
+Package: libsearchclient0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: strigi-daemon (<< 0.3.11-1)
-Description: library for for Strigi Desktop Search
+Description: searchclient library for Strigi Desktop Search
This package is part of Strigi Desktop Search, it contains a library for
writing clients.
.
See the 'strigi-daemon' package for more informations.
+
+Package: libsearchclient-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends}, libsearchclient0 (= ${binary:Version}), libstreamanalyzer-dev (= ${binary:Version})
+Description: development files for libsearchclient
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files for libsearchclient.
.
- Homepage: http://www.vandenoever.info/software/strigi
+ See the 'strigi-daemon' package for more informations.
-Package: libstrigi-dev
+Package: libstrigihtmlgui0
Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for writing html clients for Strigi Desktop Search
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing html clients.
+ .
+ See the 'strigi-daemon' package for more informations.
+
+Package: libstrigihtmlgui-dev
+Architecture: any
Section: libdevel
-Depends: libstrigi0 (= ${Source-Version}), libstdc++-dev, pkg-config
-Description: development files for libstrigi
+Depends: ${misc:Depends}, libstrigihtmlgui0 (= ${binary:Version}), libsearchclient-dev (= ${binary:Version})
+Description: development files for libstrigihtmlgui
This package is part of Strigi Desktop Search, it contains the Strigi
- development files.
+ development files for libstrigihtmlgui.
.
See the 'strigi-daemon' package for more informations.
+
+Package: libstrigiqtdbusclient0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for writing D-Bus clients for Strigi Desktop Search
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing Qt D-Bus clients for strigi.
.
- Homepage: http://www.vandenoever.info/software/strigi
+ See the 'strigi-daemon' package for more informations.
+
+Package: libstrigiqtdbusclient-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends}, libstrigiqtdbusclient0 (= ${binary:Version}), libqt4-dev (>= 4.4.0~)
+Description: development files for libstrigiqtdbusclient
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files for libstrigiqtdbusclient.
+ .
+ See the 'strigi-daemon' package for more informations.
+
+Package: deskbar-plugins-strigi
+Architecture: any
+Section: gnome
+Depends: ${misc:Depends}, ${python:Depends}, strigi-daemon, deskbar-applet
+Description: Deskbar plugin to search files with strigi
+ This package is part of Strigi Desktop Search, it contains a plugin
+ for the GNOME Deskbar applet to search for files using Strigi.
+ .
+ See the 'strigi-daemon' package for more informations.
Modified: kde-extras/strigi/branches/experimental/debian/copyright
===================================================================
--- kde-extras/strigi/branches/experimental/debian/copyright 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/copyright 2009-01-03 18:28:59 UTC (rev 13110)
@@ -1,23 +1,56 @@
This package was debianized by Fathi Boudra <fboudra at free.fr> on
Wed, 5 Jul 2006 11:57:10 +0200.
-It was downloaded from http://www.vandenoever.info/software/strigi/
+It was downloaded from http://strigi.sourceforge.net
-Upstream Author: Jos van den Oever <jos at vandenoever.info>
+Upstream Authors:
-Copyrights:
- (C) 2006 Jos van den Oever <jos at vandenoever.info>
- (C) 2006 Ben van Klinken <bvanklinken at gmail.com>
- (C) 2006 Flavio Castelli <flavio.castelli at gmail.com>
+ Jos van den Oever <jos at vandenoever.info>
+ Ben van Klinken <bvanklinken at gmail.com>
+ Flavio Castelli <micron at madlab.it>
+ Arend van Beelen jr. <www.arendjr.nl>
+ Christian Ehrlicher <ch.ehrlicher at gmx.de>
+ Christopher Blauvelt <cblauvelt at gmail.com>
+ Jakub Stachowski <qbast at go2.pl>
Copyright for dirent:
- (C) 2003-2006 Matt J. Weinstein
+ © 2003-2006 Matt J. Weinstein
+
Copyright for dostime:
- (C) 1999-2002 Bryan Burns
- (C) 2002 Free Software Foundation
+ © 1999-2002 Bryan Burns
+ © 2002 Free Software Foundation
+
+Copyright for the Extended regular expression matching and search library:
+
+ © 2002-2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Isamu Hasegawa <isamu at yamato.ibm.com>.
+
+Copyright for timeofday based on timeval.h:
+
+ © Wu Yongwei <wuyongwei at gmail.com>
+
+Copyright for the new Qt4 client (histogram_impl and simplesearchgui):
+
+ © 2007 Carsten Niehaus <cniehaus at kde.org>
+
+Copyright for the m3u stream analyzer:
+
+ © 2001-2002 Rolf Magnus <ramagnus at kde.org>
+ © 2007 Tim Beaulen <tbscope at gmail.com>
+
+Copyright for xesam parser and query builder!
+
+ © 2007 Fabrice Colin
+
+Copyright for the namespace harvester sax analyzer:
+
+ © 2007 Egon Willighagen <egonw at users.sf.net>
+
dirent license:
+
Distributable under the terms of either the Apache License (Version 2.0) or
the GNU Lesser General Public License, as specified in the COPYING file.
@@ -59,5 +92,5 @@
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
+The Debian packaging is © 2006, Fathi Boudra <fboudra at free.fr> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: kde-extras/strigi/branches/experimental/debian/libsearchclient-dev.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libsearchclient-dev.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libsearchclient-dev.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,4 @@
+usr/include/strigi/asyncsocketclient.h
+usr/include/strigi/asyncsocket.h
+usr/include/strigi/clientinterface.h
+usr/lib/libsearchclient.so
Added: kde-extras/strigi/branches/experimental/debian/libsearchclient0.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libsearchclient0.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libsearchclient0.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1 @@
+usr/lib/libsearchclient.so.*
Added: kde-extras/strigi/branches/experimental/debian/libstreamanalyzer-dev.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstreamanalyzer-dev.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstreamanalyzer-dev.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,27 @@
+usr/include/strigi/analysisresult.h
+usr/include/strigi/analyzerconfiguration.h
+usr/include/strigi/analyzerplugin.h
+usr/include/strigi/classproperties.h
+usr/include/strigi/diranalyzer.h
+usr/include/strigi/fieldproperties.h
+usr/include/strigi/fieldpropertiesdb.h
+usr/include/strigi/fieldtypes.h
+usr/include/strigi/indexeddocument.h
+usr/include/strigi/indexmanager.h
+usr/include/strigi/indexplugin.h
+usr/include/strigi/indexpluginloader.h
+usr/include/strigi/indexreader.h
+usr/include/strigi/indexwriter.h
+usr/include/strigi/query.h
+usr/include/strigi/queryparser.h
+usr/include/strigi/streamanalyzer.h
+usr/include/strigi/streamanalyzerfactory.h
+usr/include/strigi/streamendanalyzer.h
+usr/include/strigi/streameventanalyzer.h
+usr/include/strigi/streamlineanalyzer.h
+usr/include/strigi/streamsaxanalyzer.h
+usr/include/strigi/streamthroughanalyzer.h
+usr/include/strigi/variant.h
+usr/lib/libstreamanalyzer.so
+usr/lib/pkgconfig/libstreamanalyzer.pc
+
Added: kde-extras/strigi/branches/experimental/debian/libstreamanalyzer0.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstreamanalyzer0.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstreamanalyzer0.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,8 @@
+usr/lib/libstreamanalyzer.so.*
+usr/lib/strigi/strigiindex_*
+usr/lib/strigi/strigiea_*
+usr/lib/strigi/strigila_*
+usr/lib/strigi/strigita_*
+usr/share/strigi/fieldproperties/strigi.rdfs
+usr/share/strigi/fieldproperties/xesam-convenience.rdfs
+usr/share/strigi/fieldproperties/xesam.rdfs
Added: kde-extras/strigi/branches/experimental/debian/libstreams-dev.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstreams-dev.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstreams-dev.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,19 @@
+usr/include/strigi/archivereader.h
+usr/include/strigi/bufferedstream.h
+usr/include/strigi/encodinginputstream.h
+usr/include/strigi/fileinputstream.h
+usr/include/strigi/inputstream.h
+usr/include/strigi/inputstreamreader.h
+usr/include/strigi/sdfinputstream.h
+usr/include/strigi/stringterminatedsubstream.h
+usr/include/strigi/streambase.h
+usr/include/strigi/streambuffer.h
+usr/include/strigi/stringstream.h
+usr/include/strigi/subinputstream.h
+usr/include/strigi/substreamprovider.h
+usr/include/strigi/substreamproviderprovider.h
+usr/include/strigi/strigiconfig.h
+usr/include/strigi/textutils.h
+usr/lib/libstreams.so
+usr/lib/pkgconfig/libstreams.pc
+usr/lib/strigi/StrigiConfig.cmake
Added: kde-extras/strigi/branches/experimental/debian/libstreams0.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstreams0.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstreams0.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1 @@
+usr/lib/libstreams.so.*
Deleted: kde-extras/strigi/branches/experimental/debian/libstrigi-dev.install
Deleted: kde-extras/strigi/branches/experimental/debian/libstrigi0.install
Added: kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui-dev.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui-dev.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui-dev.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,2 @@
+usr/include/strigi/strigihtmlgui.h
+usr/lib/libstrigihtmlgui.so
Added: kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui0.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui0.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstrigihtmlgui0.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1 @@
+usr/lib/libstrigihtmlgui.so.*
Added: kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient-dev.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient-dev.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient-dev.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,5 @@
+usr/include/strigi/qtdbus/strigiasyncclient.h
+usr/include/strigi/qtdbus/strigiclient.h
+usr/include/strigi/qtdbus/strigidbus.h
+usr/include/strigi/qtdbus/strigitypes.h
+usr/lib/libstrigiqtdbusclient.so
Added: kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient0.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient0.install (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/libstrigiqtdbusclient0.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1 @@
+usr/lib/libstrigiqtdbusclient.so.*
Added: kde-extras/strigi/branches/experimental/debian/patches/01_remove_FindQt4.cmake_local_copy.diff
===================================================================
--- kde-extras/strigi/branches/experimental/debian/patches/01_remove_FindQt4.cmake_local_copy.diff (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/patches/01_remove_FindQt4.cmake_local_copy.diff 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,1224 @@
+--- a/cmake/FindQt4.cmake
++++ /dev/null
+@@ -1,1221 +0,0 @@
+-# - Find QT 4
+-# This module can be used to find Qt4.
+-# The most important issue is that the Qt4 qmake is available via the system path.
+-# This qmake is then used to detect basically everything else.
+-# This module defines a number of key variables and macros. First is
+-# QT_USE_FILE which is the path to a CMake file that can be included to compile
+-# Qt 4 applications and libraries. By default, the QtCore and QtGui
+-# libraries are loaded. This behavior can be changed by setting one or more
+-# of the following variables to true:
+-# QT_DONT_USE_QTCORE
+-# QT_DONT_USE_QTGUI
+-# QT_USE_QT3SUPPORT
+-# QT_USE_QTASSISTANT
+-# QT_USE_QTDESIGNER
+-# QT_USE_QTMOTIF
+-# QT_USE_QTMAIN
+-# QT_USE_QTNETWORK
+-# QT_USE_QTNSPLUGIN
+-# QT_USE_QTOPENGL
+-# QT_USE_QTSQL
+-# QT_USE_QTXML
+-# QT_USE_QTSVG
+-# QT_USE_QTTEST
+-# QT_USE_QTUITOOLS
+-# QT_USE_QTDBUS
+-#
+-# All the libraries required are stored in a variable called QT_LIBRARIES.
+-# Add this variable to your TARGET_LINK_LIBRARIES.
+-#
+-# macro QT4_WRAP_CPP(outfiles inputfile ... )
+-# macro QT4_WRAP_UI(outfiles inputfile ... )
+-# macro QT4_ADD_RESOURCES(outfiles inputfile ... )
+-# macro QT4_AUTOMOC(inputfile ... )
+-# macro QT4_GENERATE_MOC(inputfile outputfile )
+-#
+-# macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
+-# create a the interface header and implementation files with the
+-# given basename from the given interface xml file and add it to
+-# the list of sources
+-#
+-# macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
+-# create the interface header and implementation files
+-# for all listed interface xml files
+-# the name will be automatically determined from the name of the xml file
+-#
+-# macro QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE(outfiles interface basename)
+-# create a the interface without namespace header and implementation files with the
+-# given basename from the given interface xml file and add it to
+-# the list of sources
+-#
+-# macro QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE(outfiles inputfile ... )
+-# create the interface header without namespace and implementation files
+-# for all listed interface xml files
+-# the name will be automatically determined from the name of the xml file
+-#
+-# macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] )
+-# create a dbus adaptor (header and implementation file) from the xml file
+-# describing the interface, and add it to the list of sources. The adaptor
+-# forwards the calls to a parent class, defined in parentheader and named
+-# parentclassname. The name of the generated files will be
+-# <basename>adaptor.{cpp,h} where basename is the basename of the xml file.
+-#
+-# macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] )
+-# generate the xml interface file from the given header.
+-# If the optional argument interfacename is omitted, the name of the
+-# interface file is constructed from the basename of the header with
+-# the suffix .xml appended.
+-#
+-# QT_FOUND If false, don't try to use Qt.
+-# QT4_FOUND If false, don't try to use Qt 4.
+-#
+-# QT_QTCORE_FOUND True if QtCore was found.
+-# QT_QTGUI_FOUND True if QtGui was found.
+-# QT_QT3SUPPORT_FOUND True if Qt3Support was found.
+-# QT_QTASSISTANT_FOUND True if QtAssistant was found.
+-# QT_QTDBUS_FOUND True if QtDBus was found.
+-# QT_QTDESIGNER_FOUND True if QtDesigner was found.
+-# QT_QTDESIGNERCOMPONENTS True if QtDesignerComponents was found.
+-# QT_QTMOTIF_FOUND True if QtMotif was found.
+-# QT_QTNETWORK_FOUND True if QtNetwork was found.
+-# QT_QTNSPLUGIN_FOUND True if QtNsPlugin was found.
+-# QT_QTOPENGL_FOUND True if QtOpenGL was found.
+-# QT_QTSQL_FOUND True if QtSql was found.
+-# QT_QTXML_FOUND True if QtXml was found.
+-# QT_QTSVG_FOUND True if QtSvg was found.
+-# QT_QTSCRIPT_FOUND True if QtScript was found.
+-# QT_QTTEST_FOUND True if QtTest was found.
+-# QT_QTUITOOLS_FOUND True if QtUiTools was found.
+-#
+-# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
+-#
+-# QT_INCLUDES List of paths to all include directories of
+-# Qt4 QT_INCLUDE_DIR and QT_QTCORE_INCLUDE_DIR are
+-# always in this variable even if NOTFOUND,
+-# all other INCLUDE_DIRS are
+-# only added if they are found.
+-#
+-# QT_INCLUDE_DIR Path to "include" of Qt4
+-# QT_QT_INCLUDE_DIR Path to "include/Qt"
+-# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support"
+-# QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant"
+-# QT_QTCORE_INCLUDE_DIR Path to "include/QtCore"
+-# QT_QTDESIGNER_INCLUDE_DIR Path to "include/QtDesigner"
+-# QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR Path to "include/QtDesigner"
+-# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus"
+-# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui"
+-# QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif"
+-# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork"
+-# QT_QTNSPLUGIN_INCLUDE_DIR Path to "include/QtNsPlugin"
+-# QT_QTOPENGL_INCLUDE_DIR Path to "include/QtOpenGL"
+-# QT_QTSQL_INCLUDE_DIR Path to "include/QtSql"
+-# QT_QTXML_INCLUDE_DIR Path to "include/QtXml"
+-# QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg"
+-# QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript"
+-# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest"
+-#
+-# QT_LIBRARY_DIR Path to "lib" of Qt4
+-#
+-# QT_PLUGINS_DIR Path to "plugins" for Qt4
+-#
+-# For every library of Qt, a QT_QTFOO_LIBRARY variable is defined, with the full path to the library.
+-#
+-# So there are the following variables:
+-# The Qt3Support library: QT_QT3SUPPORT_LIBRARY
+-#
+-# The QtAssistant library: QT_QTASSISTANT_LIBRARY
+-#
+-# The QtCore library: QT_QTCORE_LIBRARY
+-#
+-# The QtDBus library: QT_QTDBUS_LIBRARY
+-#
+-# The QtDesigner library: QT_QTDESIGNER_LIBRARY
+-#
+-# The QtDesignerComponents library: QT_QTDESIGNERCOMPONENTS_LIBRARY
+-#
+-# The QtGui library: QT_QTGUI_LIBRARY
+-#
+-# The QtMotif library: QT_QTMOTIF_LIBRARY
+-#
+-# The QtNetwork library: QT_QTNETWORK_LIBRARY
+-#
+-# The QtNsPLugin library: QT_QTNSPLUGIN_LIBRARY
+-#
+-# The QtOpenGL library: QT_QTOPENGL_LIBRARY
+-#
+-# The QtSql library: QT_QTSQL_LIBRARY
+-#
+-# The QtXml library: QT_QTXML_LIBRARY
+-#
+-# The QtSvg library: QT_QTSVG_LIBRARY
+-#
+-# The QtScript library: QT_QTSCRIPT_LIBRARY
+-#
+-# The QtTest library: QT_QTTEST_LIBRARY
+-#
+-# The qtmain library for Windows QT_QTMAIN_LIBRARY
+-#
+-# The QtUiTools library: QT_QTUITOOLS_LIBRARY
+-#
+-# also defined, but NOT for general use are
+-# QT_MOC_EXECUTABLE Where to find the moc tool.
+-# QT_UIC_EXECUTABLE Where to find the uic tool.
+-# QT_UIC3_EXECUTABLE Where to find the uic3 tool.
+-# QT_RCC_EXECUTABLE Where to find the rcc tool
+-# QT_DBUSCPP2XML_EXECUTABLE Where to find the qdbuscpp2xml tool.
+-# QT_DBUSXML2CPP_EXECUTABLE Where to find the qdbusxml2cpp tool.
+-#
+-# QT_DOC_DIR Path to "doc" of Qt4
+-# QT_MKSPECS_DIR Path to "mkspecs" of Qt4
+-#
+-#
+-# These are around for backwards compatibility
+-# they will be set
+-# QT_WRAP_CPP Set true if QT_MOC_EXECUTABLE is found
+-# QT_WRAP_UI Set true if QT_UIC_EXECUTABLE is found
+-#
+-# These variables do _NOT_ have any effect anymore (compared to FindQt.cmake)
+-# QT_MT_REQUIRED Qt4 is now always multithreaded
+-#
+-# These variables are set to "" Because Qt structure changed
+-# (They make no sense in Qt4)
+-# QT_QT_LIBRARY Qt-Library is now split
+-
+-# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
+-# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+-
+-
+-INCLUDE(CheckSymbolExists)
+-INCLUDE(MacroAddFileDependencies)
+-INCLUDE(MacroPushRequiredVars)
+-
+-SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
+-
+-SET( QT_DEFINITIONS "")
+-
+-IF (WIN32)
+- SET(QT_DEFINITIONS -DQT_DLL)
+-ENDIF(WIN32)
+-
+-SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
+-
+-# macro for asking qmake to process pro files
+-MACRO(QT_QUERY_QMAKE outvar invar)
+- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
+- "message(CMAKE_MESSAGE<$$${invar}>)")
+-
+- EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
+- WORKING_DIRECTORY
+- ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
+- OUTPUT_VARIABLE _qmake_query_output
+- ERROR_VARIABLE _qmake_query_output )
+-
+- FILE(REMOVE_RECURSE
+- "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
+-
+- STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
+-ENDMACRO(QT_QUERY_QMAKE)
+-
+-# check for qmake
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+- $ENV{QTDIR}/bin
+-)
+-
+-IF (QT_QMAKE_EXECUTABLE)
+-
+- SET(QT4_QMAKE_FOUND FALSE)
+-
+- EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+-
+- # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
+- IF("${QTVERSION}" MATCHES "Unknown")
+- SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
+- FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+- $ENV{QTDIR}/bin
+- )
+- IF(QT_QMAKE_EXECUTABLE)
+- EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+- ENDIF(QT_QMAKE_EXECUTABLE)
+- ENDIF("${QTVERSION}" MATCHES "Unknown")
+-
+- # check that we found the Qt4 qmake, Qt3 qmake output won't match here
+- STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
+- IF (qt_version_tmp)
+-
+- # we need at least version 4.0.0
+- IF (NOT QT_MIN_VERSION)
+- SET(QT_MIN_VERSION "4.0.0")
+- ENDIF (NOT QT_MIN_VERSION)
+-
+- #now parse the parts of the user given version string into variables
+- STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qt_major_vers "${QT_MIN_VERSION}")
+- IF (NOT req_qt_major_vers)
+- MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"")
+- ENDIF (NOT req_qt_major_vers)
+-
+- # now parse the parts of the user given version string into variables
+- STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
+- STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
+- STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
+-
+- IF (NOT req_qt_major_vers EQUAL 4)
+- MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"")
+- ENDIF (NOT req_qt_major_vers EQUAL 4)
+-
+- # and now the version string given by qmake
+- STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_qt_major_vers "${QTVERSION}")
+- STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" found_qt_minor_vers "${QTVERSION}")
+- STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" found_qt_patch_vers "${QTVERSION}")
+-
+- # compute an overall version number which can be compared at once
+- MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
+- MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
+-
+- IF (found_vers LESS req_vers)
+- SET(QT4_QMAKE_FOUND FALSE)
+- SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
+- ELSE (found_vers LESS req_vers)
+- SET(QT4_QMAKE_FOUND TRUE)
+- ENDIF (found_vers LESS req_vers)
+- ENDIF (qt_version_tmp)
+-
+-ENDIF (QT_QMAKE_EXECUTABLE)
+-
+-IF (QT4_QMAKE_FOUND)
+-
+- # ask qmake for the library dir
+- # Set QT_LIBRARY_DIR
+- IF (NOT QT_LIBRARY_DIR)
+- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_INSTALL_LIBS"
+- OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
+- IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
+- SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
+- ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
+- MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
+- MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
+- ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
+- ENDIF(NOT QT_LIBRARY_DIR)
+-
+- IF (APPLE)
+- IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_USE_FRAMEWORKS ON
+- CACHE BOOL "Set to ON if Qt build uses frameworks.")
+- ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_USE_FRAMEWORKS OFF
+- CACHE BOOL "Set to ON if Qt build uses frameworks.")
+- ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-
+- MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
+- ENDIF (APPLE)
+-
+- # ask qmake for the binary dir
+- IF (NOT QT_BINARY_DIR)
+- EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_INSTALL_BINS"
+- OUTPUT_VARIABLE qt_bins )
+- SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
+- ENDIF (NOT QT_BINARY_DIR)
+-
+- # ask qmake for the include dir
+- IF (NOT QT_HEADERS_DIR)
+- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_INSTALL_HEADERS"
+- OUTPUT_VARIABLE qt_headers )
+- SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
+- ENDIF(NOT QT_HEADERS_DIR)
+-
+-
+- # ask qmake for the documentation directory
+- IF (NOT QT_DOC_DIR)
+- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_INSTALL_DOCS"
+- OUTPUT_VARIABLE qt_doc_dir )
+- SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
+- ENDIF (NOT QT_DOC_DIR)
+-
+- # ask qmake for the mkspecs directory
+- IF (NOT QT_MKSPECS_DIR)
+- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QMAKE_MKSPECS"
+- OUTPUT_VARIABLE qt_mkspecs_dir )
+- SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
+- ENDIF (NOT QT_MKSPECS_DIR)
+-
+- # ask qmake for the plugins directory
+- IF (NOT QT_PLUGINS_DIR)
+- EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+- ARGS "-query QT_INSTALL_PLUGINS"
+- OUTPUT_VARIABLE qt_plugins_dir )
+- SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
+- ENDIF (NOT QT_PLUGINS_DIR)
+- ########################################
+- #
+- # Setting the INCLUDE-Variables
+- #
+- ########################################
+-
+- FIND_PATH(QT_QTCORE_INCLUDE_DIR QtGlobal
+- ${QT_HEADERS_DIR}/QtCore
+- ${QT_LIBRARY_DIR}/QtCore.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
+- IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+- IF (QT_USE_FRAMEWORKS)
+- SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
+- ELSE (QT_USE_FRAMEWORKS)
+- STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
+- SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
+- ENDIF (QT_USE_FRAMEWORKS)
+- ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+-
+- IF( NOT QT_INCLUDE_DIR)
+- IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
+- ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- ENDIF( NOT QT_INCLUDE_DIR)
+-
+- #############################################
+- #
+- # Find out what window system we're using
+- #
+- #############################################
+- # Save required includes and required_flags variables
+- macro_push_required_vars()
+- # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
+- SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
+- # On Mac OS X when Qt has framework support, also add the framework path
+- IF( QT_USE_FRAMEWORKS )
+- SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
+- ENDIF( QT_USE_FRAMEWORKS )
+- # Check for Window system symbols (note: only one should end up being set)
+- CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
+- CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
+- CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
+- CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
+-
+- IF (QT_QTCOPY_REQUIRED)
+- CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
+- IF (NOT QT_IS_QTCOPY)
+- MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
+- ENDIF (NOT QT_IS_QTCOPY)
+- ENDIF (QT_QTCOPY_REQUIRED)
+-
+- # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables
+- macro_pop_required_vars()
+- #
+- #############################################
+-
+- IF (QT_USE_FRAMEWORKS)
+- SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
+- ENDIF (QT_USE_FRAMEWORKS)
+-
+- # Set QT_QT3SUPPORT_INCLUDE_DIR
+- FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
+- PATHS
+- ${QT_INCLUDE_DIR}/Qt3Support
+- ${QT_LIBRARY_DIR}/Qt3Support.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QT_INCLUDE_DIR
+- FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
+- PATHS
+- ${QT_INCLUDE_DIR}/Qt
+- ${QT_LIBRARY_DIR}/QtCore.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTGUI_INCLUDE_DIR
+- FIND_PATH(QT_QTGUI_INCLUDE_DIR QtGui
+- PATHS
+- ${QT_INCLUDE_DIR}/QtGui
+- ${QT_LIBRARY_DIR}/QtGui.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTSVG_INCLUDE_DIR
+- FIND_PATH(QT_QTSVG_INCLUDE_DIR QtSvg
+- PATHS
+- ${QT_INCLUDE_DIR}/QtSvg
+- ${QT_LIBRARY_DIR}/QtSvg.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTSVG_INCLUDE_DIR
+- FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript
+- PATHS
+- ${QT_INCLUDE_DIR}/QtScript
+- ${QT_LIBRARY_DIR}/QtScript.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTTEST_INCLUDE_DIR
+- FIND_PATH(QT_QTTEST_INCLUDE_DIR QtTest
+- PATHS
+- ${QT_INCLUDE_DIR}/QtTest
+- ${QT_LIBRARY_DIR}/QtTest.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTUITOOLS_INCLUDE_DIR
+- FIND_PATH(QT_QTUITOOLS_INCLUDE_DIR QtUiTools
+- PATHS
+- ${QT_INCLUDE_DIR}/QtUiTools
+- ${QT_LIBRARY_DIR}/QtUiTools.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+-
+-
+- # Set QT_QTMOTIF_INCLUDE_DIR
+- IF(Q_WS_X11)
+- FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif PATHS ${QT_INCLUDE_DIR}/QtMotif NO_DEFAULT_PATH )
+- ENDIF(Q_WS_X11)
+-
+- # Set QT_QTNETWORK_INCLUDE_DIR
+- FIND_PATH(QT_QTNETWORK_INCLUDE_DIR QtNetwork
+- PATHS
+- ${QT_INCLUDE_DIR}/QtNetwork
+- ${QT_LIBRARY_DIR}/QtNetwork.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTNSPLUGIN_INCLUDE_DIR
+- FIND_PATH(QT_QTNSPLUGIN_INCLUDE_DIR QtNsPlugin
+- PATHS
+- ${QT_INCLUDE_DIR}/QtNsPlugin
+- ${QT_LIBRARY_DIR}/QtNsPlugin.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTOPENGL_INCLUDE_DIR
+- FIND_PATH(QT_QTOPENGL_INCLUDE_DIR QtOpenGL
+- PATHS
+- ${QT_INCLUDE_DIR}/QtOpenGL
+- ${QT_LIBRARY_DIR}/QtOpenGL.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTSQL_INCLUDE_DIR
+- FIND_PATH(QT_QTSQL_INCLUDE_DIR QtSql
+- PATHS
+- ${QT_INCLUDE_DIR}/QtSql
+- ${QT_LIBRARY_DIR}/QtSql.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTXML_INCLUDE_DIR
+- FIND_PATH(QT_QTXML_INCLUDE_DIR QtXml
+- PATHS
+- ${QT_INCLUDE_DIR}/QtXml
+- ${QT_LIBRARY_DIR}/QtXml.framework/Headers
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTASSISTANT_INCLUDE_DIR
+- FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QtAssistant
+- PATHS
+- ${QT_INCLUDE_DIR}/QtAssistant
+- ${QT_HEADERS_DIR}/QtAssistant
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTDESIGNER_INCLUDE_DIR
+- FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
+- PATHS
+- ${QT_INCLUDE_DIR}/QtDesigner
+- ${QT_HEADERS_DIR}/QtDesigner
+- NO_DEFAULT_PATH
+- )
+-
+- # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
+- FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
+- PATHS
+- ${QT_INCLUDE_DIR}/QtDesigner
+- ${QT_HEADERS_DIR}/QtDesigner
+- NO_DEFAULT_PATH
+- )
+-
+-
+- # Set QT_QTDBUS_INCLUDE_DIR
+- FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
+- PATHS
+- ${QT_INCLUDE_DIR}/QtDBus
+- ${QT_HEADERS_DIR}/QtDBus
+- NO_DEFAULT_PATH
+- )
+-
+- # Make variables changeble to the advanced user
+- MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
+-
+- # Set QT_INCLUDES
+- SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
+-
+-
+- ########################################
+- #
+- # Setting the LIBRARY-Variables
+- #
+- ########################################
+-
+- IF (QT_USE_FRAMEWORKS)
+- # If FIND_LIBRARY found libraries in Apple frameworks, we would NOT have
+- # to jump through these hoops.
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_QTCORE_FOUND TRUE)
+- SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_QTCORE_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+- SET(QT_QTGUI_FOUND TRUE)
+- SET(QT_QTGUI_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtGui" CACHE STRING "The QtGui library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+- SET(QT_QTGUI_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+- SET(QT_QT3SUPPORT_FOUND TRUE)
+- SET(QT_QT3SUPPORT_LIBRARY "-F${QT_LIBRARY_DIR} -framework Qt3Support" CACHE STRING "The Qt3Support library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+- SET(QT_QT3SUPPORT_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+- SET(QT_QTNETWORK_FOUND TRUE)
+- SET(QT_QTNETWORK_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtNetwork" CACHE STRING "The QtNetwork library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+- SET(QT_QTNETWORK_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+- SET(QT_QTOPENGL_FOUND TRUE)
+- SET(QT_QTOPENGL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtOpenGL" CACHE STRING "The QtOpenGL library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+- SET(QT_QTOPENGL_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+- SET(QT_QTSQL_FOUND TRUE)
+- SET(QT_QTSQL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSql" CACHE STRING "The QtSql library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+- SET(QT_QTSQL_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+- SET(QT_QTXML_FOUND TRUE)
+- SET(QT_QTXML_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXml" CACHE STRING "The QtXml library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+- SET(QT_QTXML_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+- SET(QT_QTSVG_FOUND TRUE)
+- SET(QT_QTSVG_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSvg" CACHE STRING "The QtSvg library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+- SET(QT_QTSVG_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+- SET(QT_QTDBUS_FOUND TRUE)
+- SET(QT_QTDBUS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtDBus" CACHE STRING "The QtDBus library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+- SET(QT_QTDBUS_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+- SET(QT_QTTEST_FOUND TRUE)
+- SET(QT_QTTEST_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtTest" CACHE STRING "The QtTest library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+- SET(QT_QTTEST_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+-
+- # WTF? why don't we have frameworks? :P
+- # Set QT_QTUITOOLS_LIBRARY
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} )
+- # Set QT_QTSCRIPT_LIBRARY
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} )
+-
+- ELSE (QT_USE_FRAMEWORKS)
+-
+- # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
+- FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+-
+- # Set QT_QT3SUPPORT_LIBRARY
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTGUI_LIBRARY
+- FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTMOTIF_LIBRARY
+- IF(Q_WS_X11)
+- FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- ENDIF(Q_WS_X11)
+-
+- # Set QT_QTNETWORK_LIBRARY
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTNSPLUGIN_LIBRARY
+- FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTOPENGL_LIBRARY
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSQL_LIBRARY
+- FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTXML_LIBRARY
+- FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSVG_LIBRARY
+- FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSCRIPT_LIBRARY
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTUITOOLS_LIBRARY
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTTEST_LIBRARY
+- FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- IF(MSVC)
+- FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG NAMES Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTGUI_LIBRARY_RELEASE NAMES QtGui4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTGUI_LIBRARY_DEBUG NAMES QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY_DEBUG NAMES QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY_RELEASE NAMES QtOpenGL4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY_DEBUG NAMES QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSQL_LIBRARY_RELEASE NAMES QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSQL_LIBRARY_DEBUG NAMES QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTXML_LIBRARY_RELEASE NAMES QtXml4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTXML_LIBRARY_DEBUG NAMES QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSVG_LIBRARY_RELEASE NAMES QtSvg4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSVG_LIBRARY_DEBUG NAMES QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG NAMES QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG NAMES QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- ENDIF(MSVC)
+- ENDIF (QT_USE_FRAMEWORKS)
+-
+- IF( NOT QT_QTCORE_LIBRARY )
+- IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check CMakeFiles/CMakeError.log for more details.")
+- ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- ENDIF( NOT QT_QTCORE_LIBRARY )
+-
+- # Set QT_QTASSISTANT_LIBRARY
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTDESIGNER_LIBRARY
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTMAIN_LIBRARY
+- IF(WIN32)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY NAMES qtmain qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- ENDIF(WIN32)
+-
+- ############################################
+- #
+- # Check the existence of the libraries.
+- #
+- ############################################
+-
+- MACRO (_QT4_ADJUST_LIB_VARS basename)
+- IF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG)
+-
+- IF(MSVC)
+- # Both set
+- IF (QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+- ENDIF (QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+-
+- # Only debug was found
+- IF (NOT QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG})
+- ENDIF (NOT QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+-
+- # Only release was found
+- IF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE})
+- ENDIF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+-
+- # Hmm, is this used anywhere ? Yes, in UseQt4.cmake. We are currently incompatible :-(
+- SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY} debug ${QT_${basename}_LIBRARY_DEBUG})
+-
+- ENDIF(MSVC)
+-
+- SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
+-
+- IF (QT_${basename}_LIBRARY)
+- SET(QT_${basename}_FOUND 1)
+- ENDIF (QT_${basename}_LIBRARY)
+-
+- ENDIF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG)
+-
+- IF (QT_${basename}_INCLUDE_DIR)
+- #add the include directory to QT_INCLUDES
+- SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
+- ENDIF (QT_${basename}_INCLUDE_DIR)
+-
+- # Make variables changeble to the advanced user
+- MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_INCLUDE_DIR)
+- ENDMACRO (_QT4_ADJUST_LIB_VARS)
+-
+-
+- # Set QT_xyz_LIBRARY variable and add
+- # library include path to QT_INCLUDES
+- _QT4_ADJUST_LIB_VARS(QTCORE)
+- _QT4_ADJUST_LIB_VARS(QTGUI)
+- _QT4_ADJUST_LIB_VARS(QT3SUPPORT)
+- _QT4_ADJUST_LIB_VARS(QTASSISTANT)
+- _QT4_ADJUST_LIB_VARS(QTDESIGNER)
+- _QT4_ADJUST_LIB_VARS(QTDESIGNERCOMPONENTS)
+- _QT4_ADJUST_LIB_VARS(QTNETWORK)
+- _QT4_ADJUST_LIB_VARS(QTNSPLUGIN)
+- _QT4_ADJUST_LIB_VARS(QTOPENGL)
+- _QT4_ADJUST_LIB_VARS(QTSQL)
+- _QT4_ADJUST_LIB_VARS(QTXML)
+- _QT4_ADJUST_LIB_VARS(QTSVG)
+- _QT4_ADJUST_LIB_VARS(QTSCRIPT)
+- _QT4_ADJUST_LIB_VARS(QTUITOOLS)
+- _QT4_ADJUST_LIB_VARS(QTTEST)
+- _QT4_ADJUST_LIB_VARS(QTDBUS)
+-
+-
+- # platform dependent libraries
+- IF(Q_WS_X11)
+- _QT4_ADJUST_LIB_VARS(QTMOTIF)
+- ENDIF(Q_WS_X11)
+- IF(WIN32)
+- _QT4_ADJUST_LIB_VARS(QTMAIN)
+- ENDIF(WIN32)
+-
+- #######################################
+- #
+- # Check the executables of Qt
+- # ( moc, uic, rcc )
+- #
+- #######################################
+-
+-
+- # find moc and uic using qmake
+- QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
+- QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
+-
+- FILE(TO_CMAKE_PATH
+- "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
+- FILE(TO_CMAKE_PATH
+- "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+-
+- SET(QT_MOC_EXECUTABLE
+- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
+- SET(QT_UIC_EXECUTABLE
+- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
+-
+- FIND_PROGRAM(QT_UIC3_EXECUTABLE
+- NAMES uic3
+- PATHS ${QT_BINARY_DIR}
+- NO_DEFAULT_PATH
+- )
+-
+- FIND_PROGRAM(QT_RCC_EXECUTABLE
+- NAMES rcc
+- PATHS ${QT_BINARY_DIR}
+- NO_DEFAULT_PATH
+- )
+-
+- FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
+- NAMES qdbuscpp2xml
+- PATHS ${QT_BINARY_DIR}
+- NO_DEFAULT_PATH
+- )
+-
+- FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
+- NAMES qdbusxml2cpp
+- PATHS ${QT_BINARY_DIR}
+- NO_DEFAULT_PATH
+- )
+-
+- IF (QT_MOC_EXECUTABLE)
+- SET(QT_WRAP_CPP "YES")
+- ENDIF (QT_MOC_EXECUTABLE)
+-
+- IF (QT_UIC_EXECUTABLE)
+- SET(QT_WRAP_UI "YES")
+- ENDIF (QT_UIC_EXECUTABLE)
+-
+-
+-
+- MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE)
+-
+- ######################################
+- #
+- # Macros for building Qt files
+- #
+- ######################################
+-
+- MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
+- SET(${_moc_INC_DIRS})
+- GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
+-
+- FOREACH(_current ${_inc_DIRS})
+- SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
+- ENDFOREACH(_current ${_inc_DIRS})
+- ENDMACRO(QT4_GET_MOC_INC_DIRS)
+-
+-
+- MACRO (QT4_GENERATE_MOC infile outfile )
+- # get include dirs
+- QT4_GET_MOC_INC_DIRS(moc_includes)
+-
+- GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
+-
+- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+- COMMAND ${QT_MOC_EXECUTABLE}
+- ARGS ${moc_includes} -o ${outfile} ${abs_infile}
+- DEPENDS ${abs_infile})
+-
+- SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
+-
+- MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
+- ENDMACRO (QT4_GENERATE_MOC)
+-
+-
+- # QT4_WRAP_CPP(outfiles inputfile ... )
+- # TODO perhaps add support for -D, -U and other minor options
+-
+- MACRO (QT4_WRAP_CPP outfiles )
+- # get include dirs
+- QT4_GET_MOC_INC_DIRS(moc_includes)
+-
+- FOREACH (it ${ARGN})
+- GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
+- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+-
+- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
+- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+- COMMAND ${QT_MOC_EXECUTABLE}
+- ARGS ${moc_includes} -o ${outfile} ${it}
+- DEPENDS ${it})
+- SET(${outfiles} ${${outfiles}} ${outfile})
+- ENDFOREACH(it)
+-
+- ENDMACRO (QT4_WRAP_CPP)
+-
+-
+- # QT4_WRAP_UI(outfiles inputfile ... )
+-
+- MACRO (QT4_WRAP_UI outfiles )
+-
+- FOREACH (it ${ARGN})
+- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+- COMMAND ${QT_UIC_EXECUTABLE}
+- ARGS -o ${outfile} ${infile}
+- MAIN_DEPENDENCY ${infile})
+- SET(${outfiles} ${${outfiles}} ${outfile})
+- ENDFOREACH (it)
+-
+- ENDMACRO (QT4_WRAP_UI)
+-
+-
+- # QT4_ADD_RESOURCES(outfiles inputfile ... )
+- # TODO perhaps consider adding support for compression and root options to rcc
+-
+- MACRO (QT4_ADD_RESOURCES outfiles )
+-
+- FOREACH (it ${ARGN})
+- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+- GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
+- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+- # parse file for dependencies
+- FILE(READ "${infile}" _RC_FILE_CONTENTS)
+- STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+-
+- SET(_RC_DEPENDS)
+- FOREACH(_RC_FILE ${_RC_FILES})
+- STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+- SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}")
+- ENDFOREACH(_RC_FILE)
+- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+- COMMAND ${QT_RCC_EXECUTABLE}
+- ARGS -name ${outfilename} -o ${outfile} ${infile}
+- MAIN_DEPENDENCY ${infile}
+- DEPENDS ${_RC_DEPENDS})
+- SET(${outfiles} ${${outfiles}} ${outfile})
+- ENDFOREACH (it)
+-
+- ENDMACRO (QT4_ADD_RESOURCES)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
+- GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
+- SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+- SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+-
+- GET_SOURCE_FILE_PROPERTY(_nonamespace ${_infile} NO_NAMESPACE)
+- IF ( _nonamespace )
+- SET(_params -N -m -p)
+- ELSE ( _nonamespace )
+- SET(_params -m -p)
+- ENDIF ( _nonamespace )
+-
+- ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} ${_basename} ${_infile}
+- DEPENDS ${_infile})
+-
+- SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+-
+- QT4_GENERATE_MOC(${_header} ${_moc})
+-
+- SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+- MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+-
+- ENDMACRO(QT4_ADD_DBUS_INTERFACE)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE _sources _interface _basename)
+- SET_SOURCE_FILES_PROPERTIES(${_interface} PROPERTIES NO_NAMESPACE TRUE)
+- QT4_ADD_DBUS_INTERFACE(${_sources} ${_interface} ${_basename})
+- ENDMACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE)
+-
+- # Internal (avoid to duplicate code between QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE and QT4_ADD_DBUS_INTERFACES
+- MACRO(_QT4_ADD_DBUS_INTERFACES _sources _filename)
+- GET_FILENAME_COMPONENT(_infile ${_filename} ABSOLUTE)
+- # get the part before the ".xml" suffix
+- STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE})
+- STRING(TOLOWER ${_basename} _basename)
+- QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
+- ENDMACRO(_QT4_ADD_DBUS_INTERFACES)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACES _sources)
+- FOREACH (_current_FILE ${ARGN})
+- _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE})
+- ENDFOREACH (_current_FILE)
+- ENDMACRO(QT4_ADD_DBUS_INTERFACES)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE _sources)
+- FOREACH (_current_FILE ${ARGN})
+- SET_SOURCE_FILES_PROPERTIES(${_current_FILE} PROPERTIES NO_NAMESPACE TRUE)
+- _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE})
+- ENDFOREACH (_current_FILE)
+- ENDMACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE)
+-
+- MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
+- SET(_customName "${ARGV1}")
+- GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
+- GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
+-
+- IF (_customName)
+- SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+- ELSE (_customName)
+- SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
+- ENDIF (_customName)
+-
+- ADD_CUSTOM_COMMAND(OUTPUT ${_target}
+- COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_in_file} > ${_target}
+- DEPENDS ${_in_file}
+- )
+- ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
+-
+-
+- MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename )
+- GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
+-
+- SET(_optionalBasename "${ARGV4}")
+- IF (_optionalBasename)
+- SET(_basename ${_optionalBasename} )
+- ELSE (_optionalBasename)
+- STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
+- STRING(TOLOWER ${_basename} _basename)
+- ENDIF (_optionalBasename)
+-
+- SET(_optionalClassName "${ARGV5}")
+- SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+- SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+-
+- IF(_optionalClassName)
+- ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+- DEPENDS ${_infile}
+- )
+- ELSE(_optionalClassName)
+- ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
+- DEPENDS ${_infile}
+- )
+- ENDIF(_optionalClassName)
+-
+- QT4_GENERATE_MOC(${_header} ${_moc})
+- SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+- MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+-
+- SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+- ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
+-
+- MACRO(QT4_AUTOMOC)
+- QT4_GET_MOC_INC_DIRS(_moc_INCS)
+-
+- SET(_matching_FILES )
+- FOREACH (_current_FILE ${ARGN})
+-
+- GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+- # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
+- # here. this is required to make bouic work correctly:
+- # we need to add generated .cpp files to the sources (to compile them),
+- # but we cannot let automoc handle them, as the .cpp files don't exist yet when
+- # cmake is run for the very first time on them -> however the .cpp files might
+- # exist at a later run. at that time we need to skip them, so that we don't add two
+- # different rules for the same moc file
+- GET_SOURCE_FILE_PROPERTY(_skip ${_abs_FILE} SKIP_AUTOMOC)
+-
+- IF ( NOT _skip AND EXISTS ${_abs_FILE} )
+-
+- FILE(READ ${_abs_FILE} _contents)
+-
+- GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
+-
+- STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
+- IF(_match)
+- FOREACH (_current_MOC_INC ${_match})
+- STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+-
+- GET_filename_component(_basename ${_current_MOC} NAME_WE)
+- # SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
+- SET(_header ${_abs_PATH}/${_basename}.h)
+- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+- ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+- COMMAND ${QT_MOC_EXECUTABLE}
+- ARGS ${_moc_INCS} ${_header} -o ${_moc}
+- DEPENDS ${_header}
+- )
+-
+- MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+- ENDFOREACH (_current_MOC_INC)
+- ENDIF(_match)
+- ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} )
+- ENDFOREACH (_current_FILE)
+- ENDMACRO(QT4_AUTOMOC)
+-
+-
+-
+- ######################################
+- #
+- # decide if Qt got found
+- #
+- ######################################
+-
+- # if the includes,libraries,moc,uic and rcc are found then we have it
+- IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+- SET( QT4_FOUND "YES" )
+- IF( NOT Qt4_FIND_QUIETLY)
+- IF (WIN32)
+- MESSAGE(STATUS "Found Qt-Version ${QTVERSION} with qmake at ${QT_QMAKE_EXECUTABLE}")
+- ELSE (WIN32)
+- MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
+- ENDIF (WIN32)
+- ENDIF( NOT Qt4_FIND_QUIETLY)
+- ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+- SET( QT4_FOUND "NO")
+- SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
+- IF( Qt4_FIND_REQUIRED)
+- IF ( NOT QT_LIBRARY_DIR )
+- MESSAGE(STATUS "Qt libraries NOT found!")
+- ENDIF(NOT QT_LIBRARY_DIR )
+- IF ( NOT QT_INCLUDE_DIR )
+- MESSAGE(STATUS "Qt includes NOT found!")
+- ENDIF( NOT QT_INCLUDE_DIR )
+- IF ( NOT QT_MOC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's moc NOT found!")
+- ENDIF( NOT QT_MOC_EXECUTABLE )
+- IF ( NOT QT_UIC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's uic NOT found!")
+- ENDIF( NOT QT_UIC_EXECUTABLE )
+- IF ( NOT QT_RCC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's rcc NOT found!")
+- ENDIF( NOT QT_RCC_EXECUTABLE )
+- MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
+- ENDIF( Qt4_FIND_REQUIRED)
+- ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+- SET(QT_FOUND ${QT4_FOUND})
+-
+-
+- #######################################
+- #
+- # System dependent settings
+- #
+- #######################################
+- # for unix add X11 stuff
+- IF(UNIX)
+- # on OS X X11 may not be required
+- IF (Q_WS_X11)
+- FIND_PACKAGE(X11 REQUIRED)
+- ENDIF (Q_WS_X11)
+- FIND_PACKAGE(Threads)
+- SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+- ENDIF(UNIX)
+-
+-
+- #######################################
+- #
+- # compatibility settings
+- #
+- #######################################
+- # Backwards compatibility for CMake1.4 and 1.2
+- SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
+- SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
+-
+- SET( QT_QT_LIBRARY "")
+-
+-ELSE(QT4_QMAKE_FOUND)
+-
+- SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
+- IF(Qt4_FIND_REQUIRED)
+- IF(QT4_INSTALLED_VERSION_TOO_OLD)
+- MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+- ELSE(QT4_INSTALLED_VERSION_TOO_OLD)
+- MESSAGE( FATAL_ERROR "Qt qmake not found!")
+- ENDIF(QT4_INSTALLED_VERSION_TOO_OLD)
+- ELSE(Qt4_FIND_REQUIRED)
+- IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
+- MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+- ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
+- ENDIF(Qt4_FIND_REQUIRED)
+-
+-ENDIF (QT4_QMAKE_FOUND)
+-
Added: kde-extras/strigi/branches/experimental/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff
===================================================================
--- kde-extras/strigi/branches/experimental/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,43 @@
+--- a/src/daemon/dbus/dbuscpp/dbusmessagereader.h
++++ b/src/daemon/dbus/dbuscpp/dbusmessagereader.h
+@@ -27,6 +27,10 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <strigi/strigiconfig.h>
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
+
+ class DBusMessageReader {
+ private:
+--- a/src/daemon/dbus/dbuscpp/dbusmessagewriter.h
++++ b/src/daemon/dbus/dbuscpp/dbusmessagewriter.h
+@@ -24,6 +24,7 @@
+ #include <set>
+ #include <map>
+ #include <vector>
++#include <strigi/strigiconfig.h>
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+--- a/src/luceneindexer/luceneindexer.cpp
++++ b/src/luceneindexer/luceneindexer.cpp
+@@ -21,6 +21,7 @@
+ #include "diranalyzer.h"
+ #include "indexpluginloader.h"
+ #include "analyzerconfiguration.h"
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ #include <iostream>
+--- a/src/streamanalyzer/indexpluginloader.cpp
++++ b/src/streamanalyzer/indexpluginloader.cpp
+@@ -20,6 +20,7 @@
+ #include "indexpluginloader.h"
+ #include "indexmanager.h"
+ #include <iostream>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stgdirent.h>
Added: kde-extras/strigi/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/strigi/branches/experimental/debian/patches/series (rev 0)
+++ kde-extras/strigi/branches/experimental/debian/patches/series 2009-01-03 18:28:59 UTC (rev 13110)
@@ -0,0 +1,3 @@
+01_remove_FindQt4.cmake_local_copy.diff
+03_fix_ftbfs_with_gcc_4.4_bug505624.diff
+
Modified: kde-extras/strigi/branches/experimental/debian/rules
===================================================================
--- kde-extras/strigi/branches/experimental/debian/rules 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/rules 2009-01-03 18:28:59 UTC (rev 13110)
@@ -4,14 +4,29 @@
UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2
URL = http://www.vandenoever.info/software/strigi/$(UPFILENAME)
-include debian/cmake.mk
+include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CMAKE_EXTRA_FLAGS = -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=ON
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/')
+DEB_CMAKE_EXTRA_FLAGS += \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+
+binary-install/deskbar-plugins-strigi::
+ install -D -p -m644 src/searchclient/strigi.py \
+ debian/deskbar-plugins-strigi/usr/lib/deskbar-applet/handlers/strigi.py
+ dh_pysupport /usr/lib/deskbar-applet/handlers
+
+clean::
+ # generate on build
+ rm -f debian/shlibs.local
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -19,3 +34,10 @@
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo Converting $(UPFILENAME) to $(FILENAME)
@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
+
+# Generate shlibs local files
+$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
+ if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
+ sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
+ fi
+
Modified: kde-extras/strigi/branches/experimental/debian/strigi-daemon.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/strigi-daemon.install 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/strigi-daemon.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -1,2 +1,3 @@
usr/bin/luceneindexer
usr/bin/strigidaemon
+usr/share/dbus-1/services
Modified: kde-extras/strigi/branches/experimental/debian/strigi-utils.install
===================================================================
--- kde-extras/strigi/branches/experimental/debian/strigi-utils.install 2009-01-03 17:11:21 UTC (rev 13109)
+++ kde-extras/strigi/branches/experimental/debian/strigi-utils.install 2009-01-03 18:28:59 UTC (rev 13110)
@@ -1,3 +1,4 @@
usr/bin/deepfind
usr/bin/deepgrep
+usr/bin/strigicmd
usr/bin/xmlindexer
Deleted: kde-extras/strigi/branches/experimental/debian/watch
More information about the pkg-kde-commits
mailing list