aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2012-01-23 13:07:14 +0100
committerMartin Pitt <martin.pitt@canonical.com>2012-01-23 13:07:14 +0100
commit6104c44c16a903741ddc34851fb948da0f21ec06 (patch)
tree8544395ef3392cd6ce78bd160c9e7e37c11550d2
parent666184e6d235e5d92f03bee9b559035f38d6f4e4 (diff)
downloadayatana-indicator-datetime-6104c44c16a903741ddc34851fb948da0f21ec06.tar.gz
ayatana-indicator-datetime-6104c44c16a903741ddc34851fb948da0f21ec06.tar.bz2
ayatana-indicator-datetime-6104c44c16a903741ddc34851fb948da0f21ec06.zip
Add disable_Werror.patch: Disable -Werror, causes build failures due to
deprecated symbols.
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/disable_Werror.patch31
-rw-r--r--debian/patches/series1
3 files changed, 37 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 55a29ee..b69252a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; urgency=low
+ [ Andreas Moog ]
* Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev.
+ [ Martin Pitt ]
+ * Add disable_Werror.patch: Disable -Werror, causes build failures due to
+ deprecated symbols.
+
-- Andreas Moog <amoog@ubuntu.com> Sat, 24 Dec 2011 21:07:57 +0100
indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low
diff --git a/debian/patches/disable_Werror.patch b/debian/patches/disable_Werror.patch
new file mode 100644
index 0000000..fc267ca
--- /dev/null
+++ b/debian/patches/disable_Werror.patch
@@ -0,0 +1,31 @@
+Description: Disable -Werror, causes build failures due to deprecated symbols.
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+Index: indicator-datetime/src/Makefile.am
+===================================================================
+--- indicator-datetime.orig/src/Makefile.am 2011-10-06 06:50:07.814203000 +0200
++++ indicator-datetime/src/Makefile.am 2012-01-23 13:04:31.541545936 +0100
+@@ -15,7 +15,6 @@
+ settings-shared.h
+ indicator_datetime_service_CFLAGS = \
+ -Wall \
+- -Werror \
+ $(SERVICE_CFLAGS) \
+ -DTIMEZONE_FILE="\"/etc/timezone\"" \
+ -DG_LOG_DOMAIN=\"Indicator-Datetime\"
+@@ -33,7 +32,6 @@
+ indicator-datetime.c
+ libdatetime_la_CFLAGS = \
+ $(INDICATOR_CFLAGS) \
+- -Wall -Werror \
+ -DTIMEZONE_FILE="\"/etc/timezone\"" \
+ -DG_LOG_DOMAIN=\"Indicator-Datetime\"
+ libdatetime_la_LIBADD = \
+@@ -53,7 +51,6 @@
+ settings-shared.h
+ libindicator_datetime_la_CFLAGS = \
+ -Wall \
+- -Werror \
+ -I$(top_srcdir)/libmap \
+ $(PREF_CFLAGS) \
+ -DTIMEZONE_FILE="\"/etc/timezone\"" \
diff --git a/debian/patches/series b/debian/patches/series
index aa1e0b7..ab309a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable_Werror.patch
lp_844741.patch
lp_802384.patch
gtk_box_api.patch