aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2014-01-07 20:27:09 +0000
committerTarmac <Unknown>2014-01-07 20:27:09 +0000
commit8f62a0c1be711899de6a72fe7d4b4c824c744b50 (patch)
tree29c3061056bf95011b6cb69ed77bf3daaea42de7
parentb47540820e8f34be816fe3adc57996de6d9ba9bc (diff)
parent3ebe5c103be9523756ad71abfd8b4fd50436e0e6 (diff)
downloadayatana-ido-8f62a0c1be711899de6a72fe7d4b4c824c744b50.tar.gz
ayatana-ido-8f62a0c1be711899de6a72fe7d4b4c824c744b50.tar.bz2
ayatana-ido-8f62a0c1be711899de6a72fe7d4b4c824c744b50.zip
Sync changes uploaded to the archive back to trunk
. Approved by Ted Gould, PS Jenkins bot.
-rw-r--r--debian/changelog6
-rw-r--r--src/Makefile.am3
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 56bf005..100cc1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ido (13.10.0+14.04.20131127-0ubuntu2) trusty; urgency=medium
+
+ * Build with -Wno-error=deprecated-declarations.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 18 Dec 2013 23:59:33 +0100
+
ido (13.10.0+14.04.20131127-0ubuntu1) trusty; urgency=low
[ Lars Uebernickel ]
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e6241d..3a3ea31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,8 +65,7 @@ AM_CPPFLAGS = \
$(GCC_FLAGS) \
$(GTK_CFLAGS) \
$(MAINTAINER_CFLAGS) \
- -Wall -Werror -Wextra -Wno-unused-parameter \
- -Wno-error=deprecated-declarations
+ -Wall -Werror -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations
AM_CFLAGS = \
$(COVERAGE_CFLAGS)