diff -Nru package-update-indicator-2.0/debian/changelog package-update-indicator-4/debian/changelog --- package-update-indicator-2.0/debian/changelog 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/changelog 2019-07-29 22:44:06.000000000 +0000 @@ -1,3 +1,18 @@ +package-update-indicator (4-2) unstable; urgency=medium + + * Set GPK Update Viewer as default updater command + + -- Matthias Klumpp Tue, 30 Jul 2019 00:44:06 +0200 + +package-update-indicator (4-1) unstable; urgency=medium + + * New upstream version: 4 + * Bump dh compat level to 12 + * Update standards version: No changes needed + * Update d/watch file + + -- Matthias Klumpp Tue, 30 Jul 2019 00:08:06 +0200 + package-update-indicator (2.0-1) unstable; urgency=medium * Initial release, replacing pk-update-icon (Closes: #906839) diff -Nru package-update-indicator-2.0/debian/compat package-update-indicator-4/debian/compat --- package-update-indicator-2.0/debian/compat 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru package-update-indicator-2.0/debian/control package-update-indicator-4/debian/control --- package-update-indicator-2.0/debian/control 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/control 2019-07-29 22:07:50.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Matthias Klumpp Vcs-Git: https://salsa.debian.org/pkgutopia-team/package-update-indicator.git Vcs-Browser: https://salsa.debian.org/pkgutopia-team/package-update-indicator -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 12), docbook-xsl-ns, libappindicator3-dev (>= 0.4.92), libglib2.0-dev (>= 2.36), @@ -13,7 +13,7 @@ libpolkit-gobject-1-dev, libupower-glib-dev, xsltproc -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Homepage: https://code.guido-berhoerster.org/projects/package-update-indicator/ Package: package-update-indicator diff -Nru package-update-indicator-2.0/debian/package-update-indicator.gsettings-override package-update-indicator-4/debian/package-update-indicator.gsettings-override --- package-update-indicator-2.0/debian/package-update-indicator.gsettings-override 1970-01-01 00:00:00.000000000 +0000 +++ package-update-indicator-4/debian/package-update-indicator.gsettings-override 2019-07-29 22:39:52.000000000 +0000 @@ -0,0 +1,2 @@ +[org.guido-berhoerster.code.package-update-indicator] +update-command='/usr/bin/gpk-update-viewer' diff -Nru package-update-indicator-2.0/debian/patches/01_no-local-compiler-flags.patch package-update-indicator-4/debian/patches/01_no-local-compiler-flags.patch --- package-update-indicator-2.0/debian/patches/01_no-local-compiler-flags.patch 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/patches/01_no-local-compiler-flags.patch 2019-07-29 22:14:36.000000000 +0000 @@ -4,7 +4,7 @@ --- a/Makefile +++ b/Makefile -@@ -260,7 +260,5 @@ +@@ -269,7 +269,5 @@ -s ',^\.$$,,' -s ',\./,$(DISTNAME)/,' . | \ $(GZIP) > $(DISTNAME).tar.gz diff -Nru package-update-indicator-2.0/debian/rules package-update-indicator-4/debian/rules --- package-update-indicator-2.0/debian/rules 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/rules 2019-07-29 22:14:11.000000000 +0000 @@ -12,8 +12,8 @@ override_dh_auto_install: $(MAKE) install DESTDIR=$(INSTALLDIR) prefix=/usr -override_dh_install: - dh_install --fail-missing +override_dh_missing: + dh_missing --fail-missing override_dh_gencontrol: dh_gencontrol -ppk-update-icon -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) diff -Nru package-update-indicator-2.0/debian/watch package-update-indicator-4/debian/watch --- package-update-indicator-2.0/debian/watch 2018-12-16 15:36:44.000000000 +0000 +++ package-update-indicator-4/debian/watch 2019-07-29 22:03:50.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://code.guido-berhoerster.org/projects/package-update-indicator/ .*pk-update-icon-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +https://code.guido-berhoerster.org/projects/package-update-indicator/ .*package-update-indicator-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru package-update-indicator-2.0/local.mk package-update-indicator-4/local.mk --- package-update-indicator-2.0/local.mk 2018-06-08 19:55:48.000000000 +0000 +++ package-update-indicator-4/local.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -CC = clang -std=c99 -CFLAGS = -O2 -ggdb3 -Wall -Wextra -Wno-unused-parameter #-fsanitize=undefined,address -LDFLAGS = #-fsanitize=undefined,address diff -Nru package-update-indicator-2.0/Makefile package-update-indicator-4/Makefile --- package-update-indicator-2.0/Makefile 2018-12-08 09:03:54.000000000 +0000 +++ package-update-indicator-4/Makefile 2019-07-24 14:29:14.000000000 +0000 @@ -24,7 +24,7 @@ PACKAGE = package-update-indicator APPLICATION_ID = org.guido-berhoerster.code.package-update-indicator PREFS_APPLICATION_ID = org.guido-berhoerster.code.package-update-indicator.preferences -VERSION = 2 +VERSION = 4 DISTNAME = $(PACKAGE)-$(VERSION) AUTHOR = Guido Berhoerster BUG_ADDRESS = guido+pui@berhoerster.name @@ -70,6 +70,14 @@ --keyword=NC_:1c,2 \ --keyword=g_dngettext:2,3 \ --add-comments +INDICATOR_LIB := $(or \ + $(shell pkg-config --exists appindicator3-0.1 && \ + printf '%s\\\n' appindicator3-0.1), \ + $(shell pkg-config --exists ayatana-appindicator3-0.1 && \ + printf '%s\\\n' ayatana-appindicator3-0.1), \ + appindicator3-0.1) +INDICATOR_FLAG := $(if $(findstring ayatana,$(INDICATOR_LIB)), \ + -DHAVE_AYATANA_APPINDICATOR,) define generate-manpage-rule = %.$1: %.$(addsuffix .xml,$1) docbook-update-source-data.xsl @@ -150,12 +158,13 @@ -DPACKAGE_LOCALE_DIR="\"$(localedir)\"" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -DSETTINGS_SCHEMA_ID=\"$(APPLICATION_ID)\" \ - -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE + -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \ + $(INDICATOR_FLAG) $(PACKAGE): XCFLAGS = $(shell pkg-config --cflags gtk+-3.0 \ - appindicator3-0.1 packagekit-glib2 \ + $(INDICATOR_LIB) packagekit-glib2 \ polkit-gobject-1 upower-glib) $(PACKAGE): LDLIBS = $(shell pkg-config --libs gtk+-3.0 \ - appindicator3-0.1 packagekit-glib2 \ + $(INDICATOR_LIB) packagekit-glib2 \ polkit-gobject-1 upower-glib) $(PACKAGE)-prefs: XCPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" \ diff -Nru package-update-indicator-2.0/NEWS package-update-indicator-4/NEWS --- package-update-indicator-2.0/NEWS 2018-12-08 09:09:51.000000000 +0000 +++ package-update-indicator-4/NEWS 2019-07-24 14:29:14.000000000 +0000 @@ -1,11 +1,28 @@ News ==== +package-update-indicator 4 (2019-07-24T16:27:25+02:00) +------------------------------------------------------ + +- Fix support for libayatana-appindicator + +package-update-indicator 3 (2019-07-24T10:33:37+02:00) +------------------------------------------------------ + +- Use consistent vocabulary in German translations +- Add support for libayantana-indicator +- Fix typo in German translations +- Add missing changelog entries + package-update-indicator 2 (2018-12-08T10:09:35+01:00) ------------------------------------------------------ - Add keywords to desktop files - Fix typo in notification message +- Do not run glib-compile-schemas if schemas are installed into staging + directory +- Set application indicator title +- Add note for vendors on how to override default settings package-update-indicator 1 (2018-07-06T14:21:28+02:00) ------------------------------------------------------ diff -Nru package-update-indicator-2.0/po/de.po package-update-indicator-4/po/de.po --- package-update-indicator-2.0/po/de.po 2018-12-08 09:01:40.000000000 +0000 +++ package-update-indicator-4/po/de.po 2019-07-24 14:29:14.000000000 +0000 @@ -156,7 +156,7 @@ #: pui-application.c:271 msgid "You need to log out and back in for the update to take effect." msgstr "" -"Sie müssen sich aus- und wieder einloggen, damit das Update wirksam wird." +"Sie müssen sich aus- und wieder einloggen, damit die Aktualisierung wirksam wird." #: pui-application.c:275 msgid "Restart Required" @@ -165,11 +165,11 @@ #: pui-application.c:276 msgid "The computer has to be restarted for the updates to take effect." msgstr "" -"Der Computer muss neu gestarte werden damit die Updates wirksam werden." +"Der Computer muss neu gestarte werden damit die Aktualisierungen wirksam werden." #: pui-application.c:324 msgid "Install Updates" -msgstr "Installiere Updates" +msgstr "Installiere Aktualisierungen" #: pui-application.c:434 msgid "Update notifications are not supported." @@ -177,11 +177,11 @@ #: pui-menu.ui:13 msgid "_Install updates" -msgstr "_Installiere updates" +msgstr "_Installiere Aktualisierungen" #: pui-menu.ui:22 msgid "_Preferences…" -msgstr "_Einstallungen…" +msgstr "_Einstellungen…" #: pui-menu.ui:31 msgid "_About…" diff -Nru package-update-indicator-2.0/pui-application.c package-update-indicator-4/pui-application.c --- package-update-indicator-2.0/pui-application.c 2018-12-08 07:01:52.000000000 +0000 +++ package-update-indicator-4/pui-application.c 2019-07-24 14:29:14.000000000 +0000 @@ -23,7 +23,11 @@ #include #include +#ifndef HAVE_AYATANA_APPINDICATOR #include +#else /* !HAVE_AYATANA_APPINDICATOR */ +#include +#endif /* !HAVE_AYATANA_APPINDICATOR */ #include #include