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

[Michael Terry]

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-15 01:36:27 +0000
+++ debian/changelog	2010-09-29 14:55:58 +0000
@@ -1,3 +1,10 @@
+desktop-webmail (002-0ubuntu2) maverick; urgency=low
+
+  * debian/patches/ftbfs-no-pedantic.patch:
+    - Fix FTBFS by not building with -pedantic (LP: #651183)
+
+ -- Michael Terry <[e-mail]>  Wed, 29 Sep 2010 10:51:52 -0400
+
 desktop-webmail (002-0ubuntu1) lucid; urgency=low
 
   * Release 002
 
=== added file 'debian/patches/ftbfs-no-pedantic.patch'
--- debian/patches/ftbfs-no-pedantic.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ftbfs-no-pedantic.patch	2010-09-29 14:55:58 +0000
@@ -0,0 +1,29 @@
+Description: Don't build with pedantic, it's fragile
+Author: Michael Terry <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/651183
+Bug: https://bugs.launchpad.net/bugs/651183
+
+--- desktop-webmail-002.orig/src/Makefile.am
++++ desktop-webmail-002/src/Makefile.am
+@@ -3,8 +3,7 @@ bin_PROGRAMS = desktop-webmail
+ 
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+-	-pedantic
++	-Werror
+ 
+ desktop_webmail_SOURCE = desktop-webmail.c
+ desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
+--- desktop-webmail-002.orig/src/Makefile.in
++++ desktop-webmail-002/src/Makefile.in
+@@ -208,8 +208,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = \
+ 	-Wall \
+-	-Werror \
+-	-pedantic
++	-Werror
+ 
+ desktop_webmail_SOURCE = desktop-webmail.c
+ desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-04-15 01:36:27 +0000
+++ debian/patches/series	2010-09-29 14:55:58 +0000
@@ -1,2 +1,1 @@
-# empty
-
+ftbfs-no-pedantic.patch
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-04-15 01:36:27 +0000
+++ src/Makefile.am	2010-09-29 14:55:58 +0000
@@ -3,8 +3,7 @@
 
 AM_CFLAGS = \
 	-Wall \
-	-Werror \
-	-pedantic
+	-Werror
 
 desktop_webmail_SOURCE = desktop-webmail.c
 desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-04-15 01:36:27 +0000
+++ src/Makefile.in	2010-09-29 14:55:58 +0000
@@ -208,8 +208,7 @@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = \
 	-Wall \
-	-Werror \
-	-pedantic
+	-Werror
 
 desktop_webmail_SOURCE = desktop-webmail.c
 desktop_webmail_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(UI_CFLAGS) -Dpkgdatadir=\"$(pkgdatadir)\" -Dsysconfpkgdir=\"$(sysconfdir)/desktop-webmail\"