Merge lp:~noskcaj/ubuntu/wily/redshift/merge2 into lp:ubuntu/wily/redshift

[Jackson Doak]

Merge from debian. package is currently broken in wily, this merge is required for it to work as intended

[Michael Terry (mterry)]

Looks good, thanks! Uploaded to wily.

review: Approve

[Michael Terry (mterry)]

Only change was I also fixed the typo in the changelog (rues to rules)

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2014-11-01 17:06:15 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-remove_autostart.patch
-retry-geoclue.patch
 
=== removed directory '.pc/remove_autostart.patch'
=== removed directory '.pc/remove_autostart.patch/src'
=== removed directory '.pc/remove_autostart.patch/src/redshift-gtk'
=== removed file '.pc/remove_autostart.patch/src/redshift-gtk/statusicon.py'
--- .pc/remove_autostart.patch/src/redshift-gtk/statusicon.py	2015-05-24 16:48:08 +0000
+++ .pc/remove_autostart.patch/src/redshift-gtk/statusicon.py	1970-01-01 00:00:00 +0000
@@ -1,520 +0,0 @@
-# statusicon.py -- GUI status icon source
-# 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 <http://www.gnu.org/licenses/>.
-
-# Copyright (c) 2013-2014  Jon Lund Steffensen <[e-mail]>
-
-
-'''GUI status icon for Redshift.
-
-The run method will try to start an appindicator for Redshift. If the
-appindicator module isn't present it will fall back to a GTK status icon.
-'''
-
-import sys, os
-import fcntl
-import signal
-import re
-import gettext
-
-from gi.repository import Gtk, GLib, GObject
-
-try:
-    from gi.repository import AppIndicator3 as appindicator
-except ImportError:
-    appindicator = None
-
-from . import defs
-from . import utils
-
-_ = gettext.gettext
-
-
-class RedshiftController(GObject.GObject):
-    '''A GObject wrapper around the child process'''
-
-    __gsignals__ = {
-        'inhibit-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
-        'temperature-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
-        'period-changed': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
-        'location-changed': (GObject.SIGNAL_RUN_FIRST, None, (float, float)),
-        'error-occured': (GObject.SIGNAL_RUN_FIRST, None, (str,))
-        }
-
-    def __init__(self, args):
-        '''Initialize controller and start child process
-
-        The parameter args is a list of command line arguments to pass on to
-        the child process. The "-v" argument is automatically added.'''
-
-        GObject.GObject.__init__(self)
-
-        # Initialize state variables
-        self._inhibited = False
-        self._temperature = 0
-        self._period = 'Unknown'
-        self._location = (0.0, 0.0)
-
-        # Start redshift with arguments
-        args.insert(0, os.path.join(defs.BINDIR, 'redshift'))
-        if '-v' not in args:
-            args.insert(1, '-v')
-
-        # Start child process with C locale so we can parse the output
-        env = os.environ.copy()
-        env['LANG'] = env['LANGUAGE'] = env['LC_ALL'] = env['LC_MESSAGES'] = 'C'
-        self._process = GLib.spawn_async(args, envp=['{}={}'.format(k,v) for k, v in env.items()],
-                                         flags=GLib.SPAWN_DO_NOT_REAP_CHILD,
-                                         standard_output=True, standard_error=True)
-
-        # Wrap remaining contructor in try..except to avoid that the child
-        # process is not closed properly.
-        try:
-            # Handle child input
-            # The buffer is encapsulated in a class so we
-            # can pass an instance to the child callback.
-            class InputBuffer(object):
-                buf = ''
-
-            self._input_buffer = InputBuffer()
-            self._error_buffer = InputBuffer()
-            self._errors = ''
-
-            # Set non blocking
-            fcntl.fcntl(self._process[2], fcntl.F_SETFL,
-                        fcntl.fcntl(self._process[2], fcntl.F_GETFL) | os.O_NONBLOCK)
-
-            # Add watch on child process
-            GLib.child_watch_add(GLib.PRIORITY_DEFAULT, self._process[0], self._child_cb)
-            GLib.io_add_watch(self._process[2], GLib.PRIORITY_DEFAULT, GLib.IO_IN,
-                              self._child_data_cb, (True, self._input_buffer))
-            GLib.io_add_watch(self._process[3], GLib.PRIORITY_DEFAULT, GLib.IO_IN,
-                              self._child_data_cb, (False, self._error_buffer))
-
-            # Signal handler to relay USR1 signal to redshift process
-            def relay_signal_handler(signal):
-                os.kill(self._process[0], signal)
-                return True
-
-            GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGUSR1,
-                                 relay_signal_handler, signal.SIGUSR1)
-        except:
-            self.termwait()
-            raise
-
-    @property
-    def inhibited(self):
-        '''Current inhibition state'''
-        return self._inhibited
-
-    @property
-    def temperature(self):
-        '''Current screen temperature'''
-        return self._temperature
-
-    @property
-    def period(self):
-        '''Current period of day'''
-        return self._period
-
-    @property
-    def location(self):
-        '''Current location'''
-        return self._location
-
-    def set_inhibit(self, inhibit):
-        '''Set inhibition state'''
-        if inhibit != self._inhibited:
-            self._child_toggle_inhibit()
-
-    def _child_toggle_inhibit(self):
-        '''Sends a request to the child process to toggle state'''
-        os.kill(self._process[0], signal.SIGUSR1)
-
-    def _child_cb(self, pid, status, data=None):
-        '''Called when the child process exists'''
-
-        # Empty stdout and stderr
-        for f in (self._process[2], self._process[3]):
-            while True:
-                buf = os.read(f, 256).decode('utf-8')
-                if buf == '':
-                    break
-                if f == self._process[3]: # stderr
-                    self._errors += buf
-
-        # Check exit status of child
-        report_errors = False
-        try:
-            GLib.spawn_check_exit_status(status)
-            Gtk.main_quit()
-        except GLib.GError:
-            report_errors = True
-
-        if report_errors:
-            self.emit('error-occured', self._errors)
-
-    def _child_key_change_cb(self, key, value):
-        '''Called when the child process reports a change of internal state'''
-
-        def parse_coord(s):
-            '''Parse coordinate like `42.0 N` or `91.5 W`'''
-            v, d = s.split(' ')
-            return float(v) * (1 if d in 'NE' else -1)
-
-        if key == 'Status':
-            new_inhibited = value != 'Enabled'
-            if new_inhibited != self._inhibited:
-                self._inhibited = new_inhibited
-                self.emit('inhibit-changed', new_inhibited)
-        elif key == 'Color temperature':
-            new_temperature = int(value.rstrip('K'), 10)
-            if new_temperature != self._temperature:
-                self._temperature = new_temperature
-                self.emit('temperature-changed', new_temperature)
-        elif key == 'Period':
-            new_period = value
-            if new_period != self._period:
-                self._period = new_period
-                self.emit('period-changed', new_period)
-        elif key == 'Location':
-            new_location = tuple(parse_coord(x) for x in value.split(', '))
-            if new_location != self._location:
-                self._location = new_location
-                self.emit('location-changed', *new_location)
-
-    def _child_stdout_line_cb(self, line):
-        '''Called when the child process outputs a line to stdout'''
-        if line:
-            m = re.match(r'([\w ]+): (.+)', line)
-            if m:
-                key = m.group(1)
-                value = m.group(2)
-                self._child_key_change_cb(key, value)
-
-    def _child_data_cb(self, f, cond, data):
-        '''Called when the child process has new data on stdout/stderr'''
-
-        stdout, ib = data
-        ib.buf += os.read(f, 256).decode('utf-8')
-
-        # Split input at line break
-        while True:
-            first, sep, last = ib.buf.partition('\n')
-            if sep == '':
-                break
-            ib.buf = last
-            if stdout:
-                self._child_stdout_line_cb(first)
-            else:
-                self._errors += first + '\n'
-
-        return True
-
-    def termwait(self):
-        '''Send SIGINT and wait for the child process to quit'''
-        try:
-            os.kill(self._process[0], signal.SIGINT)
-            os.waitpid(self._process[0], 0)
-        except ProcessLookupError:
-            # Process has apparently already disappeared
-            pass
-
-
-class RedshiftStatusIcon(object):
-    '''The status icon tracking the RedshiftController'''
-
-    def __init__(self, controller):
-        '''Creates a new instance of the status icon'''
-
-        self._controller = controller
-
-        if appindicator:
-            # Create indicator
-            self.indicator = appindicator.Indicator.new('redshift',
-                                                        'redshift-status-on',
-                                                        appindicator.IndicatorCategory.APPLICATION_STATUS)
-            self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
-        else:
-            # Create status icon
-            self.status_icon = Gtk.StatusIcon()
-            self.status_icon.set_from_icon_name('redshift-status-on')
-            self.status_icon.set_tooltip_text('Redshift')
-
-        # Create popup menu
-        self.status_menu = Gtk.Menu()
-
-        # Add toggle action
-        self.toggle_item = Gtk.CheckMenuItem.new_with_label(_('Enabled'))
-        self.toggle_item.connect('activate', self.toggle_item_cb)
-        self.status_menu.append(self.toggle_item)
-
-        # Add suspend menu
-        suspend_menu_item = Gtk.MenuItem.new_with_label(_('Suspend for'))
-        suspend_menu = Gtk.Menu()
-        for minutes, label in [(30, _('30 minutes')),
-                               (60, _('1 hour')),
-                               (120, _('2 hours'))]:
-            suspend_item = Gtk.MenuItem.new_with_label(label)
-            suspend_item.connect('activate', self.suspend_cb, minutes)
-            suspend_menu.append(suspend_item)
-        suspend_menu_item.set_submenu(suspend_menu)
-        self.status_menu.append(suspend_menu_item)
-
-        # Add autostart option
-        autostart_item = Gtk.CheckMenuItem.new_with_label(_('Autostart'))
-        try:
-            autostart_item.set_active(utils.get_autostart())
-        except IOError as strerror:
-            print(strerror)
-            autostart_item.set_property('sensitive', False)
-        else:
-            autostart_item.connect('toggled', self.autostart_cb)
-        finally:
-            self.status_menu.append(autostart_item)
-
-        # Add info action
-        info_item = Gtk.MenuItem.new_with_label(_('Info'))
-        info_item.connect('activate', self.show_info_cb)
-        self.status_menu.append(info_item)
-
-        # Add quit action
-        quit_item = Gtk.ImageMenuItem.new_with_label(_('Quit'))
-        quit_item.connect('activate', self.destroy_cb)
-        self.status_menu.append(quit_item)
-
-        # Create info dialog
-        self.info_dialog = Gtk.Dialog()
-        self.info_dialog.set_title(_('Info'))
-        self.info_dialog.add_button(_('Close'), Gtk.ButtonsType.CLOSE)
-        self.info_dialog.set_resizable(False)
-        self.info_dialog.set_property('border-width', 6)
-
-        self.status_label = Gtk.Label()
-        self.status_label.set_alignment(0.0, 0.5)
-        self.status_label.set_padding(6, 6)
-        self.info_dialog.get_content_area().pack_start(self.status_label, True, True, 0)
-        self.status_label.show()
-
-        self.location_label = Gtk.Label()
-        self.location_label.set_alignment(0.0, 0.5)
-        self.location_label.set_padding(6, 6)
-        self.info_dialog.get_content_area().pack_start(self.location_label, True, True, 0)
-        self.location_label.show()
-
-        self.temperature_label = Gtk.Label()
-        self.temperature_label.set_alignment(0.0, 0.5)
-        self.temperature_label.set_padding(6, 6)
-        self.info_dialog.get_content_area().pack_start(self.temperature_label, True, True, 0)
-        self.temperature_label.show()
-
-        self.period_label = Gtk.Label()
-        self.period_label.set_alignment(0.0, 0.5)
-        self.period_label.set_padding(6, 6)
-        self.info_dialog.get_content_area().pack_start(self.period_label, True, True, 0)
-        self.period_label.show()
-
-        self.info_dialog.connect('response', self.response_info_cb)
-
-        # Setup signals to property changes
-        self._controller.connect('inhibit-changed', self.inhibit_change_cb)
-        self._controller.connect('period-changed', self.period_change_cb)
-        self._controller.connect('temperature-changed', self.temperature_change_cb)
-        self._controller.connect('location-changed', self.location_change_cb)
-        self._controller.connect('error-occured', self.error_occured_cb)
-
-        # Set info box text
-        self.change_inhibited(self._controller.inhibited)
-        self.change_period(self._controller.period)
-        self.change_temperature(self._controller.temperature)
-        self.change_location(self._controller.location)
-
-        if appindicator:
-            self.status_menu.show_all()
-
-            # Set the menu
-            self.indicator.set_menu(self.status_menu)
-        else:
-            # Connect signals for status icon and show
-            self.status_icon.connect('activate', self.toggle_cb)
-            self.status_icon.connect('popup-menu', self.popup_menu_cb)
-            self.status_icon.set_visible(True)
-
-        # Initialize suspend timer
-        self.suspend_timer = None
-
-    def remove_suspend_timer(self):
-        '''Disable any previously set suspend timer'''
-        if self.suspend_timer is not None:
-            GLib.source_remove(self.suspend_timer)
-            self.suspend_timer = None
-
-    def suspend_cb(self, item, minutes):
-        '''Callback that handles activation of a suspend timer
-
-        The minutes parameter is the number of minutes to suspend. Even if redshift
-        is not disabled when called, it will still set a suspend timer and
-        reactive redshift when the timer is up.'''
-
-        # Inhibit
-        self._controller.set_inhibit(True)
-
-        # If "suspend" is clicked while redshift is disabled, we reenable
-        # it after the last selected timespan is over.
-        self.remove_suspend_timer()
-
-        # If redshift was already disabled we reenable it nonetheless.
-        self.suspend_timer = GLib.timeout_add_seconds(minutes * 60, self.reenable_cb)
-
-    def reenable_cb(self):
-        '''Callback to reenable redshift when a suspend timer expires'''
-        self._controller.set_inhibit(False)
-
-    def popup_menu_cb(self, widget, button, time, data=None):
-        '''Callback when the popup menu on the status icon has to open'''
-        self.status_menu.show_all()
-        self.status_menu.popup(None, None, Gtk.StatusIcon.position_menu,
-                               self.status_icon, button, time)
-
-    def toggle_cb(self, widget, data=None):
-        '''Callback when a request to toggle redshift was made'''
-        self.remove_suspend_timer()
-        self._controller.set_inhibit(not self._controller.inhibited)
-
-    def toggle_item_cb(self, widget, data=None):
-        '''Callback then a request to toggle redshift was made from a toggle item
-
-        This ensures that the state of redshift is synchronised with
-        the toggle state of the widget (e.g. Gtk.CheckMenuItem).'''
-
-        active = not self._controller.inhibited
-        if active != widget.get_active():
-            self.remove_suspend_timer()
-            self._controller.set_inhibit(not self._controller.inhibited)
-
-    # Info dialog callbacks
-    def show_info_cb(self, widget, data=None):
-        '''Callback when the info dialog should be presented'''
-        self.info_dialog.show()
-
-    def response_info_cb(self, widget, data=None):
-        '''Callback when a button in the info dialog was activated'''
-        self.info_dialog.hide()
-
-    def update_status_icon(self):
-        '''Update the status icon according to the internally recorded state
-
-        This should be called whenever the internally recorded state
-        might have changed.'''
-
-        # Update status icon
-        if appindicator:
-            if not self._controller.inhibited:
-                self.indicator.set_icon('redshift-status-on')
-            else:
-                self.indicator.set_icon('redshift-status-off')
-        else:
-            if not self._controller.inhibited:
-                self.status_icon.set_from_icon_name('redshift-status-on')
-            else:
-                self.status_icon.set_from_icon_name('redshift-status-off')
-
-    # State update functions
-    def inhibit_change_cb(self, controller, inhibit):
-        '''Callback when controller changes inhibition status'''
-        self.change_inhibited(inhibit)
-
-    def period_change_cb(self, controller, period):
-        '''Callback when controller changes period'''
-        self.change_period(period)
-
-    def temperature_change_cb(self, controller, temperature):
-        '''Callback when controller changes temperature'''
-        self.change_temperature(temperature)
-
-    def location_change_cb(self, controller, lat, lon):
-        '''Callback when controlled changes location'''
-        self.change_location((lat, lon))
-
-    def error_occured_cb(self, controller, error):
-        '''Callback when an error occurs in the controller'''
-        error_dialog = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR,
-                                         Gtk.ButtonsType.CLOSE, '')
-        error_dialog.set_markup('<b>Failed to run Redshift</b>\n<i>' + error + '</i>')
-        error_dialog.run()
-
-        # Quit when the model dialog is closed
-        sys.exit(-1)
-
-    # Update interface
-    def change_inhibited(self, inhibited):
-        '''Change interface to new inhibition status'''
-        self.update_status_icon()
-        self.toggle_item.set_active(not inhibited)
-        self.status_label.set_markup(_('<b>Status:</b> {}').format(_('Disabled') if inhibited else _('Enabled')))
-
-    def change_temperature(self, temperature):
-        '''Change interface to new temperature'''
-        self.temperature_label.set_markup('<b>{}:</b> {}K'.format(_('Color temperature'), temperature))
-
-    def change_period(self, period):
-        '''Change interface to new period'''
-        self.period_label.set_markup('<b>{}:</b> {}'.format(_('Period'), period))
-
-    def change_location(self, location):
-        '''Change interface to new location'''
-        self.location_label.set_markup('<b>{}:</b> {}, {}'.format(_('Location'), *location))
-
-
-    def autostart_cb(self, widget, data=None):
-        '''Callback when a request to toggle autostart is made'''
-        utils.set_autostart(widget.get_active())
-
-    def destroy_cb(self, widget, data=None):
-        '''Callback when a request to quit the application is made'''
-        if not appindicator:
-            self.status_icon.set_visible(False)
-        Gtk.main_quit()
-        return False
-
-
-def sigterm_handler(data=None):
-    sys.exit(0)
-
-
-def run():
-    utils.setproctitle('redshift-gtk')
-
-    # Install TERM signal handler
-    GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGTERM,
-                         sigterm_handler, None)
-    GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
-                         sigterm_handler, None)
-
-    # Internationalisation
-    gettext.bindtextdomain('redshift', defs.LOCALEDIR)
-    gettext.textdomain('redshift')
-
-    # Create redshift child process controller
-    c = RedshiftController(sys.argv[1:])
-    try:
-        # Create status icon
-        s = RedshiftStatusIcon(c)
-
-        # Run main loop
-        Gtk.main()
-    finally:
-        # Always make sure that the child process is closed
-        c.termwait()
 
=== removed directory '.pc/retry-geoclue.patch'
=== removed directory '.pc/retry-geoclue.patch/src'
=== removed file '.pc/retry-geoclue.patch/src/location-geoclue.c'
--- .pc/retry-geoclue.patch/src/location-geoclue.c	2015-06-28 09:25:43 +0000
+++ .pc/retry-geoclue.patch/src/location-geoclue.c	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-/* location-geoclue.c -- Geoclue location provider source
-   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 <http://www.gnu.org/licenses/>.
-
-   Copyright (c) 2010  Mathieu Trudel-Lapierre <[e-mail]>
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <geoclue/geoclue-master.h>
-#include <geoclue/geoclue-position.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "location-geoclue.h"
-
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(s) gettext(s)
-#else
-# define _(s) s
-#endif
-
-#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.UbuntuGeoIP"
-#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP"
-
-int
-location_geoclue_init(location_geoclue_state_t *state)
-{
-#if !GLIB_CHECK_VERSION(2, 35, 0)
-	g_type_init();
-#endif
-
-	state->position = NULL;
-	state->provider = NULL;
-	state->provider_path = NULL;
-	
-	return 0;
-}
-
-int
-location_geoclue_start(location_geoclue_state_t *state)
-{
-        if (state->provider && state->provider_path) {
-		state->position = geoclue_position_new(state->provider,
-						       state->provider_path);
-        } else {
-		if (getenv("DISPLAY") == NULL || *getenv("DISPLAY") == '\0') {
-			/* TODO This (hack) should be removed when GeoClue has been patched. */
-			putenv("DISPLAY=:0");
-		}
-                GError *error = NULL;
-                GeoclueMaster *master = geoclue_master_get_default();
-                GeoclueMasterClient *client = geoclue_master_create_client(master,
-                                                                           NULL, &error);
-		g_object_unref(master);
-
-                if (client == NULL) {
-			if (error != NULL) {
-                        	g_printerr(_("Unable to obtain master client: %s\n"),
-					   error->message);
-				g_error_free(error);
-			} else {
-                        	g_printerr(_("Unable to obtain master client\n"));
-			}
-                        return -1;
-                }
-
-		if (!geoclue_master_client_set_requirements(client,
-							    GEOCLUE_ACCURACY_LEVEL_REGION,
-							    0, FALSE,
-							    GEOCLUE_RESOURCE_NETWORK,
-							    &error)) {
-			if (error != NULL) {
-				g_printerr(_("Can't set requirements for master: %s\n"),
-					   error->message);
-				g_error_free(error);
-			} else {
-				g_printerr(_("Can't set requirements for master\n"));
-			}
-			g_object_unref(client);
-
-			return -1;
-		}
-
-		state->position = geoclue_master_client_create_position(client, NULL);
-
-                g_object_unref(client);
-	}
-
-	gchar *name = NULL;
-
-	if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position),
-					       &name, NULL, NULL)) {
-		fprintf(stdout, _("Started Geoclue provider `%s'.\n"), name);
-		g_free(name);
-	} else {
-		fputs(_("Could not find a usable Geoclue provider.\n"), stderr);
-		fputs(_("Try setting name and path to specify which to use.\n"), stderr);
-		return -1;
-	}
-
-	return 0;
-}
-
-void
-location_geoclue_free(location_geoclue_state_t *state)
-{
-	if (state->position != NULL) g_object_unref(state->position);
-	if (state->provider != NULL) free(state->provider);
-	if (state->provider_path != NULL) free(state->provider_path);
-}
-
-void
-location_geoclue_print_help(FILE *f)
-{
-	fputs(_("Use the location as discovered by a Geoclue provider.\n"), f);
-	fputs("\n", f);
-
-	/* TRANSLATORS: Geoclue help output
-	   left column must not be translated */
-	fputs(_("  name=N\tName of Geoclue provider (or `default')\n"
-		"  path=N\tPath of Geoclue provider (or `default')\n"), f);
-	fputs("\n", f);
-	fprintf(f, _("NOTE: currently Redshift doesn't recheck %s once started,\n"
-		     "which means it has to be restarted to take notice after travel.\n"),
-		"GeoClue");
-	fputs("\n", f);
-}
-
-int
-location_geoclue_set_option(location_geoclue_state_t *state,
-			    const char *key, const char *value)
-{
-	const char *provider = NULL;
-	const char *path = NULL;
-
-	/* Parse string value */
-	if (strcasecmp(key, "name") == 0) {
-		if (strcasecmp(value, "default") == 0) {
-			provider = DEFAULT_PROVIDER;
-		} else {
-			provider = value;
-		}
-
-		state->provider = strdup(provider);
-		if (state->provider == NULL) {
-			perror("strdup");
-			return -1;
-		}
-	} else if (strcasecmp(key, "path") == 0) {
-		if (value != NULL && strcasecmp(value, "default") == 0) {
-			path = DEFAULT_PROVIDER_PATH;
-		} else {
-			path = value;
-		}
-
-		state->provider_path = strdup(path);
-		if (state->provider_path == NULL) {
-			perror("strdup");
-			return -1;
-		}
-	} else {
-		fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key);
-		return -1;
-	}
-
-	return 0;
-}
-
-int
-location_geoclue_get_location(location_geoclue_state_t *state,
-			      float *lat, float *lon)
-{
-	GeocluePositionFields fields;
-	GError *error = NULL;
-	double latitude = 0, longitude = 0;
-
-	fields = geoclue_position_get_position(state->position, NULL,
-					       &latitude, &longitude, NULL,
-					       NULL, &error);
-	if (error) {
-		g_printerr(_("Could not get location: %s.\n"), error->message);
-		g_error_free(error);
-		return -1;
-	}
-	
-	if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
-	    fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
-		fprintf(stdout, _("According to the geoclue provider"
-				  " we're at: %.2f, %.2f\n"),
-			latitude, longitude);
-	} else {
-		g_warning(_("Provider does not have a valid location available."));
-		return -1;
-	}
-
-	*lat = latitude;
-	*lon = longitude;
-
-	return 0;
-}
 
=== removed file 'debian/README.Debian'
--- debian/README.Debian	2015-05-26 14:55:19 +0000
+++ debian/README.Debian	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Geoclue 2
----------
-
-Starting with version 1.10, redshift has support for Geoclue 2.
-By default, geoclue will not allow access to redshift.
-
-To make geoclue accept requests from redshift, add the following to
-/etc/geoclue/geoclue.conf
-
-[redshift]
-allowed=true
-system=false
-users=
-
-
-Autostart of gtk-redshift
--------------------------
-
-Autostart was removed from Debian package because of violation of 'Desktop Application
-Autostart Specification' (see bug #619699). If you want gtk-redshift autostarted please
-configure this in your specific desktop environment (e.g. by placing
-/usr/share/applications/gtk-redshift.desktop in
-$HOME/$XDG_CONFIG_HOME/autostart/
-(usually defaults to $HOME/.config/autostart).
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-28 09:25:43 +0000
+++ debian/changelog	2015-10-14 19:20:52 +0000
@@ -1,3 +1,39 @@
+redshift (1.10-5ubuntu1) wily; urgency=medium
+
+  * Merge from Debian. (LP: #1485153) Remaining changes:
+    - debian/rues: Add --enable-ubuntu
+    - debian/patches/retry-geoclue.patch: Retry geoclue a few times so
+      redshift does not explode at startup.
+
+ -- Jackson Doak <[e-mail]>  Thu, 15 Oct 2015 06:10:29 +1100
+
+redshift (1.10-5) unstable; urgency=medium
+
+  * [8a88246] Add some changes from Laurent Bigonville
+  * [ca45b49] Drop README.Debian
+  * [4b34f2c] Add header to quilt patch
+  * [9e854c4] Add debian/gbp.conf
+
+ -- Ritesh Raj Sarraf <[e-mail]>  Thu, 27 Aug 2015 17:05:00 +0530
+
+redshift (1.10-4) unstable; urgency=medium
+
+  * [c3cdd0e] Drop patch remove_autostart.patch (Closes: #791598)
+  * [47e94ba] Ship appdata file in redshift-gtk.
+    Thanks to Laurent Bigonville (Closes: #791600)
+  * [3a6b76d] Fix reference to correct name.
+    Thanks to Torquil Macdonal Sorensen (Closes: #795502)
+  * [26605bd] Add redshift.desktop file entry. Needed for GeoClue activation.
+    Thanks to Laurent Bigonville (Closes: #789883)
+  * [536ef7e] Add dh-autoreconf to build. Drop autotools_dev from build.
+    Call intltoolize to update po/ files
+  * [4983734] Ship redshift.desktop file
+  * [a1397f2] Add configure flag for systemd user unit dir
+  * [fb6fb18] Add redshift-gtk.desktop file that got dropped off mistakenly
+    in the redshift.desktop patch
+
+ -- Ritesh Raj Sarraf <[e-mail]>  Sat, 15 Aug 2015 16:46:00 +0200
+
 redshift (1.10-3ubuntu1) wily; urgency=medium
 
   * Merge from Debian. Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2015-06-28 09:25:43 +0000
+++ debian/control	2015-10-14 19:20:52 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ritesh Raj Sarraf <[e-mail]>
 Uploaders: Franziska Lichtblau <[e-mail]>
-Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~), pkg-config (>= 0.25), dpkg-dev (>= 1.16.1~), libxcb-randr0-dev, libxxf86vm-dev, libgconf2-dev, python3, libxext-dev, libgeoclue-dev, libdrm-dev, intltool, dh-python
+Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~), pkg-config (>= 0.25), dpkg-dev (>= 1.16.1~), libxcb-randr0-dev, libxxf86vm-dev, libgconf2-dev, python3, libxext-dev, libdrm-dev, intltool, dh-python, dh-autoreconf
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.3 
 Vcs-Git: git://anonscm.debian.org/users/rhalina-guest/redshift.git
 
=== added file 'debian/gbp.conf'
--- debian/gbp.conf	1970-01-01 00:00:00 +0000
+++ debian/gbp.conf	2015-10-14 19:20:52 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
 
=== added file 'debian/patches/add-desktop-file.patch'
--- debian/patches/add-desktop-file.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add-desktop-file.patch	2015-10-14 19:20:52 +0000
@@ -0,0 +1,34 @@
+Add .desktop file until next release, when we can then drop it
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,6 +28,7 @@
+ 	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
+ 
+ DESKTOP_IN_FILES = \
++	data/applications/redshift.desktop.in \
+ 	data/applications/redshift-gtk.desktop.in
+ 
+ SYSTEMD_USER_UNIT_IN_FILES = \
+--- /dev/null
++++ b/data/applications/redshift.desktop.in
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Version=1.0
++_Name=Redshift
++_GenericName=Color temperature adjustment
++_Comment=Color temperature adjustment tool
++Exec=redshift
++Icon=redshift
++Terminal=true
++Type=Application
++NoDisplay=true
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,6 +1,7 @@
+ # List of source files containing translatable strings
+ 
+ data/appdata/redshift-gtk.appdata.xml.in
++data/applications/redshift.desktop.in
+ data/applications/redshift-gtk.desktop.in
+ 
+ src/redshift.c
 
=== modified file 'debian/patches/retry-geoclue.patch'
--- debian/patches/retry-geoclue.patch	2014-11-01 17:06:15 +0000
+++ debian/patches/retry-geoclue.patch	2015-10-14 19:20:52 +0000
@@ -2,11 +2,13 @@
 Author: Clint Byrum <[e-mail]>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/redshift/+bug/868904
 
-Index: redshift/src/location-geoclue.c
-===================================================================
---- redshift.orig/src/location-geoclue.c	2012-03-02 17:45:30.000000000 -0800
-+++ redshift/src/location-geoclue.c	2012-03-02 19:06:32.854211600 -0800
-@@ -19,6 +19,7 @@
+---
+ src/location-geoclue.c |   28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+--- a/src/location-geoclue.c
++++ b/src/location-geoclue.c
+@@ -20,6 +20,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -14,7 +16,7 @@
  
  #include <geoclue/geoclue-master.h>
  #include <geoclue/geoclue-position.h>
-@@ -160,17 +161,28 @@
+@@ -191,17 +192,28 @@ location_geoclue_get_location(location_g
  	GError *error = NULL;
  	double latitude = 0, longitude = 0;
  
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-01 17:06:15 +0000
+++ debian/patches/series	2015-10-14 19:20:52 +0000
@@ -1,2 +1,2 @@
-remove_autostart.patch
+add-desktop-file.patch
 retry-geoclue.patch
 
=== modified file 'debian/redshift-gtk.docs'
--- debian/redshift-gtk.docs	2015-06-28 09:25:43 +0000
+++ debian/redshift-gtk.docs	2015-10-14 19:20:52 +0000
@@ -1,2 +1,1 @@
 README
-debian/README.Debian
 
=== modified file 'debian/redshift-gtk.install'
--- debian/redshift-gtk.install	2015-06-28 09:25:43 +0000
+++ debian/redshift-gtk.install	2015-10-14 19:20:52 +0000
@@ -1,4 +1,5 @@
 usr/bin/redshift-gtk
 usr/lib/python*
 usr/share/icons
-usr/share/applications/
+usr/share/appdata/redshift-gtk.appdata.xml
+usr/share/applications/redshift-gtk.desktop
 
=== modified file 'debian/redshift.install'
--- debian/redshift.install	2010-02-18 09:58:46 +0000
+++ debian/redshift.install	2015-10-14 19:20:52 +0000
@@ -1,2 +1,3 @@
 usr/bin/redshift
 usr/share/locale
+usr/share/applications/redshift.desktop
 
=== modified file 'debian/rules'
--- debian/rules	2015-06-28 09:25:43 +0000
+++ debian/rules	2015-10-14 19:20:52 +0000
@@ -6,10 +6,11 @@
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --with autotools_dev,python3
+	dh $@ --with python3,autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-randr --enable-vidmode --enable-geoclue2 --disable-geoclue --enable-ubuntu
+	intltoolize --force
+	dh_auto_configure -- --enable-randr --enable-vidmode --enable-geoclue2 --disable-geoclue --with-systemduserunitdir=/usr/lib/systemd/user/  --enable-ubuntu
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
=== modified file 'src/location-geoclue.c'
--- src/location-geoclue.c	2015-06-28 09:25:43 +0000
+++ src/location-geoclue.c	2015-10-14 19:20:52 +0000
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <geoclue/geoclue-master.h>
 #include <geoclue/geoclue-position.h>
@@ -192,28 +191,17 @@
 	GError *error = NULL;
 	double latitude = 0, longitude = 0;
 
-	/* Retry 3 times because this seems to timeout quite a bit */
-	int retries = 4;
-	while(--retries) {
-		fields = geoclue_position_get_position(state->position, NULL,
-							   &latitude, &longitude, NULL,
-							   NULL, &error);
-		if (error) {
-			g_printerr(_("Could not get location (%d retries left): %s.\n"), retries, error->message);
-			g_error_free(error);
-			return -1;
-		}
-		if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
-			fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
-			break;
-		}
-		g_warning(_("Could not get location, %d retries left.\n"), retries);
-		/* Sleep for a while to let  */
-		usleep(1000000);
+	fields = geoclue_position_get_position(state->position, NULL,
+					       &latitude, &longitude, NULL,
+					       NULL, &error);
+	if (error) {
+		g_printerr(_("Could not get location: %s.\n"), error->message);
+		g_error_free(error);
+		return -1;
 	}
 	
 	if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
-		fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
+	    fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
 		fprintf(stdout, _("According to the geoclue provider"
 				  " we're at: %.2f, %.2f\n"),
 			latitude, longitude);
 
=== modified file 'src/redshift-gtk/statusicon.py'
--- src/redshift-gtk/statusicon.py	2015-06-28 09:25:43 +0000
+++ src/redshift-gtk/statusicon.py	2015-10-14 19:20:52 +0000
@@ -273,6 +273,18 @@
         suspend_menu_item.set_submenu(suspend_menu)
         self.status_menu.append(suspend_menu_item)
 
+        # Add autostart option
+        autostart_item = Gtk.CheckMenuItem.new_with_label(_('Autostart'))
+        try:
+            autostart_item.set_active(utils.get_autostart())
+        except IOError as strerror:
+            print(strerror)
+            autostart_item.set_property('sensitive', False)
+        else:
+            autostart_item.connect('toggled', self.autostart_cb)
+        finally:
+            self.status_menu.append(autostart_item)
+
         # Add info action
         info_item = Gtk.MenuItem.new_with_label(_('Info'))
         info_item.connect('activate', self.show_info_cb)