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

Proposed by Sebastien Bacher
Status: Merged
Approved by: Iain Lane
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 Approve
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.
Revision history for this message
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

Revision history for this message
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
=== modified file 'debian/control'
--- debian/control 2016-02-16 15:26:59 +0000
+++ debian/control 2016-03-18 17:40:35 +0000
@@ -6,7 +6,6 @@
6Build-Depends: autotools-dev,6Build-Depends: autotools-dev,
7 cdbs (>= 0.4.41),7 cdbs (>= 0.4.41),
8 debhelper (>= 9),8 debhelper (>= 9),
9 dh-migrations,
10 desktop-file-utils,9 desktop-file-utils,
11 fcitx-libs-dev,10 fcitx-libs-dev,
12 gtk-doc-tools,11 gtk-doc-tools,
1312
=== modified file 'debian/rules'
--- debian/rules 2015-10-30 02:58:51 +0000
+++ debian/rules 2016-03-18 17:40:35 +0000
@@ -17,7 +17,6 @@
17DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c417DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
1818
19binary-post-install/unity-control-center::19binary-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.png20 ./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
2221
23common-binary-post-install-arch:: list-missing22common-binary-post-install-arch:: list-missing
2423
=== removed file 'debian/ucc-unity-launcher.py'
--- debian/ucc-unity-launcher.py 2014-02-17 17:40:21 +0000
+++ debian/ucc-unity-launcher.py 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
1#!/usr/bin/python
2# -*- coding: utf-8 -*-
3# Copyright (C) 2013 Canonical
4
5from gi.repository import Gio
6import os,sys
7
8if "com.canonical.Unity.Launcher" not in Gio.Settings.list_schemas():
9 print("No unity schemas found, no migration needed")
10 sys.exit(0)
11
12gsettings=Gio.Settings(schema="com.canonical.Unity.Launcher", path="/com/canonical/unity/launcher/")
13launcher_list = gsettings.get_strv("favorites")
14
15# Replace g-c-c by u-c-c in the unity launcher
16try:
17 idx=launcher_list.index("application://gnome-control-center.desktop")
18 launcher_list[idx]="application://unity-control-center.desktop"
19except ValueError:
20 pass
21# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
22from subprocess import Popen, PIPE, STDOUT
23p = Popen(['dconf', 'load', '/com/canonical/unity/launcher/'], stdout=PIPE, stdin=PIPE, stderr=STDOUT)
24p.communicate(input="[/]\nfavorites={}".format(launcher_list).encode('utf-8'))
250
=== removed file 'debian/unity-control-center.migrations'
--- debian/unity-control-center.migrations 2014-02-17 17:40:21 +0000
+++ debian/unity-control-center.migrations 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1debian/ucc-unity-launcher.py

Subscribers

People subscribed via source and target branches