Merge lp:~mterry/zeitgeist-datahub/fix-didrocks-ftbfs into lp:~zeitgeist-packagers/zeitgeist-datahub/ubuntu

[Michael Terry]

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-01 13:30:42 +0000
+++ debian/changelog	2011-07-01 15:36:25 +0000
@@ -1,3 +1,12 @@
+zeitgeist-datahub (0.7.0-0ubuntu3) oneiric; urgency=low
+
+  * debian/patch/ignore-patched-files:
+    - Make check stops the build if it detects any files in
+      .pc from quilt that aren't in POTFILES.in.  This fixes the
+      FTBFS
+
+ -- Michael Terry <[e-mail]>  Fri, 01 Jul 2011 16:34:22 +0100
+
 zeitgeist-datahub (0.7.0-0ubuntu2) oneiric; urgency=low
 
   * debian/patches/nodisplay_autostart.patch:
 
=== added file 'debian/patches/ignore-patched-files.patch'
--- debian/patches/ignore-patched-files.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ignore-patched-files.patch	2011-07-01 15:36:25 +0000
@@ -0,0 +1,6 @@
+Index: zeitgeist-datahub/po/POTFILES.skip
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ zeitgeist-datahub/po/POTFILES.skip	2011-07-01 16:30:40.442828275 +0100
+@@ -0,0 +1 @@
++.pc
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-01 13:30:42 +0000
+++ debian/patches/series	2011-07-01 15:36:25 +0000
@@ -1,1 +1,2 @@
+ignore-patched-files.patch
 nodisplay_autostart.patch