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

Proposed by Michael Terry on 2011-07-01
Status: Merged
Merged at revision: 12
Proposed branch: lp:~mterry/zeitgeist-datahub/fix-didrocks-ftbfs
Merge into: lp:~zeitgeist-packagers/zeitgeist-datahub/ubuntu
Diff against target: 34 lines (+16/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/ignore-patched-files.patch (+6/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mterry/zeitgeist-datahub/fix-didrocks-ftbfs
Reviewer Review Type Date Requested Status
Zeitgeist Debian/Ubuntu Packagers 2011-07-01 Pending
Review via email: mp+66629@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-01 13:30:42 +0000
3+++ debian/changelog 2011-07-01 15:36:25 +0000
4@@ -1,3 +1,12 @@
5+zeitgeist-datahub (0.7.0-0ubuntu3) oneiric; urgency=low
6+
7+ * debian/patch/ignore-patched-files:
8+ - Make check stops the build if it detects any files in
9+ .pc from quilt that aren't in POTFILES.in. This fixes the
10+ FTBFS
11+
12+ -- Michael Terry <mterry@ubuntu.com> Fri, 01 Jul 2011 16:34:22 +0100
13+
14 zeitgeist-datahub (0.7.0-0ubuntu2) oneiric; urgency=low
15
16 * debian/patches/nodisplay_autostart.patch:
17
18=== added file 'debian/patches/ignore-patched-files.patch'
19--- debian/patches/ignore-patched-files.patch 1970-01-01 00:00:00 +0000
20+++ debian/patches/ignore-patched-files.patch 2011-07-01 15:36:25 +0000
21@@ -0,0 +1,6 @@
22+Index: zeitgeist-datahub/po/POTFILES.skip
23+===================================================================
24+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
25++++ zeitgeist-datahub/po/POTFILES.skip 2011-07-01 16:30:40.442828275 +0100
26+@@ -0,0 +1 @@
27++.pc
28
29=== modified file 'debian/patches/series'
30--- debian/patches/series 2011-07-01 13:30:42 +0000
31+++ debian/patches/series 2011-07-01 15:36:25 +0000
32@@ -1,1 +1,2 @@
33+ignore-patched-files.patch
34 nodisplay_autostart.patch

Subscribers

People subscribed via source and target branches