From d9442d25ecdf99ac4536f5738248790d97a2188c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 16 Nov 2018 09:53:53 +0100 Subject: debian/*: Sync in changes from official Debian packaging. Drop Ayatana namespace from libmessaging bin:pkgs. --- debian/control | 17 ++- debian/copyright | 142 ++++++++++++++++++++++++- debian/gir1.2-ayatanamessagingmenu-1.0.install | 1 - debian/gir1.2-messagingmenu-1.0.install | 1 + debian/libayatana-messaging-menu-dev.examples | 1 - debian/libayatana-messaging-menu-dev.install | 6 -- debian/libayatana-messaging-menu0.install | 1 - debian/libayatana-messaging-menu0.symbols | 38 ------- debian/libmessaging-menu-dev.examples | 1 + debian/libmessaging-menu-dev.install | 6 ++ debian/libmessaging-menu0.install | 1 + debian/libmessaging-menu0.symbols | 38 +++++++ debian/rules | 7 ++ 13 files changed, 200 insertions(+), 60 deletions(-) delete mode 100644 debian/gir1.2-ayatanamessagingmenu-1.0.install create mode 100644 debian/gir1.2-messagingmenu-1.0.install delete mode 100644 debian/libayatana-messaging-menu-dev.examples delete mode 100644 debian/libayatana-messaging-menu-dev.install delete mode 100644 debian/libayatana-messaging-menu0.install delete mode 100644 debian/libayatana-messaging-menu0.symbols create mode 100644 debian/libmessaging-menu-dev.examples create mode 100644 debian/libmessaging-menu-dev.install create mode 100644 debian/libmessaging-menu0.install create mode 100644 debian/libmessaging-menu0.symbols (limited to 'debian') diff --git a/debian/control b/debian/control index fd642c4..8d6f38a 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), mate-common, python3-dbusmock, valac, -Standards-Version: 4.0.0 +Standards-Version: 4.2.1 Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-messages Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-messages Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-messages @@ -32,13 +32,12 @@ Description: Ayatana Indicator that collects messages that need a response for quick access, but without making them annoying in times that you want to ignore them. -Package: libayatana-messaging-menu0 +Package: libmessaging-menu0 Architecture: any Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, -Conflicts: libmessaging-menu0 Description: Ayatana Messaging Menu - shared library A place on the user's desktop that collects messages that need a response. . @@ -49,16 +48,14 @@ Description: Ayatana Messaging Menu - shared library This library contains information to build status providers to go into the messaging menu. -Package: libayatana-messaging-menu-dev -Provides: libmessaging-menu-dev +Package: libmessaging-menu-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, - gir1.2-ayatanamessagingmenu-1.0 (=${binary:Version}), - libayatana-messaging-menu0 (=${binary:Version}), + gir1.2-messagingmenu-1.0 (=${binary:Version}), + libmessaging-menu0 (=${binary:Version}), libglib2.0-dev, -Conflicts: libmessaging-menu-dev Description: Ayatana Messaging Menu - library development files A place on the user's desktop that collects messages that need a response. . @@ -69,13 +66,11 @@ Description: Ayatana Messaging Menu - library development files This package provides development files for the Messaging Menu shared library. -Package: gir1.2-ayatanamessagingmenu-1.0 -Provides: gir1.2-messagingmenu-1.0 +Package: gir1.2-messagingmenu-1.0 Section: introspection Architecture: any Depends: ${misc:Depends}, ${gir:Depends}, -Conflicts: gir1.2-messagingmenu-1.0 Description: Ayatana Messaging Menu - gir bindings A place on the user's desktop that collects messages that need a response. . diff --git a/debian/copyright b/debian/copyright index ea85bc3..c432785 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,10 +3,142 @@ Upstream-Name: ayatana-indicator-messages Upstream-Contact: Mike Gabriel Source: https://github.com/AyatanaIndicators/ayatana-indicator-messages -Files: * -Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Files: po/*.po + po/ayatana-indicator-messages.pot +Copyright: 2017, THE PACKAGE'S COPYRIGHT HOLDER + YEAR, THE PACKAGE'S COPYRIGHT HOLDER License: GPL-3 +Files: AUTHORS + ChangeLog + Makefile.am + Makefile.am.coverage + README + NEWS + NEWS.Canonical + autogen.sh + common/Makefile.am + 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 + data/icons/16x16/status/application-running.png + data/icons/16x16/status/indicator-messages-new.png + data/icons/16x16/status/indicator-messages.png + data/icons/22x22/categories/applications-email-panel.png + data/icons/22x22/status/indicator-messages-new.png + data/icons/22x22/status/indicator-messages.png + data/icons/24x24/status/application-running.png + data/icons/24x24/status/indicator-messages-new.png + data/icons/24x24/status/indicator-messages.png + data/icons/32x32/categories/applications-chat-panel.png + data/icons/32x32/categories/applications-email-panel.png + data/icons/32x32/status/application-running.png + data/icons/32x32/status/indicator-messages-new.png + data/icons/32x32/status/indicator-messages.png + 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 + tests/manual + tests/test-client.py +Copyright: 2009-2015, Canonical Ltd. +License: GPL-3 +Comment: + Using same license and copyright as found in code file headers. + +Files: libmessaging-menu/messaging-menu-app.c + libmessaging-menu/messaging-menu-app.h + libmessaging-menu/messaging-menu-message.c + libmessaging-menu/messaging-menu-message.h + libmessaging-menu/messaging-menu.h + src/dbus-data.h + src/gactionmuxer.c + src/gactionmuxer.h + src/gsettingsstrv.c + src/gsettingsstrv.h + src/im-accounts-service.c + src/im-accounts-service.h + src/im-application-list.c + src/im-application-list.h + src/im-desktop-menu.c + src/im-desktop-menu.h + src/im-menu.c + src/im-menu.h + src/im-phone-menu.c + src/im-phone-menu.h + src/indicator-desktop-shortcuts.c + src/indicator-desktop-shortcuts.h + src/messages-service.c + tests/accounts-service-mock.h + tests/indicator-fixture.h + tests/indicator-messages-service-activate.c + tests/indicator-test.cpp + tests/test-gactionmuxer.cpp +Copyright: 2009, Canonical Ltd. + 2010, Canonical Ltd. + 2012, Canonical Ltd. + 2012-2013, Canonical Ltd. + 2013, Canonical Ltd. + 2014, Canonical Ltd. + 2015, Canonical Ltd. +License: GPL-3 + +Files: update-po.sh + update-pot.sh +Copyright: 2017, Mike Gabriel +License: GPL-3 + +Files: m4/ax_python_module.m4 +Copyright: 2008, Andrew Collier +License: FSF~All-Permissive + Files: debian/* Copyright: 2009-2010, Evgeni Golov 2009-2010, Ted Gould , Canonical Ltd. @@ -30,3 +162,9 @@ License: GPL-3 . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: FSF~All-permissive + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. This file is offered as-is, without any + warranty. diff --git a/debian/gir1.2-ayatanamessagingmenu-1.0.install b/debian/gir1.2-ayatanamessagingmenu-1.0.install deleted file mode 100644 index 49d71c9..0000000 --- a/debian/gir1.2-ayatanamessagingmenu-1.0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/girepository-1.0 diff --git a/debian/gir1.2-messagingmenu-1.0.install b/debian/gir1.2-messagingmenu-1.0.install new file mode 100644 index 0000000..49d71c9 --- /dev/null +++ b/debian/gir1.2-messagingmenu-1.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0 diff --git a/debian/libayatana-messaging-menu-dev.examples b/debian/libayatana-messaging-menu-dev.examples deleted file mode 100644 index ff6ef0b..0000000 --- a/debian/libayatana-messaging-menu-dev.examples +++ /dev/null @@ -1 +0,0 @@ -libmessaging-menu/client-example.py \ No newline at end of file diff --git a/debian/libayatana-messaging-menu-dev.install b/debian/libayatana-messaging-menu-dev.install deleted file mode 100644 index 4c9f561..0000000 --- a/debian/libayatana-messaging-menu-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/*/libmessaging-menu.so -usr/lib/*/pkgconfig -usr/include /usr/ -usr/share/gir-1.0/ -usr/share/vala/ -usr/share/gtk-doc diff --git a/debian/libayatana-messaging-menu0.install b/debian/libayatana-messaging-menu0.install deleted file mode 100644 index 6ee36e6..0000000 --- a/debian/libayatana-messaging-menu0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libmessaging-menu.so.* diff --git a/debian/libayatana-messaging-menu0.symbols b/debian/libayatana-messaging-menu0.symbols deleted file mode 100644 index 50b41b8..0000000 --- a/debian/libayatana-messaging-menu0.symbols +++ /dev/null @@ -1,38 +0,0 @@ -libmessaging-menu.so.0 libayatana-messaging-menu0 #MINVER# - 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 - messaging_menu_app_append_source_with_string@Base 0.6.0 - messaging_menu_app_append_source_with_time@Base 0.6.0 - messaging_menu_app_draw_attention@Base 0.6.0 - messaging_menu_app_get_message@Base 0.6.0 - messaging_menu_app_get_type@Base 0.6.0 - messaging_menu_app_has_source@Base 0.6.0 - messaging_menu_app_insert_source@Base 0.6.0 - messaging_menu_app_insert_source_with_count@Base 0.6.0 - messaging_menu_app_insert_source_with_string@Base 0.6.0 - messaging_menu_app_insert_source_with_time@Base 0.6.0 - messaging_menu_app_new@Base 0.6.0 - messaging_menu_app_register@Base 0.6.0 - messaging_menu_app_remove_attention@Base 0.6.0 - messaging_menu_app_remove_message@Base 0.6.0 - messaging_menu_app_remove_message_by_id@Base 0.6.0 - messaging_menu_app_remove_source@Base 0.6.0 - messaging_menu_app_set_source_count@Base 0.6.0 - messaging_menu_app_set_source_icon@Base 0.6.0 - messaging_menu_app_set_source_label@Base 0.6.0 - messaging_menu_app_set_source_string@Base 0.6.0 - messaging_menu_app_set_source_time@Base 0.6.0 - messaging_menu_app_set_status@Base 0.6.0 - messaging_menu_app_unregister@Base 0.6.0 - messaging_menu_message_add_action@Base 0.6.0 - messaging_menu_message_get_body@Base 0.6.0 - messaging_menu_message_get_draws_attention@Base 0.6.0 - messaging_menu_message_get_icon@Base 0.6.0 - messaging_menu_message_get_id@Base 0.6.0 - messaging_menu_message_get_subtitle@Base 0.6.0 - messaging_menu_message_get_time@Base 0.6.0 - messaging_menu_message_get_title@Base 0.6.0 - messaging_menu_message_get_type@Base 0.6.0 - messaging_menu_message_new@Base 0.6.0 - messaging_menu_message_set_draws_attention@Base 0.6.0 diff --git a/debian/libmessaging-menu-dev.examples b/debian/libmessaging-menu-dev.examples new file mode 100644 index 0000000..ff6ef0b --- /dev/null +++ b/debian/libmessaging-menu-dev.examples @@ -0,0 +1 @@ +libmessaging-menu/client-example.py \ No newline at end of file diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install new file mode 100644 index 0000000..4c9f561 --- /dev/null +++ b/debian/libmessaging-menu-dev.install @@ -0,0 +1,6 @@ +usr/lib/*/libmessaging-menu.so +usr/lib/*/pkgconfig +usr/include /usr/ +usr/share/gir-1.0/ +usr/share/vala/ +usr/share/gtk-doc diff --git a/debian/libmessaging-menu0.install b/debian/libmessaging-menu0.install new file mode 100644 index 0000000..6ee36e6 --- /dev/null +++ b/debian/libmessaging-menu0.install @@ -0,0 +1 @@ +usr/lib/*/libmessaging-menu.so.* diff --git a/debian/libmessaging-menu0.symbols b/debian/libmessaging-menu0.symbols new file mode 100644 index 0000000..567e0a8 --- /dev/null +++ b/debian/libmessaging-menu0.symbols @@ -0,0 +1,38 @@ +libmessaging-menu.so.0 libmessaging-menu0 #MINVER# + 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 + messaging_menu_app_append_source_with_string@Base 0.6.0 + messaging_menu_app_append_source_with_time@Base 0.6.0 + messaging_menu_app_draw_attention@Base 0.6.0 + messaging_menu_app_get_message@Base 0.6.0 + messaging_menu_app_get_type@Base 0.6.0 + messaging_menu_app_has_source@Base 0.6.0 + messaging_menu_app_insert_source@Base 0.6.0 + messaging_menu_app_insert_source_with_count@Base 0.6.0 + messaging_menu_app_insert_source_with_string@Base 0.6.0 + messaging_menu_app_insert_source_with_time@Base 0.6.0 + messaging_menu_app_new@Base 0.6.0 + messaging_menu_app_register@Base 0.6.0 + messaging_menu_app_remove_attention@Base 0.6.0 + messaging_menu_app_remove_message@Base 0.6.0 + messaging_menu_app_remove_message_by_id@Base 0.6.0 + messaging_menu_app_remove_source@Base 0.6.0 + messaging_menu_app_set_source_count@Base 0.6.0 + messaging_menu_app_set_source_icon@Base 0.6.0 + messaging_menu_app_set_source_label@Base 0.6.0 + messaging_menu_app_set_source_string@Base 0.6.0 + messaging_menu_app_set_source_time@Base 0.6.0 + messaging_menu_app_set_status@Base 0.6.0 + messaging_menu_app_unregister@Base 0.6.0 + messaging_menu_message_add_action@Base 0.6.0 + messaging_menu_message_get_body@Base 0.6.0 + messaging_menu_message_get_draws_attention@Base 0.6.0 + messaging_menu_message_get_icon@Base 0.6.0 + messaging_menu_message_get_id@Base 0.6.0 + messaging_menu_message_get_subtitle@Base 0.6.0 + messaging_menu_message_get_time@Base 0.6.0 + messaging_menu_message_get_title@Base 0.6.0 + messaging_menu_message_get_type@Base 0.6.0 + messaging_menu_message_new@Base 0.6.0 + messaging_menu_message_set_draws_attention@Base 0.6.0 diff --git a/debian/rules b/debian/rules index 98ccb67..eb8bcc6 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,10 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: dh $@ --with autoreconf,gir @@ -23,3 +27,6 @@ override_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 + +get-orig-source: + uscan --noconf --force-download --rename --download-current-version --destdir=.. -- cgit v1.2.3