aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/ayatana-indicator-messages.install2
-rw-r--r--debian/compat2
-rw-r--r--debian/control7
-rw-r--r--debian/copyright56
-rw-r--r--debian/libmessaging-menu0.symbols67
-rwxr-xr-xdebian/rules28
6 files changed, 107 insertions, 55 deletions
diff --git a/debian/ayatana-indicator-messages.install b/debian/ayatana-indicator-messages.install
index 47c562c..782060b 100644
--- a/debian/ayatana-indicator-messages.install
+++ b/debian/ayatana-indicator-messages.install
@@ -1,4 +1,4 @@
-usr/lib/*/ayatana-indicator-messages/ayatana-indicator-messages-service
+usr/libexec/ayatana-indicator-messages/ayatana-indicator-messages-service
usr/lib/systemd
usr/share/ayatana/indicators
usr/share/glib-2.0
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 648990d..e2b3d2c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: ayatana-indicator-messages
Section: gnome
Priority: optional
Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf | debhelper (>= 9.20160403~),
- dh-systemd | debhelper (>= 10.2~),
+Build-Depends: cmake,
+ cmake-extras,
+ debhelper (>= 10),
gobject-introspection (>= 0.9.12-4~),
gtk-doc-tools,
intltool,
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
libdbustest1-dev,
libgirepository1.0-dev (>= 0.9.12),
libgtest-dev,
- mate-common,
python3-dbusmock,
valac,
systemd [linux-any],
diff --git a/debian/copyright b/debian/copyright
index c432785..afadfe6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,35 +9,26 @@ Copyright: 2017, THE PACKAGE'S COPYRIGHT HOLDER
YEAR, THE PACKAGE'S COPYRIGHT HOLDER
License: GPL-3
+Files: cmake/FindGObjectIntrospection.cmake
+ cmake/UseGObjectIntrospection.cmake
+Copyright: 2010, Pino Toscano, <pino@kde.org>
+License: BSD-3-clause
+
+Files:cmake/FindVala.cmake
+ cmake/UseVala.cmake
+Copyright: 2011, Přemysl Janouch
+License: BSD-2-clause
+
Files: AUTHORS
ChangeLog
- Makefile.am
- Makefile.am.coverage
README
NEWS
NEWS.Canonical
- autogen.sh
- common/Makefile.am
+ cmake/GdbusCodegen.cmake
common/org.ayatana.indicator.messages.application.xml
common/org.ayatana.indicator.messages.service.xml
- configure.ac
- data/Makefile.am
data/ayatana-indicator-messages.conf.in
data/ayatana-indicator-messages.desktop.in
- data/icons/16x16/Makefile.am
- data/icons/16x16/categories/Makefile.am
- data/icons/16x16/status/Makefile.am
- data/icons/22x22/Makefile.am
- data/icons/22x22/categories/Makefile.am
- data/icons/22x22/status/Makefile.am
- data/icons/24x24/Makefile.am
- data/icons/24x24/status/Makefile.am
- data/icons/32x32/Makefile.am
- data/icons/32x32/categories/Makefile.am
- data/icons/32x32/status/Makefile.am
- data/icons/48x48/Makefile.am
- data/icons/48x48/status/Makefile.am
- data/icons/Makefile.am
data/icons/16x16/categories/applications-chat-panel.png
data/icons/16x16/categories/applications-email-panel.png
data/icons/16x16/categories/applications-microblogging-panel.png
@@ -58,31 +49,21 @@ Files: AUTHORS
data/icons/48x48/status/application-running.png
data/icons/48x48/status/indicator-messages-new.png
data/icons/48x48/status/indicator-messages.png
- data/icons/scalable/Makefile.am
- data/icons/scalable/categories/Makefile.am
data/icons/scalable/categories/applications-chat-panel.svg
data/icons/scalable/categories/applications-email-panel.svg
- data/icons/scalable/status/Makefile.am
data/icons/scalable/status/application-running.svg
data/icons/scalable/status/indicator-messages-new.svg
data/icons/scalable/status/indicator-messages.svg
data/org.ayatana.indicator.messages
data/org.ayatana.indicator.messages.gschema.xml
- doc/Makefile.am
- doc/reference/Makefile.am
doc/reference/messaging-menu-docs.xml.in
doc/reference/messaging-menu-overrides.txt
doc/reference/messaging-menu-sections.txt
doc/reference/messaging-menu.types
- libmessaging-menu/Makefile.am
libmessaging-menu/client-example.py
libmessaging-menu/messaging-menu.pc.in
- m4/gcov.m4
- m4/gtest.m4
po/LINGUAS
po/POTFILES.in
- src/Makefile.am
- tests/Makefile.am
tests/applications/test.desktop
tests/applications/test2.desktop
tests/indicator-messages-service-activate.build.sh
@@ -130,15 +111,20 @@ Copyright: 2009, Canonical Ltd.
2015, Canonical Ltd.
License: GPL-3
-Files: update-po.sh
+Files: CMakeLists.txt
+ data/CMakeLists.txt
+ doc/CMakeLists.txt
+ doc/reference/CMakeLists.txt
+ libmessaging-menu/CMakeLists.txt
+ po/CMakeLists.txt
+ src/CMakeLists.txt
+ tests/CMakeLists.txt
+ update-po.sh
update-pot.sh
Copyright: 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ Copyright: 2021, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
License: GPL-3
-Files: m4/ax_python_module.m4
-Copyright: 2008, Andrew Collier <colliera@ukzn.ac.za>
-License: FSF~All-Permissive
-
Files: debian/*
Copyright: 2009-2010, Evgeni Golov <evgeni@debian.org>
2009-2010, Ted Gould <ted@canonical.com>, Canonical Ltd.
diff --git a/debian/libmessaging-menu0.symbols b/debian/libmessaging-menu0.symbols
index 567e0a8..63f983e 100644
--- a/debian/libmessaging-menu0.symbols
+++ b/debian/libmessaging-menu0.symbols
@@ -1,4 +1,71 @@
libmessaging-menu.so.0 libmessaging-menu0 #MINVER#
+ _messaging_menu_message_to_variant@Base 0.8.2-0
+ indicator_messages_application_call_activate_message@Base 0.8.2-0
+ indicator_messages_application_call_activate_message_finish@Base 0.8.2-0
+ indicator_messages_application_call_activate_message_sync@Base 0.8.2-0
+ indicator_messages_application_call_activate_source@Base 0.8.2-0
+ indicator_messages_application_call_activate_source_finish@Base 0.8.2-0
+ indicator_messages_application_call_activate_source_sync@Base 0.8.2-0
+ indicator_messages_application_call_dismiss@Base 0.8.2-0
+ indicator_messages_application_call_dismiss_finish@Base 0.8.2-0
+ indicator_messages_application_call_dismiss_sync@Base 0.8.2-0
+ indicator_messages_application_call_list_messages@Base 0.8.2-0
+ indicator_messages_application_call_list_messages_finish@Base 0.8.2-0
+ indicator_messages_application_call_list_messages_sync@Base 0.8.2-0
+ indicator_messages_application_call_list_sources@Base 0.8.2-0
+ indicator_messages_application_call_list_sources_finish@Base 0.8.2-0
+ indicator_messages_application_call_list_sources_sync@Base 0.8.2-0
+ indicator_messages_application_complete_activate_message@Base 0.8.2-0
+ indicator_messages_application_complete_activate_source@Base 0.8.2-0
+ indicator_messages_application_complete_dismiss@Base 0.8.2-0
+ indicator_messages_application_complete_list_messages@Base 0.8.2-0
+ indicator_messages_application_complete_list_sources@Base 0.8.2-0
+ indicator_messages_application_emit_message_added@Base 0.8.2-0
+ indicator_messages_application_emit_message_removed@Base 0.8.2-0
+ indicator_messages_application_emit_source_added@Base 0.8.2-0
+ indicator_messages_application_emit_source_changed@Base 0.8.2-0
+ indicator_messages_application_emit_source_removed@Base 0.8.2-0
+ indicator_messages_application_get_type@Base 0.8.2-0
+ indicator_messages_application_interface_info@Base 0.8.2-0
+ indicator_messages_application_override_properties@Base 0.8.2-0
+ indicator_messages_application_proxy_get_type@Base 0.8.2-0
+ indicator_messages_application_proxy_new@Base 0.8.2-0
+ indicator_messages_application_proxy_new_finish@Base 0.8.2-0
+ indicator_messages_application_proxy_new_for_bus@Base 0.8.2-0
+ indicator_messages_application_proxy_new_for_bus_finish@Base 0.8.2-0
+ indicator_messages_application_proxy_new_for_bus_sync@Base 0.8.2-0
+ indicator_messages_application_proxy_new_sync@Base 0.8.2-0
+ indicator_messages_application_skeleton_get_type@Base 0.8.2-0
+ indicator_messages_application_skeleton_new@Base 0.8.2-0
+ indicator_messages_service_call_application_stopped_running@Base 0.8.2-0
+ indicator_messages_service_call_application_stopped_running_finish@Base 0.8.2-0
+ indicator_messages_service_call_application_stopped_running_sync@Base 0.8.2-0
+ indicator_messages_service_call_register_application@Base 0.8.2-0
+ indicator_messages_service_call_register_application_finish@Base 0.8.2-0
+ indicator_messages_service_call_register_application_sync@Base 0.8.2-0
+ indicator_messages_service_call_set_status@Base 0.8.2-0
+ indicator_messages_service_call_set_status_finish@Base 0.8.2-0
+ indicator_messages_service_call_set_status_sync@Base 0.8.2-0
+ indicator_messages_service_call_unregister_application@Base 0.8.2-0
+ indicator_messages_service_call_unregister_application_finish@Base 0.8.2-0
+ indicator_messages_service_call_unregister_application_sync@Base 0.8.2-0
+ indicator_messages_service_complete_application_stopped_running@Base 0.8.2-0
+ indicator_messages_service_complete_register_application@Base 0.8.2-0
+ indicator_messages_service_complete_set_status@Base 0.8.2-0
+ indicator_messages_service_complete_unregister_application@Base 0.8.2-0
+ indicator_messages_service_emit_status_changed@Base 0.8.2-0
+ indicator_messages_service_get_type@Base 0.8.2-0
+ indicator_messages_service_interface_info@Base 0.8.2-0
+ indicator_messages_service_override_properties@Base 0.8.2-0
+ indicator_messages_service_proxy_get_type@Base 0.8.2-0
+ indicator_messages_service_proxy_new@Base 0.8.2-0
+ indicator_messages_service_proxy_new_finish@Base 0.8.2-0
+ indicator_messages_service_proxy_new_for_bus@Base 0.8.2-0
+ indicator_messages_service_proxy_new_for_bus_finish@Base 0.8.2-0
+ indicator_messages_service_proxy_new_for_bus_sync@Base 0.8.2-0
+ indicator_messages_service_proxy_new_sync@Base 0.8.2-0
+ indicator_messages_service_skeleton_get_type@Base 0.8.2-0
+ indicator_messages_service_skeleton_new@Base 0.8.2-0
messaging_menu_app_append_message@Base 0.6.0
messaging_menu_app_append_source@Base 0.6.0
messaging_menu_app_append_source_with_count@Base 0.6.0
diff --git a/debian/rules b/debian/rules
index e97abfe..db23614 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,27 +6,27 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-%:
- dh $@ --with autoreconf,gir,systemd
+DEB_CMAKE_EXTRA_FLAGS = \
+ -DENABLE_TESTS=ON \
+ -DENABLE_COVERAGE=OFF \
+ $(NULL)
-override_dh_autoreconf:
- if [ ! -e po/ayatana-indicator-messages.pot.bak ]; then \
- cp po/ayatana-indicator-messages.pot po/ayatana-indicator-messages.pot.bak; \
- fi
- NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+%:
+ dh $@ --with gir,systemd
override_dh_auto_configure:
- dh_auto_configure -- --enable-gtk-doc
+ dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
override_dh_install:
find debian/tmp/usr/lib -name *.la -delete
- dh_install --fail-missing
+ dh_install
+
+override_dh_missing:
+ dh_missing --fail-missing
-override_dh_auto_clean:
- dh_auto_clean
- if [ -e po/ayatana-indicator-messages.pot.bak ]; then \
- mv -f po/ayatana-indicator-messages.pot.bak po/ayatana-indicator-messages.pot; \
- fi
+# Hack as it seems it's not possible to easy run that under dbus-test-runner
+override_dh_auto_test:
+ env -u LD_PRELOAD dh_auto_test
get-orig-source:
uscan --noconf --force-download --rename --download-current-version --destdir=..