diff -Nru redshift-1.12/debian/changelog redshift-1.12/debian/changelog --- redshift-1.12/debian/changelog 2018-10-02 08:38:56.000000000 +0000 +++ redshift-1.12/debian/changelog 2020-12-12 16:43:43.000000000 +0000 @@ -1,3 +1,55 @@ +redshift (1.12-4) unstable; urgency=medium + + * Fix AppArmor profile under Wayland (Closes: #977210) + + -- nicoo Sat, 12 Dec 2020 17:43:43 +0100 + +redshift (1.12-3) unstable; urgency=medium + + * Take over maintainership, by request of previous maintainer (rrs@) + * Remove uploader (Franziska Lichtblau) at their request + + * d/patches: + + Add wayland support. (Closes: #947848) + + Replace libappindicator with ayatana-appindicator. (Closes: #956779) + The former is going to be removed for the bullseye release. + + src/redshift.c: Fix typo in error message. + + data/appdata: + - Update Appstream metadata format + - Link to a local copy of the screenshot, rather than http://jonls.dk + + * gtk-redshift: Drop transitional package (Closes: #940737) + * redshift + + Install missing manpage. + + Install AppArmor profile. + * redshift-gtk: + + Remove menu file (policy violation) + Per the tech-ctte decision on #741573, it is prohibited to ship + both a desktop and menu file. + + Add manpage (symlink) for the gtk-redshift binary. + + Clarify description (Closes: #754430) + + * Switch to debhelper compatibility level 13 + * Comply with policy 4.5.1 (was 3.9.3) + + d/control: Set Rules-Requires-Root to 'no' + + d/copyright: Use the DEP-5 machine-readable format + + d/rules: Set DH_VERBOSE by default + + * Setup CI for the packaging repository, and BTS integration. + * d/control: Use a canonical Vcs-Browser URL + * d/copyright: Add missing copyrights and licenses + + Remove explicit invocation of dh-autoreconf and corresponding dependencies + * d/watch + + Update to uscan v4 + + Point to current upstream (moved from Launchpad to Github after v1.10) + + * gbp pq: Disable patch numbering + * gbp dch: Do not include commit ids + * wrap-and-sort -st d/control and d/*.install. + This made the dependency lists easier to deal with. + + -- nicoo Sat, 12 Dec 2020 16:29:52 +0100 + redshift (1.12-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru redshift-1.12/debian/compat redshift-1.12/debian/compat --- redshift-1.12/debian/compat 2015-08-14 20:19:49.000000000 +0000 +++ redshift-1.12/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru redshift-1.12/debian/control redshift-1.12/debian/control --- redshift-1.12/debian/control 2018-10-02 08:26:17.000000000 +0000 +++ redshift-1.12/debian/control 2020-12-12 16:43:43.000000000 +0000 @@ -1,17 +1,30 @@ Source: redshift Section: x11 Priority: optional -Maintainer: Ritesh Raj Sarraf -Uploaders: Franziska Lichtblau -Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~), pkg-config (>= 0.25), dpkg-dev (>= 1.16.1~), libxcb-randr0-dev, libxxf86vm-dev, libglib2.0-dev, python3, libxext-dev, libdrm-dev [!hurd-any], intltool, dh-python, dh-autoreconf -Standards-Version: 3.9.3 +Maintainer: nicoo +Build-Depends: + debhelper-compat (= 13), + dh-apparmor, + dh-python, + dpkg-dev (>= 1.16.1~), + intltool, + libdrm-dev [!hurd-any], + libglib2.0-dev, + libwayland-dev, + libxcb-randr0-dev, + libxext-dev, + libxxf86vm-dev, + pkg-config (>= 0.25), + python3, +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/debian/redshift.git -Vcs-Browser: https://salsa.debian.org/debian/redshift.git +Vcs-Browser: https://salsa.debian.org/debian/redshift Homepage: http://jonls.dk/redshift/ +Rules-Requires-Root: no Package: redshift Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: geoclue-2.0 Description: Adjusts the color temperature of your screen The color temperature is set according to the position of the sun. A @@ -24,22 +37,21 @@ Package: redshift-gtk Architecture: all -Depends: redshift (>= ${source:Version}), ${misc:Depends}, ${python3:Depends}, python3-xdg, gir1.2-appindicator3-0.1, python3-gi +Depends: + gir1.2-ayatanaappindicator3-0.1, + python3-gi, + python3-xdg, + redshift (>= ${source:Version}), + ${misc:Depends}, + ${python3:Depends}, Recommends: at-spi2-core Replaces: gtk-redshift (<< 1.10-2~) Breaks: gtk-redshift (<< 1.10-2~) -Description: Adjusts the color temperature of your screen with GTK+ integration +Description: Adjusts the color temperature of your screen -- GUI The color temperature is set according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. - -Package: gtk-redshift -Depends: redshift-gtk, ${misc:Depends} -Architecture: all -Description: transitional dummy package - This is a transitional dummy package for redshift-gtk. It can safely be - removed. . - This package provides GTK+ integration. + This package installs a graphical user interface for redshift. diff -Nru redshift-1.12/debian/copyright redshift-1.12/debian/copyright --- redshift-1.12/debian/copyright 2015-08-14 20:19:49.000000000 +0000 +++ redshift-1.12/debian/copyright 2020-12-12 16:43:43.000000000 +0000 @@ -1,41 +1,79 @@ -This work was packaged for Debian by: - - Simon Richter on Thu, 18 Feb 2010 09:58:46 +0100 - -It was downloaded from: - - https://launchpad.net/redshift - -Upstream Authors: - - Martin Koelewijn - Jon Lund Steffensen - -Copyright: - - Copyright © 2010 Martin Koelewijn - Copyright © 2010 Jon Lund Steffensen - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -The Debian packaging is: - - Copyright (C) 2010 Simon Richter - -and is licensed under the GPL version 3, see above. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Redshift +Upstream-Contact: Jon Lund Steffensen +Source: https://github.com/jonls/redshift + +Files: * +Copyright: 2010 Martin Koelewijn + 2010-2018 Jon Lund Steffensen +License: GPL-3+ + +Files: po/*.po +Copyright: 2010-2018 Rosetta Contributors and Canonical Ltd. +License: GPL-3+ + +Files: aclocal.m4 m4/*.m4 + Makefile.in src/redshift-gtk/Makefile.in + compile config.* configure depcomp ltmain.sh missing py-compile +Copyright: 1992-2017 Free Software Foundation, Inc. +License: FSFAP + +Files: m4/intltool.m4 +Copyright: 2001 Eazel, Inc. +License: GPL-2+ + +Files: debian/* +Copyright: 2010 Simon Richter + 2010-2012 Franziska Lichtblau + 2014-2018 Ritesh Raj Sarraf + 2020 nicoo +License: GPL-3+ + +Files: debian/screenshot.png +Copyright: 2014 Jon Lund Steffensen +License: GPL-3+ + + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems the full text of the GNU General Public License + can be found in the `/usr/share/common-licenses/GPL-3' file. + +License: GPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems the full text of the GNU General Public License + can be found in the `/usr/share/common-licenses/GPL-2' file. + +License: FSFAP + This file is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY, to the extent permitted by law; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. diff -Nru redshift-1.12/debian/gbp.conf redshift-1.12/debian/gbp.conf --- redshift-1.12/debian/gbp.conf 2018-09-08 04:26:30.000000000 +0000 +++ redshift-1.12/debian/gbp.conf 2020-12-12 16:43:43.000000000 +0000 @@ -1,5 +1,6 @@ [DEFAULT] pristine-tar = True +debian-branch = debian/sid -[dch] -id-length = 8 +[pq] +patch-numbers = False diff -Nru redshift-1.12/debian/patches/Fix-AppArmor-profile-for-Wayland.patch redshift-1.12/debian/patches/Fix-AppArmor-profile-for-Wayland.patch --- redshift-1.12/debian/patches/Fix-AppArmor-profile-for-Wayland.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/Fix-AppArmor-profile-for-Wayland.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,30 @@ +From: nicoo +Date: Sat, 12 Dec 2020 17:10:21 +0100 +Subject: Fix AppArmor profile for Wayland +Bug-Debian: https://bugs.debian.org/977210 +Forwarded: https://github.com/jonls/redshift/pull/663#issuecomment-743781890 + +--- + data/apparmor/usr.bin.redshift.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in +index d6696db..2b1b0e2 100644 +--- a/data/apparmor/usr.bin.redshift.in ++++ b/data/apparmor/usr.bin.redshift.in +@@ -22,6 +22,7 @@ + #include + #include + #include ++ #include + #include + + dbus send +@@ -36,6 +37,7 @@ + audit dbus bus=system, + + owner @{HOME}/.config/redshift.conf r, ++ owner /run/user/*/redshift-shared-* rw, + + # Site-specific additions and overrides. See local/README for details. + #include diff -Nru redshift-1.12/debian/patches/Implement-Wayland-support.patch redshift-1.12/debian/patches/Implement-Wayland-support.patch --- redshift-1.12/debian/patches/Implement-Wayland-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/Implement-Wayland-support.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,1017 @@ +From: minus +Date: Fri, 24 Apr 2020 13:54:42 +0200 +Subject: Implement Wayland support +Origin: https://github.com/minus7/redshift +Acked-by: Giulio Camuffo +Acked-by: Thomas Weißschuh +Acked-by: Marek Otahal +Acked-by: Dominique Martinet +Forwarded: https://github.com/jonls/redshift/pull/663 +Applied-Upstream: no +Bug: https://github.com/jonls/redshift/issues/55 +Bug-Debian: https://bugs.debian.org/947848 +Reviewed-by: nicoo +Last-Update: 2020-04-23 + +Implement the wlr_gamma_control_unstable_v1 protocol. +The Wayland backend is prioritized over randr since it will fail in +an X11 context anyway (but the randr backend would not fail in a Wayland +context with xwayland support). +The gamma setting is reset when the client disconnects, thus the +behavior for oneshot mode blocks, like for Quartz. +--- + configure.ac | 29 ++++ + po/POTFILES.in | 1 + + src/Makefile.am | 32 ++++ + src/gamma-control.xml | 126 +++++++++++++++ + src/gamma-wl.c | 372 +++++++++++++++++++++++++++++++++++++++++++++ + src/gamma-wl.h | 32 ++++ + src/orbital-authorizer.xml | 61 ++++++++ + src/os-compatibility.c | 148 ++++++++++++++++++ + src/os-compatibility.h | 9 ++ + src/redshift.c | 32 ++-- + 10 files changed, 831 insertions(+), 11 deletions(-) + create mode 100644 src/gamma-control.xml + create mode 100644 src/gamma-wl.c + create mode 100644 src/gamma-wl.h + create mode 100644 src/orbital-authorizer.xml + create mode 100644 src/os-compatibility.c + create mode 100644 src/os-compatibility.h + +diff --git a/configure.ac b/configure.ac +index b411626..8347dcc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,6 +68,10 @@ PKG_CHECK_MODULES([XCB], [xcb], [have_xcb=yes], [have_xcb=no]) + PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr], + [have_xcb_randr=yes], [have_xcb_randr=no]) + ++PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-scanner >= 1.15.0], ++ [have_wayland=yes], [have_wayland=no]) ++PKG_CHECK_VAR(WAYLAND_SCANNER, wayland-scanner, wayland_scanner) ++ + PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no]) + PKG_CHECK_MODULES([GEOCLUE2], [glib-2.0 gio-2.0 >= 2.26], [have_geoclue2=yes], [have_geoclue2=no]) + +@@ -124,6 +128,30 @@ AS_IF([test "x$enable_drm" != xno], [ + ]) + AM_CONDITIONAL([ENABLE_DRM], [test "x$enable_drm" = xyes]) + ++# Check Wayland method ++AC_MSG_CHECKING([whether to enable Wayland method]) ++AC_ARG_ENABLE([wayland], [AC_HELP_STRING([--enable-wayland], ++ [enable Wayland method])], ++ [enable_wayland=$enableval],[enable_wayland=maybe]) ++AS_IF([test "x$enable_wayland" != xno], [ ++ AS_IF([test $have_wayland = yes], [ ++ AC_DEFINE([ENABLE_WAYLAND], 1, ++ [Define to 1 to enable Wayland method]) ++ AC_MSG_RESULT([yes]) ++ enable_wayland=yes ++ ], [ ++ AC_MSG_RESULT([missing dependencies]) ++ AS_IF([test "x$enable_wayland" = xyes], [ ++ AC_MSG_ERROR([missing dependencies for Wayland method]) ++ ]) ++ enable_wayland=no ++ ]) ++], [ ++ AC_MSG_RESULT([no]) ++ enable_wayland=no ++]) ++AM_CONDITIONAL([ENABLE_WAYLAND], [test "x$enable_wayland" = xyes]) ++ + # Check RANDR method + AC_MSG_CHECKING([whether to enable RANDR method]) + AC_ARG_ENABLE([randr], [AC_HELP_STRING([--enable-randr], +@@ -376,6 +404,7 @@ echo " + + Adjustment methods: + DRM: ${enable_drm} ++ Wayland: ${enable_wayland} + RANDR: ${enable_randr} + VidMode: ${enable_vidmode} + Quartz (macOS): ${enable_quartz} +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 5ef8dac..1d25560 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -9,6 +9,7 @@ src/options.c + src/config-ini.c + + src/gamma-drm.c ++src/gamma-wl.c + src/gamma-randr.c + src/gamma-vidmode.c + src/gamma-quartz.c +diff --git a/src/Makefile.am b/src/Makefile.am +index 8aa96ea..ed40f2d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -23,6 +23,7 @@ redshift_SOURCES = \ + + EXTRA_redshift_SOURCES = \ + gamma-drm.c gamma-drm.h \ ++ gamma-wl.c gamma-wl.h \ + gamma-randr.c gamma-randr.h \ + gamma-vidmode.c gamma-vidmode.h \ + gamma-quartz.c gamma-quartz.h \ +@@ -43,6 +44,29 @@ redshift_LDADD += \ + $(DRM_LIBS) $(DRM_CFLAGS) + endif + ++if ENABLE_WAYLAND ++redshift_SOURCES += gamma-wl.c gamma-wl.h os-compatibility.c os-compatibility.h ++ ++AM_CFLAGS += $(WAYLAND_CFLAGS) ++ ++redshift_LDADD += \ ++ $(WAYLAND_LIBS) $(WAYLAND_CFLAGS) ++ ++nodist_redshift_SOURCES = \ ++ gamma-control-protocol.c \ ++ gamma-control-client-protocol.h \ ++ orbital-authorizer-protocol.c \ ++ orbital-authorizer-client-protocol.h ++ ++BUILT_SOURCES = \ ++ gamma-control-protocol.c \ ++ gamma-control-client-protocol.h \ ++ orbital-authorizer-protocol.c \ ++ orbital-authorizer-client-protocol.h ++ ++EXTRA_DIST += gamma-control.xml orbital-authorizer.xml ++endif ++ + if ENABLE_RANDR + redshift_SOURCES += gamma-randr.c gamma-randr.h + AM_CFLAGS += $(XCB_CFLAGS) $(XCB_RANDR_CFLAGS) +@@ -103,3 +127,11 @@ endif + + .rc.o: + $(AM_V_GEN)$(WINDRES) -I$(top_builddir) -i $< -o $@ ++ ++CLEANFILES = *-protocol.c *-client-protocol.h ++ ++%-protocol.c : $(srcdir)/%.xml ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(WAYLAND_SCANNER) private-code < $< > $@ ++ ++%-client-protocol.h : $(srcdir)/%.xml ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(WAYLAND_SCANNER) client-header < $< > $@ +diff --git a/src/gamma-control.xml b/src/gamma-control.xml +new file mode 100644 +index 0000000..ad71a15 +--- /dev/null ++++ b/src/gamma-control.xml +@@ -0,0 +1,126 @@ ++ ++ ++ ++ Copyright © 2015 Giulio camuffo ++ Copyright © 2018 Simon Ser ++ ++ Permission to use, copy, modify, distribute, and sell this ++ software and its documentation for any purpose is hereby granted ++ without fee, provided that the above copyright notice appear in ++ all copies and that both that copyright notice and this permission ++ notice appear in supporting documentation, and that the name of ++ the copyright holders not be used in advertising or publicity ++ pertaining to distribution of the software without specific, ++ written prior permission. The copyright holders make no ++ representations about the suitability of this software for any ++ purpose. It is provided "as is" without express or implied ++ warranty. ++ ++ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS ++ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ++ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ++ THIS SOFTWARE. ++ ++ ++ ++ This protocol allows a privileged client to set the gamma tables for ++ outputs. ++ ++ Warning! The protocol described in this file is experimental and ++ backward incompatible changes may be made. Backward compatible changes ++ may be added together with the corresponding interface version bump. ++ Backward incompatible changes are done by bumping the version number in ++ the protocol and interface names and resetting the interface version. ++ Once the protocol is to be declared stable, the 'z' prefix and the ++ version number in the protocol and interface names are removed and the ++ interface version number is reset. ++ ++ ++ ++ ++ This interface is a manager that allows creating per-output gamma ++ controls. ++ ++ ++ ++ ++ Create a gamma control that can be used to adjust gamma tables for the ++ provided output. ++ ++ ++ ++ ++ ++ ++ ++ All objects created by the manager will still remain valid, until their ++ appropriate destroy request has been called. ++ ++ ++ ++ ++ ++ ++ This interface allows a client to adjust gamma tables for a particular ++ output. ++ ++ The client will receive the gamma size, and will then be able to set gamma ++ tables. At any time the compositor can send a failed event indicating that ++ this object is no longer valid. ++ ++ There must always be at most one gamma control object per output, which ++ has exclusive access to this particular output. When the gamma control ++ object is destroyed, the gamma table is restored to its original value. ++ ++ ++ ++ ++ Advertise the size of each gamma ramp. ++ ++ This event is sent immediately when the gamma control object is created. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Set the gamma table. The file descriptor can be memory-mapped to provide ++ the raw gamma table, which contains successive gamma ramps for the red, ++ green and blue channels. Each gamma ramp is an array of 16-byte unsigned ++ integers which has the same length as the gamma size. ++ ++ The file descriptor data must have the same length as three times the ++ gamma size. ++ ++ ++ ++ ++ ++ ++ This event indicates that the gamma control is no longer valid. This ++ can happen for a number of reasons, including: ++ - The output doesn't support gamma tables ++ - Setting the gamma tables failed ++ - Another client already has exclusive gamma control for this output ++ - The compositor has transfered gamma control to another client ++ ++ Upon receiving this event, the client should destroy this object. ++ ++ ++ ++ ++ ++ Destroys the gamma control object. If the object is still valid, this ++ restores the original gamma tables. ++ ++ ++ ++ +diff --git a/src/gamma-wl.c b/src/gamma-wl.c +new file mode 100644 +index 0000000..477c680 +--- /dev/null ++++ b/src/gamma-wl.c +@@ -0,0 +1,372 @@ ++/* gamma-wl.c -- Wayland gamma adjustment header ++ This file is part of Redshift. ++ ++ Redshift is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ Redshift is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with Redshift. If not, see . ++ ++ Copyright (c) 2015 Giulio Camuffo ++*/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef ENABLE_NLS ++# include ++# define _(s) gettext(s) ++#else ++# define _(s) s ++#endif ++ ++#include "gamma-wl.h" ++#include "os-compatibility.h" ++#include "colorramp.h" ++ ++#include "gamma-control-client-protocol.h" ++#include "orbital-authorizer-client-protocol.h" ++ ++typedef struct { ++ struct wl_display *display; ++ struct wl_registry *registry; ++ struct wl_callback *callback; ++ uint32_t gamma_control_manager_id; ++ struct zwlr_gamma_control_manager_v1 *gamma_control_manager; ++ int num_outputs; ++ struct output *outputs; ++ int authorized; ++} wayland_state_t; ++ ++struct output { ++ uint32_t global_id; ++ struct wl_output *output; ++ struct zwlr_gamma_control_v1 *gamma_control; ++ uint32_t gamma_size; ++}; ++ ++static int ++wayland_init(wayland_state_t **state) ++{ ++ /* Initialize state. */ ++ *state = malloc(sizeof(**state)); ++ if (*state == NULL) return -1; ++ ++ memset(*state, 0, sizeof **state); ++ return 0; ++} ++ ++static void ++authorizer_feedback_granted(void *data, struct orbital_authorizer_feedback *feedback) ++{ ++ wayland_state_t *state = data; ++ state->authorized = 1; ++} ++ ++static void ++authorizer_feedback_denied(void *data, struct orbital_authorizer_feedback *feedback) ++{ ++ fprintf(stderr, _("Fatal: redshift was not authorized to bind the 'zwlr_gamma_control_manager_v1' interface.\n")); ++ exit(EXIT_FAILURE); ++} ++ ++static const struct orbital_authorizer_feedback_listener authorizer_feedback_listener = { ++ authorizer_feedback_granted, ++ authorizer_feedback_denied ++}; ++ ++static void ++registry_global(void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version) ++{ ++ wayland_state_t *state = data; ++ ++ if (strcmp(interface, "zwlr_gamma_control_manager_v1") == 0) { ++ state->gamma_control_manager_id = id; ++ state->gamma_control_manager = wl_registry_bind(registry, id, &zwlr_gamma_control_manager_v1_interface, 1); ++ } else if (strcmp(interface, "wl_output") == 0) { ++ state->num_outputs++; ++ if (!(state->outputs = realloc(state->outputs, state->num_outputs * sizeof(struct output)))) { ++ fprintf(stderr, _("Failed to allcate memory\n")); ++ return; ++ } ++ ++ struct output *output = &state->outputs[state->num_outputs - 1]; ++ output->global_id = id; ++ output->output = wl_registry_bind(registry, id, &wl_output_interface, 1); ++ output->gamma_control = NULL; ++ } else if (strcmp(interface, "orbital_authorizer") == 0) { ++ struct wl_event_queue *queue = wl_display_create_queue(state->display); ++ ++ struct orbital_authorizer *auth = wl_registry_bind(registry, id, &orbital_authorizer_interface, 1u); ++ wl_proxy_set_queue((struct wl_proxy *)auth, queue); ++ ++ struct orbital_authorizer_feedback *feedback = orbital_authorizer_authorize(auth, "zwlr_gamma_control_manager_v1"); ++ orbital_authorizer_feedback_add_listener(feedback, &authorizer_feedback_listener, state); ++ ++ int ret = 0; ++ while (!state->authorized && ret >= 0) { ++ ret = wl_display_dispatch_queue(state->display, queue); ++ } ++ ++ orbital_authorizer_feedback_destroy(feedback); ++ orbital_authorizer_destroy(auth); ++ wl_event_queue_destroy(queue); ++ } ++} ++ ++static void ++registry_global_remove(void *data, struct wl_registry *registry, uint32_t id) ++{ ++ wayland_state_t *state = data; ++ ++ if (state->gamma_control_manager_id == id) { ++ fprintf(stderr, _("The zwlr_gamma_control_manager_v1 was removed\n")); ++ exit(EXIT_FAILURE); ++ } ++ ++ for (int i = 0; i < state->num_outputs; ++i) { ++ struct output *output = &state->outputs[i]; ++ if (output->global_id == id) { ++ if (output->gamma_control) { ++ zwlr_gamma_control_v1_destroy(output->gamma_control); ++ output->gamma_control = NULL; ++ } ++ wl_output_destroy(output->output); ++ ++ /* If the removed output is not the last one in the array move the last one ++ * in the now empty slot. Then shrink the array */ ++ if (i < --state->num_outputs) { ++ memcpy(output, &state->outputs[state->num_outputs], sizeof(struct output)); ++ } ++ state->outputs = realloc(state->outputs, state->num_outputs * sizeof(struct output)); ++ ++ return; ++ } ++ } ++} ++ ++static const struct wl_registry_listener registry_listener = { ++ registry_global, ++ registry_global_remove ++}; ++ ++static void ++gamma_control_gamma_size(void *data, struct zwlr_gamma_control_v1 *control, uint32_t size) ++{ ++ struct output *output = data; ++ output->gamma_size = size; ++} ++ ++static void ++gamma_control_failed(void *data, struct zwlr_gamma_control_v1 *control) ++{ ++} ++ ++ ++static const struct zwlr_gamma_control_v1_listener gamma_control_listener = { ++ gamma_control_gamma_size, ++ gamma_control_failed ++}; ++ ++static int ++wayland_start(wayland_state_t *state) ++{ ++ state->display = wl_display_connect(NULL); ++ if (!state->display) { ++ fputs(_("Could not connect to wayland display, exiting.\n"), stderr); ++ return -1; ++ } ++ state->registry = wl_display_get_registry(state->display); ++ ++ wl_registry_add_listener(state->registry, ®istry_listener, state); ++ ++ wl_display_roundtrip(state->display); ++ if (!state->gamma_control_manager) { ++ return -1; ++ } ++ if (state->num_outputs > 0 && !state->outputs) { ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static void ++wayland_restore(wayland_state_t *state) ++{ ++ for (int i = 0; i < state->num_outputs; ++i) { ++ struct output *output = &state->outputs[i]; ++ if (output->gamma_control) { ++ zwlr_gamma_control_v1_destroy(output->gamma_control); ++ output->gamma_control = NULL; ++ } ++ } ++ wl_display_flush(state->display); ++} ++ ++static void ++wayland_free(wayland_state_t *state) ++{ ++ int ret = 0; ++ /* Wait for the sync callback to destroy everything, otherwise ++ * we could destroy the gamma control before gamma has been set */ ++ while (state->callback && ret >= 0) { ++ ret = wl_display_dispatch(state->display); ++ } ++ if (state->callback) { ++ fprintf(stderr, _("Ignoring error on wayland connection while waiting to disconnect: %d\n"), ret); ++ wl_callback_destroy(state->callback); ++ } ++ ++ for (int i = 0; i < state->num_outputs; ++i) { ++ struct output *output = &state->outputs[i]; ++ if (output->gamma_control) { ++ zwlr_gamma_control_v1_destroy(output->gamma_control); ++ output->gamma_control = NULL; ++ } ++ wl_output_destroy(output->output); ++ } ++ ++ if (state->gamma_control_manager) { ++ zwlr_gamma_control_manager_v1_destroy(state->gamma_control_manager); ++ } ++ if (state->registry) { ++ wl_registry_destroy(state->registry); ++ } ++ if (state->display) { ++ wl_display_disconnect(state->display); ++ } ++ ++ free(state); ++} ++ ++static void ++wayland_print_help(FILE *f) ++{ ++ fputs(_("Adjust gamma ramps with a Wayland compositor.\n"), f); ++ fputs("\n", f); ++} ++ ++static int ++wayland_set_option(wayland_state_t *state, const char *key, const char *value) ++{ ++ return 0; ++} ++ ++static void ++callback_done(void *data, struct wl_callback *cb, uint32_t t) ++{ ++ wayland_state_t *state = data; ++ state->callback = NULL; ++ wl_callback_destroy(cb); ++} ++ ++static const struct wl_callback_listener callback_listener = { ++ callback_done ++}; ++ ++static int ++wayland_set_temperature(wayland_state_t *state, const color_setting_t *setting) ++{ ++ int ret = 0, roundtrip = 0; ++ ++ /* We wait for the sync callback to throttle a bit and not send more ++ * requests than the compositor can manage, otherwise we'd get disconnected. ++ * This also allows us to dispatch other incoming events such as ++ * wl_registry.global_remove. */ ++ while (state->callback && ret >= 0) { ++ ret = wl_display_dispatch(state->display); ++ } ++ if (ret < 0) { ++ fprintf(stderr, _("The Wayland connection experienced a fatal error: %d\n"), ret); ++ return ret; ++ } ++ ++ for (int i = 0; i < state->num_outputs; ++i) { ++ struct output *output = &state->outputs[i]; ++ if (!output->gamma_control) { ++ output->gamma_control = zwlr_gamma_control_manager_v1_get_gamma_control(state->gamma_control_manager, output->output); ++ zwlr_gamma_control_v1_add_listener(output->gamma_control, &gamma_control_listener, output); ++ roundtrip = 1; ++ } ++ } ++ if (roundtrip) { ++ wl_display_roundtrip(state->display); ++ } ++ ++ for (int i = 0; i < state->num_outputs; ++i) { ++ struct output *output = &state->outputs[i]; ++ int size = output->gamma_size; ++ size_t ramp_bytes = size * sizeof(uint16_t); ++ size_t total_bytes = ramp_bytes * 3; ++ ++ int fd = os_create_anonymous_file(total_bytes); ++ if (fd < 0) { ++ perror("os_create_anonymous_file"); ++ return -1; ++ } ++ ++ void *ptr = mmap(NULL, total_bytes, ++ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); ++ if (ptr == MAP_FAILED) { ++ perror("mmap"); ++ close(fd); ++ return -1; ++ } ++ ++ uint16_t *r_gamma = ptr; ++ uint16_t *g_gamma = ptr + ramp_bytes; ++ uint16_t *b_gamma = ptr + 2 * ramp_bytes; ++ ++ /* Initialize gamma ramps to pure state */ ++ for (int i = 0; i < size; i++) { ++ uint16_t value = (double)i / size * (UINT16_MAX+1); ++ r_gamma[i] = value; ++ g_gamma[i] = value; ++ b_gamma[i] = value; ++ } ++ ++ colorramp_fill(r_gamma, g_gamma, b_gamma, size, setting); ++ if (munmap(ptr, total_bytes) == -1) { ++ perror("munmap"); ++ close(fd); ++ return -1; ++ } ++ ++ zwlr_gamma_control_v1_set_gamma(output->gamma_control, fd); ++ close(fd); ++ } ++ ++ state->callback = wl_display_sync(state->display); ++ wl_callback_add_listener(state->callback, &callback_listener, state); ++ wl_display_flush(state->display); ++ ++ return 0; ++} ++ ++const gamma_method_t wl_gamma_method = { ++ "wayland", ++ 1, ++ (gamma_method_init_func *) wayland_init, ++ (gamma_method_start_func *) wayland_start, ++ (gamma_method_free_func *) wayland_free, ++ (gamma_method_print_help_func *) wayland_print_help, ++ (gamma_method_set_option_func *) wayland_set_option, ++ (gamma_method_restore_func *) wayland_restore, ++ (gamma_method_set_temperature_func *) wayland_set_temperature, ++}; +diff --git a/src/gamma-wl.h b/src/gamma-wl.h +new file mode 100644 +index 0000000..333e99b +--- /dev/null ++++ b/src/gamma-wl.h +@@ -0,0 +1,32 @@ ++/* gamma-wl.h -- Wayland gamma adjustment header ++ This file is part of Redshift. ++ ++ Redshift is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ Redshift is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with Redshift. If not, see . ++ ++ Copyright (c) 2015 Giulio Camuffo ++*/ ++ ++#ifndef REDSHIFT_GAMMA_WAYLAND_H ++#define REDSHIFT_GAMMA_WAYLAND_H ++ ++#include ++ ++#include ++ ++#include "redshift.h" ++ ++extern const gamma_method_t wl_gamma_method; ++ ++ ++#endif /* ! REDSHIFT_GAMMA_DRM_H */ +diff --git a/src/orbital-authorizer.xml b/src/orbital-authorizer.xml +new file mode 100644 +index 0000000..bccaa08 +--- /dev/null ++++ b/src/orbital-authorizer.xml +@@ -0,0 +1,61 @@ ++ ++ ++ ++ ++ The orbital_authorizer global interface allows clients to ++ ask the compositor the authorization to bind certain restricted ++ global interfaces. ++ Any client that aims to bind restricted interfaces should first ++ request the authorization by using this interface. Failing to do ++ so will result in the compositor sending a protocol error to the ++ client when it binds the restricted interface. ++ ++ The list of restricted interfaces is compositor dependant, but must ++ not include the core interfaces defined in wayland.xml. ++ ++ ++ ++ ++ ++ ++ ++ ++ The authorize request allows the client to ask the compositor the ++ authorization to bind a restricted global interface. The newly ++ created orbital_authorizer_feedback will be invalid after the ++ compositor send either the granted or denied event so the client ++ must destroy it immediately after. ++ ++ ++ ++ ++ ++ ++ ++ ++ The orbital_authorizer_feedback interface is used by requesting ++ an authorization with the orbital_authorizer.authorize request. ++ The compositor will send either the granted or denied event based ++ on the system and user configuration. How the authorization process ++ works is compositor specific, but a compositor is allowed to ask ++ for user input, so the response for an authorization request may ++ come after some time. ++ ++ ++ ++ ++ The authorization was granted. The client can now bind the restricted ++ interface. ++ ++ ++ ++ ++ ++ The authorization was denied. The client is not allowed to bind the ++ restricted interface and trying to do so will trigger a protocol ++ error killing the client. ++ ++ ++ ++ ++ +diff --git a/src/os-compatibility.c b/src/os-compatibility.c +new file mode 100644 +index 0000000..32a9109 +--- /dev/null ++++ b/src/os-compatibility.c +@@ -0,0 +1,148 @@ ++/* ++ * Copyright © 2012 Collabora, Ltd. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining ++ * a copy of this software and associated documentation files (the ++ * "Software"), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sublicense, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the ++ * next paragraph) shall be included in all copies or substantial ++ * portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ * SOFTWARE. ++ */ ++ ++#define _POSIX_C_SOURCE 200809L ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "os-compatibility.h" ++ ++int os_fd_set_cloexec(int fd) { ++ if (fd == -1) { ++ return -1; ++ } ++ ++ long flags = fcntl(fd, F_GETFD); ++ if (flags == -1) { ++ return -1; ++ } ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) { ++ return -1; ++ } ++ ++ return 0; ++} ++ ++int set_cloexec_or_close(int fd) { ++ if (os_fd_set_cloexec(fd) != 0) { ++ close(fd); ++ return -1; ++ } ++ return fd; ++} ++ ++int create_tmpfile_cloexec(char *tmpname) { ++ int fd; ++ mode_t prev_umask = umask(0066); ++#ifdef HAVE_MKOSTEMP ++ fd = mkostemp(tmpname, O_CLOEXEC); ++ if (fd >= 0) { ++ unlink(tmpname); ++ } ++#else ++ fd = mkstemp(tmpname); ++ if (fd >= 0) { ++ fd = set_cloexec_or_close(fd); ++ unlink(tmpname); ++ } ++#endif ++ umask(prev_umask); ++ ++ return fd; ++} ++ ++/* ++ * Create a new, unique, anonymous file of the given size, and ++ * return the file descriptor for it. The file descriptor is set ++ * CLOEXEC. The file is immediately suitable for mmap()'ing ++ * the given size at offset zero. ++ * ++ * The file should not have a permanent backing store like a disk, ++ * but may have if XDG_RUNTIME_DIR is not properly implemented in OS. ++ * ++ * The file name is deleted from the file system. ++ * ++ * The file is suitable for buffer sharing between processes by ++ * transmitting the file descriptor over Unix sockets using the ++ * SCM_RIGHTS methods. ++ * ++ * If the C library implements posix_fallocate(), it is used to ++ * guarantee that disk space is available for the file at the ++ * given size. If disk space is insufficient, errno is set to ENOSPC. ++ * If posix_fallocate() is not supported, program may receive ++ * SIGBUS on accessing mmap()'ed file contents instead. ++ */ ++int os_create_anonymous_file(off_t size) { ++ static const char template[] = "/redshift-shared-XXXXXX"; ++ ++ const char *path = getenv("XDG_RUNTIME_DIR"); ++ if (!path) { ++ errno = ENOENT; ++ return -1; ++ } ++ ++ char *name = malloc(strlen(path) + sizeof(template)); ++ if (!name) { ++ return -1; ++ } ++ ++ strcpy(name, path); ++ strcat(name, template); ++ ++ int fd = create_tmpfile_cloexec(name); ++ free(name); ++ if (fd < 0) { ++ return -1; ++ } ++ ++#ifdef WLR_HAS_POSIX_FALLOCATE ++ int ret; ++ do { ++ ret = posix_fallocate(fd, 0, size); ++ } while (ret == EINTR); ++ if (ret != 0) { ++ close(fd); ++ errno = ret; ++ return -1; ++ } ++#else ++ int ret; ++ do { ++ ret = ftruncate(fd, size); ++ } while (ret < 0 && errno == EINTR); ++ if (ret < 0) { ++ close(fd); ++ return -1; ++ } ++#endif ++ ++ return fd; ++} +diff --git a/src/os-compatibility.h b/src/os-compatibility.h +new file mode 100644 +index 0000000..2038025 +--- /dev/null ++++ b/src/os-compatibility.h +@@ -0,0 +1,9 @@ ++#ifndef UTIL_OS_COMPATIBILITY_H ++#define UTIL_OS_COMPATIBILITY_H ++ ++int os_fd_set_cloexec(int fd); ++int set_cloexec_or_close(int fd); ++int create_tmpfile_cloexec(char *tmpname); ++int os_create_anonymous_file(off_t size); ++ ++#endif +diff --git a/src/redshift.c b/src/redshift.c +index e0221d5..488503e 100644 +--- a/src/redshift.c ++++ b/src/redshift.c +@@ -94,6 +94,10 @@ int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } + # include "gamma-w32gdi.h" + #endif + ++#ifdef ENABLE_WAYLAND ++# include "gamma-wl.h" ++#endif ++ + + #include "location-manual.h" + +@@ -902,6 +906,9 @@ main(int argc, char *argv[]) + + /* List of gamma methods. */ + const gamma_method_t gamma_methods[] = { ++#ifdef ENABLE_WAYLAND ++ wl_gamma_method, ++#endif + #ifdef ENABLE_DRM + drm_gamma_method, + #endif +@@ -1237,11 +1244,12 @@ main(int argc, char *argv[]) + exit(EXIT_FAILURE); + } + +- /* In Quartz (macOS) the gamma adjustments will +- automatically revert when the process exits. ++ /* In Quartz (macOS) and wayland, the gamma adjustments ++ will automatically revert when the process exits. + Therefore, we have to loop until CTRL-C is received. + */ +- if (strcmp(options.method->name, "quartz") == 0) { ++ if (strcmp(options.method->name, "quartz") == 0 || ++ strcmp(options.method->name, "wayland") == 0) { + fputs(_("Press ctrl-c to stop...\n"), stderr); + pause(); + } +@@ -1266,10 +1274,11 @@ main(int argc, char *argv[]) + exit(EXIT_FAILURE); + } + +- /* In Quartz (OSX) the gamma adjustments will automatically +- revert when the process exits. Therefore, we have to loop +- until CTRL-C is received. */ +- if (strcmp(options.method->name, "quartz") == 0) { ++ /* In Quartz (OSX) and wayland, the gamma adjustments will ++ automatically revert when the process exits. ++ Therefore, we have to loop until CTRL-C is received. */ ++ if (strcmp(options.method->name, "quartz") == 0 || ++ strcmp(options.method->name, "wayland") == 0) { + fputs(_("Press ctrl-c to stop...\n"), stderr); + pause(); + } +@@ -1288,10 +1297,11 @@ main(int argc, char *argv[]) + exit(EXIT_FAILURE); + } + +- /* In Quartz (OSX) the gamma adjustments will automatically +- revert when the process exits. Therefore, we have to loop +- until CTRL-C is received. */ +- if (strcmp(options.method->name, "quartz") == 0) { ++ /* In Quartz (OSX) and wayland, the gamma adjustments will ++ automatically revert when the process exits. ++ Therefore, we have to loop until CTRL-C is received. */ ++ if (strcmp(options.method->name, "quartz") == 0 || ++ strcmp(options.method->name, "wayland") == 0) { + fputs(_("Press ctrl-c to stop...\n"), stderr); + pause(); + } diff -Nru redshift-1.12/debian/patches/redshift-gtk-Link-to-a-local-copy-of-the-screenshot.patch redshift-1.12/debian/patches/redshift-gtk-Link-to-a-local-copy-of-the-screenshot.patch --- redshift-1.12/debian/patches/redshift-gtk-Link-to-a-local-copy-of-the-screenshot.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/redshift-gtk-Link-to-a-local-copy-of-the-screenshot.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,25 @@ +From: nicoo +Date: Fri, 24 Apr 2020 14:22:46 +0200 +Subject: redshift-gtk: Link to a local copy of the screenshot +Forwarded: not-needed +Last-Update: 2020-12-12 + +Making users fetch a remote copy is a privacy issue, compounded by the +specified host only supporting plaintext HTTP. +--- + data/appdata/redshift-gtk.metainfo.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/appdata/redshift-gtk.metainfo.xml.in b/data/appdata/redshift-gtk.metainfo.xml.in +index c15625f..3f795af 100644 +--- a/data/appdata/redshift-gtk.metainfo.xml.in ++++ b/data/appdata/redshift-gtk.metainfo.xml.in +@@ -20,7 +20,7 @@ + + + +- http://jonls.dk/assets/screenshot1.png ++ file:///usr/share/doc/redshift-gtk/screenshot.png + The Redshift information window overlaid with an example of the redness effect + + diff -Nru redshift-1.12/debian/patches/redshift-gtk-use-Ayatana-AppIndicator3-instead-of-App-Ind.patch redshift-1.12/debian/patches/redshift-gtk-use-Ayatana-AppIndicator3-instead-of-App-Ind.patch --- redshift-1.12/debian/patches/redshift-gtk-use-Ayatana-AppIndicator3-instead-of-App-Ind.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/redshift-gtk-use-Ayatana-AppIndicator3-instead-of-App-Ind.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,33 @@ +From: Kentaro Hayashi +Date: Mon, 27 Apr 2020 11:56:02 +0900 +Subject: redshift-gtk: use Ayatana AppIndicator3 instead of App Indicator3 +Bug-Debian: https://bugs.debian.org/895037 +Forwarded: https://github.com/jonls/redshift/pull/757 +Reviewed-by: nicoo +Last-Update: 2020-12-12 + +libappindicator was deprecated and it will be removed in the +future Debian release. + +There is a successor API compatible library - Ayatana Indicator. + + https://ayatanaindicators.github.io/code/ +--- + src/redshift-gtk/statusicon.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py +index 3325403..bbd6837 100644 +--- a/src/redshift-gtk/statusicon.py ++++ b/src/redshift-gtk/statusicon.py +@@ -33,8 +33,8 @@ gi.require_version('Gtk', '3.0') + from gi.repository import Gtk, GLib + + try: +- gi.require_version('AppIndicator3', '0.1') +- from gi.repository import AppIndicator3 as appindicator ++ gi.require_version('AyatanaAppIndicator3', '0.1') ++ from gi.repository import AyatanaAppIndicator3 as appindicator + except (ImportError, ValueError): + appindicator = None + diff -Nru redshift-1.12/debian/patches/series redshift-1.12/debian/patches/series --- redshift-1.12/debian/patches/series 2016-05-16 10:10:54.000000000 +0000 +++ redshift-1.12/debian/patches/series 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,7 @@ +Implement-Wayland-support.patch +src-redshift.c-Fix-typo-in-error-message.patch +Update-AppStream-metadata-for-redshift-gtk.patch +redshift-gtk-Link-to-a-local-copy-of-the-screenshot.patch +Update-translations-for-appstream-metadata.patch +redshift-gtk-use-Ayatana-AppIndicator3-instead-of-App-Ind.patch +Fix-AppArmor-profile-for-Wayland.patch diff -Nru redshift-1.12/debian/patches/src-redshift.c-Fix-typo-in-error-message.patch redshift-1.12/debian/patches/src-redshift.c-Fix-typo-in-error-message.patch --- redshift-1.12/debian/patches/src-redshift.c-Fix-typo-in-error-message.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/src-redshift.c-Fix-typo-in-error-message.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,529 @@ +From: nicoo +Date: Fri, 24 Apr 2020 14:06:38 +0200 +Subject: src/redshift.c: Fix typo in error message +Forwarded: https://github.com/jonls/redshift/pull/781 +Last-Update: 2020-12-11 + +--- + po/ar.po | 2 +- + po/be.po | 2 +- + po/bg.po | 2 +- + po/ca.po | 2 +- + po/cs.po | 2 +- + po/da.po | 2 +- + po/de.po | 2 +- + po/el.po | 2 +- + po/en_GB.po | 4 ++-- + po/es.po | 2 +- + po/et.po | 2 +- + po/eu.po | 2 +- + po/fi.po | 2 +- + po/fr.po | 2 +- + po/gl.po | 2 +- + po/he.po | 2 +- + po/hi.po | 2 +- + po/hr.po | 2 +- + po/hu.po | 2 +- + po/it.po | 2 +- + po/ja.po | 2 +- + po/ka.po | 2 +- + po/lt.po | 2 +- + po/nb.po | 2 +- + po/nl.po | 2 +- + po/pl.po | 2 +- + po/pt.po | 2 +- + po/pt_BR.po | 2 +- + po/ro.po | 2 +- + po/ru.po | 2 +- + po/sr.po | 2 +- + po/sv.po | 2 +- + po/tr.po | 2 +- + po/uk.po | 2 +- + po/zh_CN.po | 2 +- + po/zh_TW.po | 2 +- + src/redshift.c | 2 +- + 37 files changed, 38 insertions(+), 38 deletions(-) + +diff --git a/po/ar.po b/po/ar.po +index 5dd208f..dd0b590 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/be.po b/po/be.po +index 0767e93..11e4808 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -239,7 +239,7 @@ msgstr "" + "гэтае не стане даступна...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Частковая наладка часу не падтрымліваецца!\n" + + #: ../src/redshift.c:975 +diff --git a/po/bg.po b/po/bg.po +index 557758c..af4a984 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/ca.po b/po/ca.po +index 0bd8ce6..525b520 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -240,7 +240,7 @@ msgstr "" + "anterior fins que estigui disponible...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "No s'admet la configuració parcial de l'hora!\n" + + #: ../src/redshift.c:975 +diff --git a/po/cs.po b/po/cs.po +index eb1b5b6..3dedbf2 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -238,7 +238,7 @@ msgstr "" + "předchozí…\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Částečné nastavení času není podporováno!\n" + + #: ../src/redshift.c:975 +diff --git a/po/da.po b/po/da.po +index cd943e1..cb012e7 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -238,7 +238,7 @@ msgstr "" + "bliver tilgængelig...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Delvis tidskonfiguration understøttet ikke!\n" + + #: ../src/redshift.c:975 +diff --git a/po/de.po b/po/de.po +index 90dc99c..fafd112 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -238,7 +238,7 @@ msgstr "" + "Standort verwendet.\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Teilzeitkonfiguration wird nicht unterstützt!\n" + + #: ../src/redshift.c:975 +diff --git a/po/el.po b/po/el.po +index cbb98ad..8370b84 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/en_GB.po b/po/en_GB.po +index 8642608..6bdb721 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -237,8 +237,8 @@ msgstr "" + "becomes available...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" +-msgstr "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" ++msgstr "Partial time-configuration not supported!\n" + + #: ../src/redshift.c:975 + msgid "Invalid dawn/dusk time configuration!\n" +diff --git a/po/es.po b/po/es.po +index 48032d1..898ec9c 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -240,7 +240,7 @@ msgstr "" + "anterior hasta que esté disponible...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "¡No se admite la configuración parcial de la hora!\n" + + #: ../src/redshift.c:975 +diff --git a/po/et.po b/po/et.po +index 6ff6644..6d9c7c0 100644 +--- a/po/et.po ++++ b/po/et.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/eu.po b/po/eu.po +index 3467d7c..3466da7 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/fi.po b/po/fi.po +index 83f5f8d..3ed961f 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -227,7 +227,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/fr.po b/po/fr.po +index 1d310f2..c51b1d1 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -239,7 +239,7 @@ msgstr "" + "localisation précédente jusqu'à résolution...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/gl.po b/po/gl.po +index dceea22..5279b48 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/he.po b/po/he.po +index b276320..1403309 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -228,7 +228,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/hi.po b/po/hi.po +index bab712f..edff9d0 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/hr.po b/po/hr.po +index 6cca5d2..6f19260 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/hu.po b/po/hu.po +index 1492f8b..80375fb 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -238,7 +238,7 @@ msgstr "" + "nincs új adat...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Részleges időbeállítás nem támogatott!\n" + + #: ../src/redshift.c:975 +diff --git a/po/it.po b/po/it.po +index dae4a99..c27dfc2 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -238,7 +238,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/ja.po b/po/ja.po +index 77a450b..317541a 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -230,7 +230,7 @@ msgid "" + msgstr "位置情報は一時的に利用不能です; 利用可能になるまでは前回の位置を使用します...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "部分的な時刻設定はサポートされていません!\n" + + #: ../src/redshift.c:975 +diff --git a/po/ka.po b/po/ka.po +index 9360b36..a44a4b3 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/lt.po b/po/lt.po +index 7ae6298..1038792 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -234,7 +234,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/nb.po b/po/nb.po +index 74392ad..ae83deb 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -235,7 +235,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/nl.po b/po/nl.po +index 09dc2ab..31a63f6 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -239,7 +239,7 @@ msgstr "" + "totdat zij alsnog beschikbaar komt...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Gedeeltelijke tijdinstelling wordt niet ondersteund.\n" + + #: ../src/redshift.c:975 +diff --git a/po/pl.po b/po/pl.po +index 6585d99..3a6a346 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -236,7 +236,7 @@ msgstr "" + "aż ta będzie dostępna\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Częściowa konfiguracja czasu nie jest wspierana!\n" + + #: ../src/redshift.c:975 +diff --git a/po/pt.po b/po/pt.po +index a82d6a1..83efee5 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 6eeee34..215af9c 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -239,7 +239,7 @@ msgstr "" + "anterior até ficar disponível ...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Configuração parcial de tempo não suportada!\n" + + #: ../src/redshift.c:975 +diff --git a/po/ro.po b/po/ro.po +index 21dc2c3..82a2694 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -225,7 +225,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/ru.po b/po/ru.po +index ee7587d..993894c 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -235,7 +235,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/sr.po b/po/sr.po +index 9a8f67f..5d99e91 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -235,7 +235,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/sv.po b/po/sv.po +index d3e9772..cbaa7c9 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -237,7 +237,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/tr.po b/po/tr.po +index ce0ad32..6f9d2ea 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/uk.po b/po/uk.po +index 2a980bf..ce26f10 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -238,7 +238,7 @@ msgstr "" + "знаходження поки воно не буде доступним...\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "Часткова конфігурація часу не підтримується!\n" + + #: ../src/redshift.c:975 +diff --git a/po/zh_CN.po b/po/zh_CN.po +index e638340..bf15c17 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -226,7 +226,7 @@ msgid "" + msgstr "" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "" + + #: ../src/redshift.c:975 +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 6894b6e..14c99d5 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -228,7 +228,7 @@ msgid "" + msgstr "位置資訊暫時無法使用；使用之前的位置資訊，直到可用提供…\n" + + #: ../src/redshift.c:967 +-msgid "Partitial time-configuration not supported!\n" ++msgid "Partial time-configuration not supported!\n" + msgstr "有部分的時間配置尚未支援！\n" + + #: ../src/redshift.c:975 +diff --git a/src/redshift.c b/src/redshift.c +index 488503e..5165168 100644 +--- a/src/redshift.c ++++ b/src/redshift.c +@@ -972,7 +972,7 @@ main(int argc, char *argv[]) + options.scheme.dawn.end < 0 || + options.scheme.dusk.start < 0 || + options.scheme.dusk.end < 0) { +- fputs(_("Partitial time-configuration not" ++ fputs(_("Partial time-configuration not" + " supported!\n"), stderr); + exit(EXIT_FAILURE); + } diff -Nru redshift-1.12/debian/patches/Update-AppStream-metadata-for-redshift-gtk.patch redshift-1.12/debian/patches/Update-AppStream-metadata-for-redshift-gtk.patch --- redshift-1.12/debian/patches/Update-AppStream-metadata-for-redshift-gtk.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/Update-AppStream-metadata-for-redshift-gtk.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,97 @@ +From: nicoo +Date: Fri, 24 Apr 2020 14:20:04 +0200 +Subject: Update AppStream metadata for redshift-gtk +Forwarded: https://github.com/jonls/redshift/pull/782 +Last-Update: 2020-12-11 + +The metadata was previously expressed in a legacy format, +and installed in a legacy location. +--- + Makefile.am | 4 ++-- + data/appdata/redshift-gtk.appdata.xml.in | 20 -------------------- + data/appdata/redshift-gtk.metainfo.xml.in | 27 +++++++++++++++++++++++++++ + 3 files changed, 29 insertions(+), 22 deletions(-) + delete mode 100644 data/appdata/redshift-gtk.appdata.xml.in + create mode 100644 data/appdata/redshift-gtk.metainfo.xml.in + +diff --git a/Makefile.am b/Makefile.am +index 7e58f08..5fb6c5a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -37,7 +37,7 @@ SYSTEMD_USER_UNIT_IN_FILES = \ + data/systemd/redshift-gtk.service.in + + APPDATA_IN_FILES = \ +- data/appdata/redshift-gtk.appdata.xml.in ++ data/appdata/redshift-gtk.metainfo.xml.in + + APPARMOR_IN_FILES = \ + data/apparmor/usr.bin.redshift.in +@@ -95,7 +95,7 @@ $(systemduserunit_DATA): $(SYSTEMD_USER_UNIT_IN_FILES) Makefile + + # Appdata file + if ENABLE_GUI +-appdatadir = @datadir@/appdata ++appdatadir = @datadir@/metainfo + appdata_DATA = $(APPDATA_IN_FILES:.xml.in=.xml) + + # We would preferable use @INTLTOOL_XML_RULE@ here but +diff --git a/data/appdata/redshift-gtk.appdata.xml.in b/data/appdata/redshift-gtk.appdata.xml.in +deleted file mode 100644 +index 3639984..0000000 +--- a/data/appdata/redshift-gtk.appdata.xml.in ++++ /dev/null +@@ -1,20 +0,0 @@ +- +- +- +- redshift-gtk.desktop +- CC0 +- GPL-3.0+ +- +- <_p>Redshift adjusts the color temperature of your screen according to your surroundings. This may help your eyes hurt less if you are working in front of the screen at night. +- <_p>The color temperature is set according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. +- <_p>This program provides a status icon that allows the user to control Redshift. +- +- +- +- http://jonls.dk/assets/screenshot1.png +- <_caption>The Redshift information window overlaid with an example of the redness effect +- +- +- http://jonls.dk/redshift/ +- jonlst@gmail.com +- +diff --git a/data/appdata/redshift-gtk.metainfo.xml.in b/data/appdata/redshift-gtk.metainfo.xml.in +new file mode 100644 +index 0000000..c15625f +--- /dev/null ++++ b/data/appdata/redshift-gtk.metainfo.xml.in +@@ -0,0 +1,27 @@ ++ ++ ++ ++ dk.jonls.redshift.gtk ++ Redshift ++ CC0 ++ GPL-3.0+ ++ http://jonls.dk/redshift/ ++ Jon Lund Steffensen ++ jonlst@gmail.com ++ redshift-gtk.desktop ++ ++ Adjusts the color temperature of your screen according to your surroundings ++ ++ ++

Redshift adjusts the color temperature of your screen according to your surroundings. This may help your eyes hurt less if you are working in front of the screen at night.

++

The color temperature is set according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt.

++

This program provides a status icon that allows the user to control Redshift.

++ ++ ++ ++ ++ http://jonls.dk/assets/screenshot1.png ++ The Redshift information window overlaid with an example of the redness effect ++ ++ ++ diff -Nru redshift-1.12/debian/patches/Update-translations-for-appstream-metadata.patch redshift-1.12/debian/patches/Update-translations-for-appstream-metadata.patch --- redshift-1.12/debian/patches/Update-translations-for-appstream-metadata.patch 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/patches/Update-translations-for-appstream-metadata.patch 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1,1407 @@ +From: nicoo +Date: Fri, 24 Apr 2020 14:36:51 +0200 +Subject: Update translations for appstream metadata +Forwarded: https://github.com/jonls/redshift/pull/782 +Last-Update: 2020-12-11 + +--- + po/POTFILES.in | 2 +- + po/ar.po | 8 ++++---- + po/be.po | 8 ++++---- + po/bg.po | 8 ++++---- + po/ca.po | 8 ++++---- + po/cs.po | 8 ++++---- + po/da.po | 8 ++++---- + po/de.po | 8 ++++---- + po/el.po | 8 ++++---- + po/en_GB.po | 8 ++++---- + po/es.po | 8 ++++---- + po/et.po | 8 ++++---- + po/eu.po | 8 ++++---- + po/fi.po | 8 ++++---- + po/fr.po | 8 ++++---- + po/gl.po | 8 ++++---- + po/he.po | 8 ++++---- + po/hi.po | 8 ++++---- + po/hr.po | 8 ++++---- + po/hu.po | 8 ++++---- + po/it.po | 8 ++++---- + po/ja.po | 8 ++++---- + po/ka.po | 8 ++++---- + po/lt.po | 8 ++++---- + po/nb.po | 8 ++++---- + po/nl.po | 8 ++++---- + po/pl.po | 8 ++++---- + po/pt.po | 8 ++++---- + po/pt_BR.po | 8 ++++---- + po/ro.po | 8 ++++---- + po/ru.po | 8 ++++---- + po/sr.po | 8 ++++---- + po/sv.po | 8 ++++---- + po/tr.po | 8 ++++---- + po/uk.po | 8 ++++---- + po/zh_CN.po | 8 ++++---- + po/zh_TW.po | 8 ++++---- + 37 files changed, 145 insertions(+), 145 deletions(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 1d25560..a687643 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -1,6 +1,6 @@ + # List of source files containing translatable strings + +-data/appdata/redshift-gtk.appdata.xml.in ++data/appdata/redshift-gtk.metainfo.xml.in + data/applications/redshift.desktop.in + data/applications/redshift-gtk.desktop.in + +diff --git a/po/ar.po b/po/ar.po +index dd0b590..46207eb 100644 +--- a/po/ar.po ++++ b/po/ar.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: ar\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/be.po b/po/be.po +index 11e4808..0669f53 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: be\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift рэгулюе каляровую тэмпературу экрана ў адпаведнасці з асяроддзем. " + "Гэта можа дапамагчы вашым вачам, калі вы працуеце ноччу." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "тэмпературы ночы да тэмпературы ў дзённы час, каб вашыя вочы паступова " + "прызвычаіліся." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "У праграмы ёсць значок на прасторы апавяшчэнняў, праз які можна кіраваць " + "Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/bg.po b/po/bg.po +index af4a984..8d6c3d3 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: bg\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/ca.po b/po/ca.po +index 525b520..ba5fd67 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: ca\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "l'entorn. Aquest ajust pot ajudar a reduir el dolor d'ulls si treballeu " + "davant una pantalla a la nit." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -41,14 +41,14 @@ msgstr "" + "temperatura nocturna o viceversa, per permetre que els ulls s'adaptin " + "lentament." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Aquest programa proporciona una icona de notificació que permet a l'usuari " + "controlar el Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/cs.po b/po/cs.po +index 3dedbf2..8dd17f0 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: cs\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "okolních podmínkách. To může pomoci od únavy očí při práci s počítačem v " + "noci." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,13 +40,13 @@ msgstr "" + "rozednívání, barevná teplota pozvolna přejde z jednoho režimu do druhého, " + "aby se oči stačily přizpůsobit." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Tato aplikace poskytuje stavovou ikonu, pomocí níž je možné Redshift ovládat." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/da.po b/po/da.po +index cb012e7..f88e1a9 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -17,7 +17,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: da\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "omgivelser. Dette kan mindske anstrengelser i øjnene hvis du arbejder foran " + "skærmen om natten." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,14 +39,14 @@ msgstr "" + "glidende overgang mellem nattemperatur og dagtemperatur som langsomt lader " + "dine øjne vænne sig til den ændrede farvetemperatur." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Dette program indeholder et statuslinjeikon som lader brugeren styre " + "Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/de.po b/po/de.po +index fafd112..9d9443a 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: de\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift passt die Farbtemperator des Bildschirms an die Umgebung an. Somit " + "werden die Augen geschont wenn man nachts am Bildschirm arbeitet." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,14 +39,14 @@ msgstr "" + "Dämmerung und am frühen Morgen wird die Farbtemperatur weich von Nacht auf " + "Tag umgestellt, damit sich Ihre Augen langsam anpassen können." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Dieses Programm bietet ein Statussymbol, das es dem Benutzer ermöglicht, " + "Redshift zu steuern." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/el.po b/po/el.po +index 8370b84..3142419 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: el\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/en_GB.po b/po/en_GB.po +index 6bdb721..8ac2da2 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -17,7 +17,7 @@ msgstr "" + "X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" + "X-Generator: Launchpad (build 18658)\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,13 +39,13 @@ msgstr "" + "twilight and early morning, the colour temperature transitions smoothly from " + "night to daytime temperature to allow your eyes to slowly adapt." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "This program provides a status icon that allows the user to control Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/es.po b/po/es.po +index 898ec9c..41cba61 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: es\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "entorno. Este ajuste puede ayudar a reducir el dolor de ojos si trabaja " + "frente una pantalla por la noche." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -41,14 +41,14 @@ msgstr "" + "diurna a temperatura nocturna o viceversa, para permitir que los ojos se " + "adapten lentamente." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Este programa proporciona un ícono de notificación que permite al usuario " + "controlar Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/et.po b/po/et.po +index 6d9c7c0..6052f59 100644 +--- a/po/et.po ++++ b/po/et.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: et\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/eu.po b/po/eu.po +index 3466da7..1b0a2be 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: eu\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/fi.po b/po/fi.po +index 3ed961f..b44eb88 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -19,14 +19,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: fi\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -34,12 +34,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/fr.po b/po/fr.po +index c51b1d1..cf9900a 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: fr\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "l'environnement. Cela peut aider à diminuer les douleurs oculaires si vous " + "travaillez sur un écran de nuit." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "nuit. Lors du lever ou du coucher du soleil, la température de couleur " + "change doucement pour permettre à vos yeux de s'adapter." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Ce programme fournit une icône de notification permettant à l'utilisateur de " + "contrôler Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/gl.po b/po/gl.po +index 5279b48..4ec08ec 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: gl\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/he.po b/po/he.po +index 1403309..debbd00 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: he\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift מתאימה את טמפרטורת הצבע של המסך בהתאם לסביבה. דבר שיכול לעזור " + "להפחית כאב בעיניים בעבודה מול המסך בלילה." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -35,12 +35,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/hi.po b/po/hi.po +index edff9d0..9e09b06 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: hi\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/hr.po b/po/hr.po +index 6f19260..f25690a 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: hr\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/hu.po b/po/hu.po +index 80375fb..718fce7 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: hu\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "segít, hogy kevésbé fájjon a szeme, ha képernyő előtt dolgozik az éjszaka " + "folyamán." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "átmenete az éjszakiról a nappali hőmérsékletre lehetővé teszi, hogy a szem " + "lassan alkalmazkodhasson." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Ez a program elérhetővé tesz egy állapot ikont, melyen keresztül a " + "felhasználó beállíthatja a Redshift alkalmazást." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/it.po b/po/it.po +index c27dfc2..c965859 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: it\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "circostante. Questo può aiutare a non affaticare la vista se si lavora " + "davanti allo schermo di notte." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -41,14 +41,14 @@ msgstr "" + "delicatamente da quella notturna a quella diurna per consentire alla vista " + "di abituarsi in modo graduale." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Questo programma fornisce un'icona di stato che consente all'utente di " + "controllare Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/ja.po b/po/ja.po +index 317541a..bb9531a 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: ja\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift " + "は環境に応じてお使いの画面の色温度を調整します。これは夜間に画面の前で作業している場合に目への悪影響を軽減させる助けになるかもしれません。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -37,12 +37,12 @@ msgstr "" + "色温度は太陽の位置に応じて設定されます。昼と夜とでは異なる色温度が設定されます。夕暮れ時や早朝の間は、 " + "色温度は滑らかに変化してゆっくり目を慣れさせることができます。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "このプログラムはユーザが Redshift を制御できるようにするためのステータス アイコンを提供します。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/ka.po b/po/ka.po +index a44a4b3..f48970e 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: ka\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/lt.po b/po/lt.po +index 1038792..046dea5 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: lt\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "supančios aplinkos. Tai gali sumažinti akių skausmą tuo atveju, jei naktį " + "dirbate priešais kompiuterio ekraną." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,13 +40,13 @@ msgstr "" + "spalvos temperatūra glotniai pereina iš nakties temperatūros į dienos " + "temperatūrą, taip leisdama jūsų akims po truputį prisitaikyti." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Ši programa pateikia būsenos piktogramą, kuri leidžia valdyti Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/nb.po b/po/nb.po +index ae83deb..7ba4171 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: nb\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Rødskift justerer fargetemperaturen på skjermen din etter omgivelsene. Dette " + "bedrer øyenes arbeidsforhold hvis du sitter foran skjermen om natta." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,13 +39,13 @@ msgstr "" + "på morgenen toner fargetemperaturen mykt over i dagtermperatur for å la " + "øyene dine tilpasse seg." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Dette programmet har et statusikon som lar brukeren kontrollere Rødskift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/nl.po b/po/nl.po +index 31a63f6..4beeee6 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: nl\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "omgeving. Dit kan u helpen om oogpijn te verminderen als u 's avonds of 's " + "nachts achter een computerscherm werkt." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -41,14 +41,14 @@ msgstr "" + "geleidelijk en soepel van nacht naar dag gebracht, zodat uw ogen er langzaam " + "aan kunnen wennen." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Dit programma bevat een statuspictogram dat de gebruiker in staat stelt om " + "Redshift te bedienen." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/pl.po b/po/pl.po +index 3a6a346..34b7f87 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: pl\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift dostosowuje temperaturę barwową wyświetlacza do warunków " + "zewnętrznych. Pomaga w ten sposób uniknąć zmęczenia oczu przy pracy w nocy." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,13 +39,13 @@ msgstr "" + "zmienia się z dziennej na nocną (i odwrotnie), pozwalając oczom na powolne " + "przyzwyczajanie się." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Program dostarcza ikonę, która pozwala użytkownikowi kontrolować Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/pt.po b/po/pt.po +index 83efee5..73d34ed 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: pt\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 215af9c..71779d4 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: pt_BR\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "cerca. Isso ajuda a irritar menos os olhos se você está trabalhando em " + "frente a uma tela à noite." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "ao amanhecer, ocorre uma transição suave entre a temperatura de cor da noite " + "para o dia para que seus olhos lentamente se adaptem." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Esse programa exibe um ícone de status para que seja possível controlar o " + "Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/ro.po b/po/ro.po +index 82a2694..0cb76f2 100644 +--- a/po/ro.po ++++ b/po/ro.po +@@ -17,14 +17,14 @@ msgstr "" + "X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" + "X-Generator: Launchpad (build 18658)\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -32,12 +32,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/ru.po b/po/ru.po +index 993894c..18531ba 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -19,7 +19,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: ru\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -29,7 +29,7 @@ msgstr "" + "окружающими вас условиями. Это может, например, помочь снизить усталость " + "глаз при работе на компьютере ночью." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -41,12 +41,12 @@ msgstr "" + "утром цветовая температура плавно переходит от ночных настроек к дневным, " + "позволяя глазам постепенно адаптироваться." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "Эта программа позволяет управлять RedShift через иконку в трее." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/sr.po b/po/sr.po +index 5d99e91..c92f6c5 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: sr\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Редшифт мења температуру боје вашег екрана у складу са вашим окружењем. Ово " + "вам може помоћи уколико осећате бол у очима када радите за рачунаром ноћу." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -39,14 +39,14 @@ msgstr "" + "температура боје лагано прелази из ноћне у дневну температуру да би се вашим " + "очима омогућило лакше привикавање." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Овај програм пружа иконицу стања која омогућава кориснику да управља " + "Редшифтом." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/sv.po b/po/sv.po +index cbaa7c9..bed5f69 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -19,7 +19,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: sv\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -28,7 +28,7 @@ msgstr "" + "Redshift justerar färgtemperaturen på skärmen utefter din omgivning. Det kan " + "göra att dina ögon mindre irriterade om du arbetar framför skärmen på natten." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "morgonen övergår färgtemperaturen smidigt från natt till dagtidstemperatur " + "för att ge dina ögon tid att långsamt anpassa sig." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Detta program skapar en statusikon som gör det möjligt för användaren att " + "styra Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/tr.po b/po/tr.po +index 6f9d2ea..91b365f 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: tr\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/uk.po b/po/uk.po +index ce26f10..c20c9ae 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -17,7 +17,7 @@ msgstr "" + "X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" + "X-Generator: Launchpad (build 18658)\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "навколишнього природного середовища. Це може зменшити втому ваших очей під " + "час роботи перед екраном в ночі." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -40,14 +40,14 @@ msgstr "" + "повільно переходить із нічної до денної температури, що дозволяє вашим очам " + "повільно адаптуватися." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "" + "Ця програма супроводжується статусною піктограмою, що дозволяє користувачеві " + "контролювати Redshift." + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index bf15c17..e731a21 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -18,14 +18,14 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: \n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " + "of the screen at night." + msgstr "红移(Redshift) 根据你的周围环境调节你的屏幕色温。如果夜晚在屏幕前工作，这可以减少你眼睛受到的伤害。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -33,12 +33,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "该软件可以根据日照位置、日夜变化来设置屏幕色温，随着时间推移，色温会逐渐转变，保证让您的眼睛能够舒舒服服地适应。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "该程序提供了状态图标允许用户通过它控制 Redshift 。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 14c99d5..cea7cf3 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -18,7 +18,7 @@ msgstr "" + "X-Generator: Launchpad (build 18658)\n" + "Language: zh_TW\n" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:1 + msgid "" + "Redshift adjusts the color temperature of your screen according to your " + "surroundings. This may help your eyes hurt less if you are working in front " +@@ -27,7 +27,7 @@ msgstr "" + "Redshift 根據你周圍環境來調節整螢幕色溫。\n" + "如果夜晚在螢幕前工作，這可以減少眼睛受到傷害。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:2 + msgid "" + "The color temperature is set according to the position of the sun. A " + "different color temperature is set during night and daytime. During twilight " +@@ -35,12 +35,12 @@ msgid "" + "daytime temperature to allow your eyes to slowly adapt." + msgstr "根據太陽位置日夜變化來設置螢幕色溫。隨著日夜交替時間轉換，色溫設置則會逐漸變化，可讓您的眼睛能夠漸漸地適應。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:3 + msgid "" + "This program provides a status icon that allows the user to control Redshift." + msgstr "軟體提供狀態圖示，讓使用者來控制 Redshift 。" + +-#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 ++#: ../data/appdata/redshift-gtk.metainfo.xml.in.h:4 + msgid "" + "The Redshift information window overlaid with an example of the redness " + "effect" diff -Nru redshift-1.12/debian/redshift-gtk.install redshift-1.12/debian/redshift-gtk.install --- redshift-1.12/debian/redshift-gtk.install 2016-03-22 15:37:03.000000000 +0000 +++ redshift-1.12/debian/redshift-gtk.install 2020-12-12 16:43:43.000000000 +0000 @@ -1,6 +1,8 @@ usr/bin/redshift-gtk usr/lib/python* -usr/share/icons -usr/share/appdata/redshift-gtk.appdata.xml -usr/share/applications/redshift-gtk.desktop usr/lib/systemd/user/redshift-gtk.service +usr/share/applications/redshift-gtk.desktop +usr/share/icons +usr/share/metainfo/redshift-gtk.metainfo.xml + +debian/screenshot.png usr/share/doc/redshift-gtk/ diff -Nru redshift-1.12/debian/redshift-gtk.links redshift-1.12/debian/redshift-gtk.links --- redshift-1.12/debian/redshift-gtk.links 2016-05-16 10:18:39.000000000 +0000 +++ redshift-1.12/debian/redshift-gtk.links 2020-12-12 16:43:43.000000000 +0000 @@ -1,2 +1,3 @@ usr/bin/redshift-gtk usr/bin/gtk-redshift +usr/share/man/man1/redshift.1.gz usr/share/man/man1/gtk-redshift.1.gz usr/share/man/man1/redshift.1.gz usr/share/man/man1/redshift-gtk.1.gz diff -Nru redshift-1.12/debian/redshift-gtk.menu redshift-1.12/debian/redshift-gtk.menu --- redshift-1.12/debian/redshift-gtk.menu 2015-08-14 20:19:49.000000000 +0000 +++ redshift-1.12/debian/redshift-gtk.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(redshift-gtk): \ - needs="X11" \ - section="Games/Toys" \ - title="Redshift" \ - command="redshift-gtk" diff -Nru redshift-1.12/debian/redshift.install redshift-1.12/debian/redshift.install --- redshift-1.12/debian/redshift.install 2016-03-22 15:36:40.000000000 +0000 +++ redshift-1.12/debian/redshift.install 2020-12-12 16:43:43.000000000 +0000 @@ -1,4 +1,6 @@ +etc/apparmor.d/usr.bin.redshift usr/bin/redshift -usr/share/locale -usr/share/applications/redshift.desktop usr/lib/systemd/user/redshift.service +usr/share/applications/redshift.desktop +usr/share/locale +usr/share/man/man1/redshift.1 diff -Nru redshift-1.12/debian/rules redshift-1.12/debian/rules --- redshift-1.12/debian/rules 2018-10-02 08:28:24.000000000 +0000 +++ redshift-1.12/debian/rules 2020-12-12 16:43:43.000000000 +0000 @@ -1,18 +1,25 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 +export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk %: - dh $@ --with python3,autoreconf + dh $@ --with python3 override_dh_auto_configure: intltoolize --force - dh_auto_configure -- --enable-randr --enable-vidmode --enable-geoclue2 --enable-ubuntu --disable-geoclue --with-systemduserunitdir=/usr/lib/systemd/user/ + dh_auto_configure -- \ + --with-systemduserunitdir=/usr/lib/systemd/user/ \ + --enable-randr --enable-vidmode \ + --enable-geoclue2 --disable-geoclue \ + --enable-ubuntu --enable-apparmor + +override_dh_install: + dh_apparmor -predshift --profile-name=usr.bin.redshift + dh_install override_dh_installchangelogs: dh_installchangelogs NEWS Binary files /tmp/tmpe5jIKy/IZ4un1i5HW/redshift-1.12/debian/screenshot.png and /tmp/tmpe5jIKy/CJTA18PTd0/redshift-1.12/debian/screenshot.png differ diff -Nru redshift-1.12/debian/source/include-binaries redshift-1.12/debian/source/include-binaries --- redshift-1.12/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/debian/source/include-binaries 2020-12-12 16:43:43.000000000 +0000 @@ -0,0 +1 @@ +debian/screenshot.png diff -Nru redshift-1.12/debian/watch redshift-1.12/debian/watch --- redshift-1.12/debian/watch 2018-10-02 08:26:17.000000000 +0000 +++ redshift-1.12/debian/watch 2020-12-12 16:43:43.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -https://launchpad.net/redshift/+download .*/redshift-(.*).tar.bz2 +version=4 +opts="mode=git" \ + https://github.com/jonls/redshift.git refs/tags/v(\d\S+)