diff -u strigi-0.5.11/debian/libstreamanalyzer-dev.install strigi-0.5.11/debian/libstreamanalyzer-dev.install
--- strigi-0.5.11/debian/libstreamanalyzer-dev.install
+++ strigi-0.5.11/debian/libstreamanalyzer-dev.install
@@ -9,6 +9,7 @@
 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
diff -u strigi-0.5.11/debian/changelog strigi-0.5.11/debian/changelog
--- strigi-0.5.11/debian/changelog
+++ strigi-0.5.11/debian/changelog
@@ -1,15 +1,19 @@
-strigi (0.5.11-1ubuntu2) intrepid; urgency=low
+strigi (0.5.11-2ubuntu1~intrepid1~ppa1) intrepid; urgency=low
 
-  * Add kubuntu_01_add_indexpluginloader_header_file.diff from upstream
-    (LP: #282925)
+  * Backport to Intrepid, no changes necessary
 
- -- Harald Sitter <apachelogger@ubuntu.com>  Thu, 16 Oct 2008 00:29:51 +0200
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Mon, 01 Dec 2008 17:06:34 -0500
 
-strigi (0.5.11-1ubuntu1) intrepid; urgency=low
+strigi (0.5.11-2) unstable; urgency=low
 
-  * Rebuild upload to supersed the Hardy KDE 4 PPA upload
+  * 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)
 
- -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 10 Oct 2008 14:53:28 +0200
+ -- Fathi Boudra <fabo@debian.org>  Sun, 16 Nov 2008 13:25:39 +0100
 
 strigi (0.5.11-1) unstable; urgency=low
 
diff -u strigi-0.5.11/debian/control strigi-0.5.11/debian/control
--- strigi-0.5.11/debian/control
+++ strigi-0.5.11/debian/control
@@ -1,8 +1,7 @@
 Source: strigi
 Section: utils
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@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,
diff -u strigi-0.5.11/debian/patches/series strigi-0.5.11/debian/patches/series
--- strigi-0.5.11/debian/patches/series
+++ strigi-0.5.11/debian/patches/series
@@ -2 +2,3 @@
-kubuntu_01_add_indexpluginloader_header_file.diff -p0
+02_strigi_branch_r872482.diff
+03_fix_ftbfs_with_gcc_4.4_bug505624.diff
+
reverted:
--- strigi-0.5.11/debian/patches/kubuntu_01_add_indexpluginloader_header_file.diff
+++ strigi-0.5.11.orig/debian/patches/kubuntu_01_add_indexpluginloader_header_file.diff
@@ -1,12 +0,0 @@
-Index: src/streamanalyzer/CMakeLists.txt
-===================================================================
---- src/streamanalyzer/CMakeLists.txt.orig	2008-07-20 16:54:19.000000000 +0200
-+++ src/streamanalyzer/CMakeLists.txt	2008-10-16 00:28:28.000000000 +0200
-@@ -98,6 +98,7 @@
- 	indexreader.h
- 	indexmanager.h
- 	indexplugin.h
-+	indexpluginloader.h
- 	indexwriter.h
- 	variant.h
- 	query.h
only in patch2:
unchanged:
--- strigi-0.5.11.orig/debian/patches/02_strigi_branch_r872482.diff
+++ strigi-0.5.11/debian/patches/02_strigi_branch_r872482.diff
@@ -0,0 +1,10 @@
+--- a/src/streamanalyzer/CMakeLists.txt
++++ b/src/streamanalyzer/CMakeLists.txt
+@@ -98,6 +98,7 @@
+ 	indexreader.h
+ 	indexmanager.h
+ 	indexplugin.h
++	indexpluginloader.h
+ 	indexwriter.h
+ 	variant.h
+ 	query.h
only in patch2:
unchanged:
--- strigi-0.5.11.orig/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff
+++ strigi-0.5.11/debian/patches/03_fix_ftbfs_with_gcc_4.4_bug505624.diff
@@ -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>