Ubuntu
desktop-webmail package

Merge lp:~mterry/ubuntu/maverick/desktop-webmail/ftbfs-cairo into lp:ubuntu/maverick/desktop-webmail

  1. Maverick (10.10)
  2. ftbfs-cairo
  3. Merge into maverick
Proposed by Michael Terry
Status: Merged
Merged at revision: 4
Proposed branch: lp:~mterry/ubuntu/maverick/desktop-webmail/ftbfs-cairo
Merge into: lp:ubuntu/maverick/desktop-webmail
Diff against target: 84 lines (+39/-6)
5 files modified
debian/changelog (+7/-0)
debian/patches/ftbfs-no-pedantic.patch (+29/-0)
debian/patches/series (+1/-2)
src/Makefile.am (+1/-2)
src/Makefile.in (+1/-2)
To merge this branch: bzr merge lp:~mterry/ubuntu/maverick/desktop-webmail/ftbfs-cairo
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+37000@code.launchpad.net

Description of the change

Fix FTBFS: https://bugs.launchpad.net/desktop-webmail/+bug/651183

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 2010-04-15 01:36:27 +0000
3+++ debian/changelog 2010-09-29 14:55:58 +0000
4@@ -1,3 +1,10 @@
5+desktop-webmail (002-0ubuntu2) maverick; urgency=low
6+
7+ * debian/patches/ftbfs-no-pedantic.patch:
8+ - Fix FTBFS by not building with -pedantic (LP: #651183)
9+
10+ -- Michael Terry <mike@mterry.name> Wed, 29 Sep 2010 10:51:52 -0400
11+
12 desktop-webmail (002-0ubuntu1) lucid; urgency=low
13
14 * Release 002
15
16=== added file 'debian/patches/ftbfs-no-pedantic.patch'
17--- debian/patches/ftbfs-no-pedantic.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/ftbfs-no-pedantic.patch 2010-09-29 14:55:58 +0000
19@@ -0,0 +1,29 @@
20+Description: Don't build with pedantic, it's fragile
21+Author: Michael Terry <mike@mterry.name>
22+Bug-Ubuntu: https://bugs.launchpad.net/bugs/651183
23+Bug: https://bugs.launchpad.net/bugs/651183
24+
25+--- desktop-webmail-002.orig/src/Makefile.am
26++++ desktop-webmail-002/src/Makefile.am
27+@@ -3,8 +3,7 @@ bin_PROGRAMS = desktop-webmail
28+
29+ AM_CFLAGS = \
30+ -Wall \
31+- -Werror \
32+- -pedantic
33++ -Werror
34+
35+ desktop_webmail_SOURCE = desktop-webmail.c
36+ desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
37+--- desktop-webmail-002.orig/src/Makefile.in
38++++ desktop-webmail-002/src/Makefile.in
39+@@ -208,8 +208,7 @@ top_builddir = @top_builddir@
40+ top_srcdir = @top_srcdir@
41+ AM_CFLAGS = \
42+ -Wall \
43+- -Werror \
44+- -pedantic
45++ -Werror
46+
47+ desktop_webmail_SOURCE = desktop-webmail.c
48+ desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
49
50=== modified file 'debian/patches/series'
51--- debian/patches/series 2010-04-15 01:36:27 +0000
52+++ debian/patches/series 2010-09-29 14:55:58 +0000
53@@ -1,2 +1,1 @@
54-# empty
55-
56+ftbfs-no-pedantic.patch
57
58=== modified file 'src/Makefile.am'
59--- src/Makefile.am 2010-04-15 01:36:27 +0000
60+++ src/Makefile.am 2010-09-29 14:55:58 +0000
61@@ -3,8 +3,7 @@
62
63 AM_CFLAGS = \
64 -Wall \
65- -Werror \
66- -pedantic
67+ -Werror
68
69 desktop_webmail_SOURCE = desktop-webmail.c
70 desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
71
72=== modified file 'src/Makefile.in'
73--- src/Makefile.in 2010-04-15 01:36:27 +0000
74+++ src/Makefile.in 2010-09-29 14:55:58 +0000
75@@ -208,8 +208,7 @@
76 top_srcdir = @top_srcdir@
77 AM_CFLAGS = \
78 -Wall \
79- -Werror \
80- -pedantic
81+ -Werror
82
83 desktop_webmail_SOURCE = desktop-webmail.c
84 desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"

Subscribers

People subscribed via source and target branches

to all changes: