summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/gcc4.7-ftbfs.patch16
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 48b9c1b..fcd3654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bibletime (2.9.1-2) unstable; urgency=low
+
+ * Disable -Werror to work-around FTBFS with gcc-4.7 (Closes: #667113)
+
+ -- Dmitrijs Ledkovs <xnox@debian.org> Tue, 17 Apr 2012 22:40:49 +0100
+
bibletime (2.9.1-1) unstable; urgency=low
[ Jonathan Marsden ]
diff --git a/debian/patches/gcc4.7-ftbfs.patch b/debian/patches/gcc4.7-ftbfs.patch
new file mode 100644
index 0000000..750381e
--- /dev/null
+++ b/debian/patches/gcc4.7-ftbfs.patch
@@ -0,0 +1,16 @@
+Description: Work-around FTBFS with gcc4.7 by disabling -Werror
+Author: Dmitrijs Ledkovs <xnox@debian.org>
+
+Index: bibletime/CMakeLists.txt
+===================================================================
+--- bibletime.orig/CMakeLists.txt 2012-04-14 17:26:58.958854000 +0100
++++ bibletime/CMakeLists.txt 2012-04-17 22:38:01.936487437 +0100
+@@ -194,7 +194,7 @@
+ SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /ZI")
+ ELSE (MSVC)
+ SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -fexceptions")
+- SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror -O2 -ggdb -fexceptions")
++ SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -O2 -ggdb -fexceptions")
+ ENDIF (MSVC)
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fd217ed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc4.7-ftbfs.patch