update notifier

Merge lp:~seb128/update-notifier/gconf-migration-done into lp:update-notifier/ubuntu

  1. gconf-migration-done
  2. Merge into ubuntu
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 918
Proposed branch: lp:~seb128/update-notifier/gconf-migration-done
Merge into: lp:update-notifier/ubuntu
Diff against target: 54 lines (+8/-12)
4 files modified
data/Makefile.am (+0/-3)
data/update-notifier.convert (+0/-8)
debian/changelog (+8/-0)
debian/update-notifier.install (+0/-1)
To merge this branch: bzr merge lp:~seb128/update-notifier/gconf-migration-done
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+331572@code.launchpad.net

Commit message

Remove the gconf to gsettings migration script, gconf has been long
deprecated and the list of key is incorrect and leads the convert
tools to error out (lp: #1720368)

Description of the change

Remove the gconf to gsettings migration script, gconf has been long
deprecated and the list of key is incorrect and leads the convert
tools to error out (lp: #1720368)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2016-08-05 22:00:54 +0000
3+++ data/Makefile.am 2017-09-29 14:39:59 +0000
4@@ -12,9 +12,6 @@
5 policydir = $(datadir)/polkit-1/actions
6 policy_DATA = com.ubuntu.update-notifier.policy
7
8-convertdir = $(datadir)/GConf/gsettings
9-dist_convert_DATA = update-notifier.convert
10-
11 helperdir = $(libdir)/update-notifier
12 helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
13
14
15=== removed file 'data/update-notifier.convert'
16--- data/update-notifier.convert 2011-07-14 07:37:31 +0000
17+++ data/update-notifier.convert 1970-01-01 00:00:00 +0000
18@@ -1,8 +0,0 @@
19-[com.ubuntu.update-notifier]
20-show-apport-crashes = /apps/update-notifier/show_apport_crashes
21-end-system-uids = /apps/update-notifier/end_system_uids
22-auto-launch = /apps/update-notifier/auto_launch
23-regular-auto-launch-interval = /apps/update-notifier/regular_auto_launch_interval
24-hide-reboot-notification = /apps/update-notifier/hide_reboot_notification
25-no-show-notifications = /apps/update-notifier/no_show_notifications
26-release-check-time = /apps/update-notifier/release_check_time
27
28=== modified file 'debian/changelog'
29--- debian/changelog 2017-09-06 22:33:34 +0000
30+++ debian/changelog 2017-09-29 14:39:59 +0000
31@@ -1,3 +1,11 @@
32+update-notifier (3.187) UNRELEASED; urgency=medium
33+
34+ * Remove the gconf to gsettings migration script, gconf has been long
35+ deprecated and the list of key is incorrect and leads the convert
36+ tools to error out (lp: #1720368)
37+
38+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 29 Sep 2017 10:32:19 -0400
39+
40 update-notifier (3.186) artful; urgency=medium
41
42 * src/crash.c: don't prompt about system reports under wayland, pkexec
43
44=== modified file 'debian/update-notifier.install'
45--- debian/update-notifier.install 2017-08-24 10:15:08 +0000
46+++ debian/update-notifier.install 2017-09-29 14:39:59 +0000
47@@ -5,7 +5,6 @@
48 usr/share/icons/hicolor/24x24/
49 usr/share/icons/hicolor/48x48/
50 usr/share/glib-2.0/schemas/com.ubuntu.update-notifier.gschema.xml
51-usr/share/GConf/gsettings/update-notifier.convert
52 usr/bin/update-notifier
53 usr/bin/distro-cd-updater usr/lib/update-notifier/
54 usr/bin/livepatch-notification usr/lib/update-notifier/

Subscribers

People subscribed via source and target branches

to all changes: