diff -Nru bibledit-gtk-4.5/debian/changelog bibledit-gtk-4.5/debian/changelog --- bibledit-gtk-4.5/debian/changelog 2011-12-19 19:31:21.000000000 +0000 +++ bibledit-gtk-4.5/debian/changelog 2012-04-03 15:00:30.000000000 +0000 @@ -1,3 +1,12 @@ +bibledit-gtk (4.5-1ubuntu1) precise; urgency=low + + * glib-single-include.patch: Starting with glib 2.32 it is + now mandatory to include glib.h instead of individual + headers, or the compiler will generate an error. + Fixes FTBFS. From Debian BTS #665510. + + -- Andrew Starr-Bochicchio Tue, 03 Apr 2012 10:59:44 -0400 + bibledit-gtk (4.5-1) unstable; urgency=low * New upstream version 4.5. diff -Nru bibledit-gtk-4.5/debian/control bibledit-gtk-4.5/debian/control --- bibledit-gtk-4.5/debian/control 2011-12-19 19:30:30.000000000 +0000 +++ bibledit-gtk-4.5/debian/control 2012-04-03 15:00:49.000000000 +0000 @@ -6,7 +6,8 @@ libdbus-glib-1-dev (>= 0.70), openssh-client, autoconf, curl Section: gnome Priority: optional -Maintainer: Teus Benschop +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Teus Benschop Uploaders: Jonathan Marsden , Daniel Glassey , Dmitrijs Ledkovs diff -Nru bibledit-gtk-4.5/debian/patches/glib-single-include.patch bibledit-gtk-4.5/debian/patches/glib-single-include.patch --- bibledit-gtk-4.5/debian/patches/glib-single-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ bibledit-gtk-4.5/debian/patches/glib-single-include.patch 2012-04-03 14:53:18.000000000 +0000 @@ -0,0 +1,87 @@ +Description: including invidiual glib headers has been deprecated. + Starting with glib 2.32 it is now mandatory to include glib.h instead + of individual headers, or the compiler will generate an error. +Origin: vendor, Description +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665510 + +Index: bibledit-gtk-4.5/src/httpd.cpp +=================================================================== +--- bibledit-gtk-4.5.orig/src/httpd.cpp 2011-12-13 18:02:12.000000000 +0100 ++++ bibledit-gtk-4.5/src/httpd.cpp 2012-03-30 07:29:30.021039928 +0200 +@@ -21,7 +21,7 @@ + #include "libraries.h" + #include "utilities.h" + #include "httpd.h" +-#include ++#include + #include "bible.h" + #include "gwrappers.h" + #include "shell.h" +Index: bibledit-gtk-4.5/src/urltransport.cpp +=================================================================== +--- bibledit-gtk-4.5.orig/src/urltransport.cpp 2011-12-13 18:02:12.000000000 +0100 ++++ bibledit-gtk-4.5/src/urltransport.cpp 2012-03-30 07:29:30.109039925 +0200 +@@ -21,7 +21,7 @@ + #include "libraries.h" + #include "utilities.h" + #include "urltransport.h" +-#include ++#include + #include "gwrappers.h" + #include "tiny_utilities.h" + #include +Index: bibledit-gtk-4.5/src/ustring-utility.h +=================================================================== +--- bibledit-gtk-4.5.orig/src/ustring-utility.h 2011-12-13 18:02:12.000000000 +0100 ++++ bibledit-gtk-4.5/src/ustring-utility.h 2012-03-30 07:29:30.513039911 +0200 +@@ -23,9 +23,8 @@ + #ifndef INCLUDED_USTRING_UTILITY_H + #define INCLUDED_USTRING_UTILITY_H + +-#include +-#include "ustring.h" + #include ++#include "ustring.h" + + // Helper to deal with memory allocated + // by GLib functions in an exception-safe manner. +Index: bibledit-gtk-4.5/src/ustring.h +=================================================================== +--- bibledit-gtk-4.5.orig/src/ustring.h 2011-12-13 18:02:13.000000000 +0100 ++++ bibledit-gtk-4.5/src/ustring.h 2012-03-30 07:29:30.317039918 +0200 +@@ -23,8 +23,7 @@ + #ifndef INCLUDED_USTRING_H + #define INCLUDED_USTRING_H + +-#include +-#include ++#include + #include "ustring-glib.h" + #include + #include +Index: bibledit-gtk-4.5/src/vcs.cpp +=================================================================== +--- bibledit-gtk-4.5.orig/src/vcs.cpp 2011-12-13 18:02:12.000000000 +0100 ++++ bibledit-gtk-4.5/src/vcs.cpp 2012-03-30 07:29:30.197039922 +0200 +@@ -21,7 +21,7 @@ + #include "libraries.h" + #include "utilities.h" + #include "vcs.h" +-#include ++#include + #include "bible.h" + #include "gwrappers.h" + #include "shell.h" +Index: bibledit-gtk-4.5/src/windowsoutpost.cpp +=================================================================== +--- bibledit-gtk-4.5.orig/src/windowsoutpost.cpp 2011-12-13 18:02:12.000000000 +0100 ++++ bibledit-gtk-4.5/src/windowsoutpost.cpp 2012-03-30 07:29:30.429039914 +0200 +@@ -21,7 +21,7 @@ + #include "libraries.h" + #include "utilities.h" + #include "windowsoutpost.h" +-#include ++#include + #include "bible.h" + #include "gwrappers.h" + #include "shell.h" diff -Nru bibledit-gtk-4.5/debian/patches/series bibledit-gtk-4.5/debian/patches/series --- bibledit-gtk-4.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ bibledit-gtk-4.5/debian/patches/series 2012-04-03 14:52:10.000000000 +0000 @@ -0,0 +1 @@ +glib-single-include.patch