diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | m4/gcov.m4 | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 16 |
7 files changed, 27 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 583bb5f..b76dff5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ src \ bindings \ - example \ docs +# FIXME: Disabled, vala error +# example + if WANT_TESTS SUBDIRS += tests endif diff --git a/debian/changelog b/debian/changelog index 1061624..63c650e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libappindicator (12.10.1+13.10.20130920-0ubuntu3) trusty; urgency=medium + + * Build with -Wno-error=deprecated-declarations. + * Don't build the mono bindings on ppc64el, not available. + * Disable building the example, vala build error. + + -- Matthias Klose <doko@ubuntu.com> Thu, 19 Dec 2013 13:50:03 +0100 + libappindicator (12.10.1+13.10.20130920-0ubuntu2) saucy; urgency=low * Don't build the mono bindings on AArch64, not available. diff --git a/debian/control b/debian/control index 1d9b829..30c1b62 100644 --- a/debian/control +++ b/debian/control @@ -7,22 +7,22 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, python-all-dev, at-spi2-core, - cli-common-dev (>= 0.5.7) [!arm64], + cli-common-dev (>= 0.5.7) [!arm64 !ppc64el], gobject-introspection, intltool, gtk-doc-tools, libxml2-utils, - libnunit-cil-dev [!arm64], + libnunit-cil-dev [!arm64 !ppc64el], dbus-test-runner, xvfb, valac, - mono-devel (>= 2.4.3) [!arm64], + mono-devel (>= 2.4.3) [!arm64 !ppc64el], libglib2.0-dev (>= 2.35.4), libgtk-3-dev (>= 2.91.3), libgtk2.0-dev (>= 2.12.0), python-gtk2-dev, - gtk-sharp2-gapi [!arm64], - libgtk2.0-cil-dev [!arm64], + gtk-sharp2-gapi [!arm64 !ppc64el], + libgtk2.0-cil-dev [!arm64 !ppc64el], libdbus-glib-1-dev (>= 0.82), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), diff --git a/debian/rules b/debian/rules index 9df0c58..4fe4e6b 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ API_VERSION = 0.1 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) CONFIGURE_COMMON_FLAGS = --disable-scrollkeeper --enable-introspection -ifneq (,$(filter $(DEB_HOST_ARCH),arm64)) +ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el)) CONFIGURE_COMMON_FLAGS += --disable-mono-test else dh_extra_args = ,cli @@ -30,7 +30,7 @@ AC_DEFUN([AC_TDD_GCOV], AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10" AC_CHECK_PROG(LCOV, lcov, lcov) AC_CHECK_PROG(GENHTML, genhtml, genhtml) diff --git a/src/Makefile.am b/src/Makefile.am index a267f1f..960c861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,7 @@ libappindicator_la_LDFLAGS = \ libappindicator_la_CFLAGS = \ $(LIBRARY_CFLAGS) \ $(COVERAGE_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ diff --git a/tests/Makefile.am b/tests/Makefile.am index aed7d7f..570cfe5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,7 @@ test_libappindicator_SOURCES = \ test_libappindicator_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ -DSRCDIR="\"$(srcdir)\"" \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ @@ -49,7 +49,7 @@ test_libappindicator_dbus_client_SOURCES = \ test_libappindicator_dbus_client_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ @@ -66,7 +66,7 @@ test_libappindicator_dbus_server_SOURCES = \ test_libappindicator_dbus_server_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ @@ -83,7 +83,7 @@ test_libappindicator_status_client_SOURCES = \ test_libappindicator_status_client_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ @@ -100,7 +100,7 @@ test_libappindicator_status_server_SOURCES = \ test_libappindicator_status_server_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ @@ -116,7 +116,7 @@ test_libappindicator_fallback_watcher_SOURCES = \ test_libappindicator_fallback_watcher_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ @@ -128,7 +128,7 @@ test_libappindicator_fallback_item_SOURCES = \ test_libappindicator_fallback_item_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ @@ -198,7 +198,7 @@ test_simple_app_SOURCES = \ test_simple_app_CFLAGS = \ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall -Werror -Wno-error=deprecated-declarations \ -I$(top_srcdir)/src test_simple_app_LDADD = \ |