From 1140a11e33a1d47f9b4425317f777920d9777b66 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 16:21:50 +0200 Subject: debian/control: Adjust B-Ds for CMake based build. --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 8e177c0..3a73b18 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,16 @@ Section: libs Priority: optional Maintainer: Mike Gabriel Build-Depends: at-spi2-core, + cmake, + cmake-extras, debhelper (>= 9), - dh-autoreconf, dh-exec, dpkg-dev (>= 1.16.1.1), libtool, intltool, - mate-common, gtk-doc-tools, dbus-test-runner, + xauth, xvfb, libglib2.0-dev (>= 2.37), libgtk2.0-dev (>= 2.18), -- cgit v1.2.3 From 73e6c3aceb13b155c1f7af983acb8e7ed51e97c2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 13:30:01 +0200 Subject: debian/rules: Adjust to CMake based build. (Fixes DEB builds after CMake switch). --- debian/rules | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 3082a13..ae8b287 100755 --- a/debian/rules +++ b/debian/rules @@ -6,10 +6,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -COMMON_CONFIGURE_FLAGS = --disable-silent-rules +COMMON_CONFIGURE_FLAGS = -CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DFLAVOUR_GTK3=OFF +CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -17,10 +17,7 @@ export G_MESSAGES_DEBUG = all export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: - dh $@ --with autoreconf - -override_dh_autoreconf: - NOCONFIGURE=1 dh_autoreconf ./autogen.sh + dh $@ override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) -- cgit v1.2.3 From 0371084641a17e014e274f3ba7745e6ff8964173 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 15:31:06 +0200 Subject: debian/rules: Explicitly enable tests at build time. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index ae8b287..aa08911 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -COMMON_CONFIGURE_FLAGS = +COMMON_CONFIGURE_FLAGS = -DENABLE_TESTS=ON CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DFLAVOUR_GTK3=OFF CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF -- cgit v1.2.3 From 262df761724be86fad5026452aa9636de4f8a53a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 15:30:48 +0200 Subject: debian/rules: Run GTK2/GTK3 unit tests sequentially. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index aa08911..300730b 100755 --- a/debian/rules +++ b/debian/rules @@ -29,10 +29,9 @@ override_dh_auto_build: $(FLAVORS:%=dobuild-%) dobuild-%: dh_auto_build --builddirectory=builddir/$* -override_dh_auto_test: $(FLAVORS:%=dotest-%) - -dotest-%: - dh_auto_test --no-parallel --builddirectory=builddir/$* +override_dh_auto_test: + xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk2 + xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk3 override_dh_auto_install: $(FLAVORS:%=doinstall-%) -- cgit v1.2.3 From 8eec783d329921fffd5a5640a5c953ac937e4ab6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 15:29:14 +0200 Subject: debian/*.symbols: Update symbols files. --- debian/libayatana-indicator3-7.symbols | 5 +++++ debian/libayatana-indicator7.symbols | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/libayatana-indicator3-7.symbols b/debian/libayatana-indicator3-7.symbols index a0bc0c3..7973468 100644 --- a/debian/libayatana-indicator3-7.symbols +++ b/debian/libayatana-indicator3-7.symbols @@ -2,6 +2,11 @@ libayatana-indicator3.so.7 libayatana-indicator3-7 #MINVER# *Build-Depends-Package: libayatana-indicator3-dev ICON_SIZE@Base 0.6.0 INDICATOR_NAMES_DATA@Base 0.6.0 + _indicator_object_marshal_VOID__POINTER_BOOLEAN@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT_ENUM@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT_UINT@Base 0.8.5 + _indicator_service@Base 0.8.5 #MISSING: 0.8.0# ayatana_menu_item_factory_create_menu_item@Base 0.7.0 #MISSING: 0.8.0# ayatana_menu_item_factory_get_all@Base 0.7.0 #MISSING: 0.8.0# ayatana_menu_item_factory_get_type@Base 0.7.0 diff --git a/debian/libayatana-indicator7.symbols b/debian/libayatana-indicator7.symbols index 66393ab..7489c2b 100644 --- a/debian/libayatana-indicator7.symbols +++ b/debian/libayatana-indicator7.symbols @@ -2,6 +2,11 @@ libayatana-indicator.so.7 libayatana-indicator7 #MINVER# *Build-Depends-Package: libayatana-indicator-dev ICON_SIZE@Base 0.6.0 INDICATOR_NAMES_DATA@Base 0.6.0 + _indicator_object_marshal_VOID__POINTER_BOOLEAN@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT_ENUM@Base 0.8.5 + _indicator_object_marshal_VOID__POINTER_UINT_UINT@Base 0.8.5 + _indicator_service@Base 0.8.5 indicator_desktop_shortcuts_get_nicks@Base 0.6.0 indicator_desktop_shortcuts_get_type@Base 0.6.0 indicator_desktop_shortcuts_new@Base 0.6.0 -- cgit v1.2.3 From 08a856c5db3b44960384f2727100133552a21768 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 16:18:38 +0200 Subject: debian/libayatana-indicator*-dev.install: No .a files shipped anymore. --- debian/libayatana-indicator-dev.install | 1 - debian/libayatana-indicator3-dev.install | 1 - 2 files changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/libayatana-indicator-dev.install b/debian/libayatana-indicator-dev.install index dbf81cf..8d167db 100644 --- a/debian/libayatana-indicator-dev.install +++ b/debian/libayatana-indicator-dev.install @@ -1,4 +1,3 @@ usr/include usr/lib/*/pkgconfig/ayatana-indicator-0.4.pc -usr/lib/*/libayatana-indicator.a usr/lib/*/libayatana-indicator.so diff --git a/debian/libayatana-indicator3-dev.install b/debian/libayatana-indicator3-dev.install index 4cc05d4..73dc715 100644 --- a/debian/libayatana-indicator3-dev.install +++ b/debian/libayatana-indicator3-dev.install @@ -1,4 +1,3 @@ usr/include usr/lib/*/pkgconfig/ayatana-indicator3-0.4.pc -usr/lib/*/libayatana-indicator3.a usr/lib/*/libayatana-indicator3.so -- cgit v1.2.3 From b2214f2cbe1a7cd1b104ff32fc121cd84862b9a6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 16:21:30 +0200 Subject: debian/libayatana-indicator3-tools.install: Install ayatana-indicator3-loader test tool to LIBEXECDIR. --- debian/libayatana-indicator3-tools.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/libayatana-indicator3-tools.install b/debian/libayatana-indicator3-tools.install index dadee01..41bcf7a 100644 --- a/debian/libayatana-indicator3-tools.install +++ b/debian/libayatana-indicator3-tools.install @@ -1,2 +1,2 @@ -usr/lib/*/ayatana-indicator-loader3 +usr/libexec/libayatana-indicator/ayatana-indicator-loader3 usr/share/libayatana-indicator/80indicator-debugging /usr/share/libayatana-indicator/ -- cgit v1.2.3