Merge lp:~seb128/unity-control-center/remove-migration-script into lp:unity-control-center

Proposed by Sebastien Bacher on 2016-03-18
Status: Merged
Approved by: Iain Lane on 2016-04-11
Approved revision: 12860
Merged at revision: 12860
Proposed branch: lp:~seb128/unity-control-center/remove-migration-script
Merge into: lp:unity-control-center
Diff against target: 58 lines (+0/-27)
4 files modified
debian/control (+0/-1)
debian/rules (+0/-1)
debian/ucc-unity-launcher.py (+0/-24)
debian/unity-control-center.migrations (+0/-1)
To merge this branch: bzr merge lp:~seb128/unity-control-center/remove-migration-script
Reviewer Review Type Date Requested Status
Iain Lane 2016-03-18 Approve on 2016-04-11
Review via email: mp+289530@code.launchpad.net

Commit message

remove the migration script, it was only needed for trusty updates

Description of the change

remove the migration script, it was only needed for trusty updates

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

note that it would be useful to get in before xenial since the current script uses python2 but import bindings that are not installed by default in xenial which leads to have it not working and logging errors

Iain Lane (laney) wrote :

looking good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-02-16 15:26:59 +0000
3+++ debian/control 2016-03-18 17:40:35 +0000
4@@ -6,7 +6,6 @@
5 Build-Depends: autotools-dev,
6 cdbs (>= 0.4.41),
7 debhelper (>= 9),
8- dh-migrations,
9 desktop-file-utils,
10 fcitx-libs-dev,
11 gtk-doc-tools,
12
13=== modified file 'debian/rules'
14--- debian/rules 2015-10-30 02:58:51 +0000
15+++ debian/rules 2016-03-18 17:40:35 +0000
16@@ -17,7 +17,6 @@
17 DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
18
19 binary-post-install/unity-control-center::
20- dh_migrations -p$(cdbs_curpkg)
21 ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 16.04 LTS" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
22
23 common-binary-post-install-arch:: list-missing
24
25=== removed file 'debian/ucc-unity-launcher.py'
26--- debian/ucc-unity-launcher.py 2014-02-17 17:40:21 +0000
27+++ debian/ucc-unity-launcher.py 1970-01-01 00:00:00 +0000
28@@ -1,24 +0,0 @@
29-#!/usr/bin/python
30-# -*- coding: utf-8 -*-
31-# Copyright (C) 2013 Canonical
32-
33-from gi.repository import Gio
34-import os,sys
35-
36-if "com.canonical.Unity.Launcher" not in Gio.Settings.list_schemas():
37- print("No unity schemas found, no migration needed")
38- sys.exit(0)
39-
40-gsettings=Gio.Settings(schema="com.canonical.Unity.Launcher", path="/com/canonical/unity/launcher/")
41-launcher_list = gsettings.get_strv("favorites")
42-
43-# Replace g-c-c by u-c-c in the unity launcher
44-try:
45- idx=launcher_list.index("application://gnome-control-center.desktop")
46- launcher_list[idx]="application://unity-control-center.desktop"
47-except ValueError:
48- pass
49-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
50-from subprocess import Popen, PIPE, STDOUT
51-p = Popen(['dconf', 'load', '/com/canonical/unity/launcher/'], stdout=PIPE, stdin=PIPE, stderr=STDOUT)
52-p.communicate(input="[/]\nfavorites={}".format(launcher_list).encode('utf-8'))
53
54=== removed file 'debian/unity-control-center.migrations'
55--- debian/unity-control-center.migrations 2014-02-17 17:40:21 +0000
56+++ debian/unity-control-center.migrations 1970-01-01 00:00:00 +0000
57@@ -1,1 +0,0 @@
58-debian/ucc-unity-launcher.py

Subscribers

People subscribed via source and target branches