Merge lp:~seb128/account-plugins/delete-windows-binary into lp:account-plugins

Proposed by Sebastien Bacher on 2015-07-23
Status: Merged
Approved by: Alberto Mardegan on 2015-07-23
Approved revision: 150
Merged at revision: 150
Proposed branch: lp:~seb128/account-plugins/delete-windows-binary
Merge into: lp:account-plugins
Diff against target: 37 lines (+2/-10)
3 files modified
debian/account-plugin-windows-live.install (+0/-2)
debian/control (+0/-8)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~seb128/account-plugins/delete-windows-binary
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2015-07-23
Alberto Mardegan (community) 2015-07-23 Approve on 2015-07-23
Review via email: mp+265668@code.launchpad.net

Commit message

remove the windows live plugin binary, the oauth package is already
having a conflict with it which makes it uninstallable and lead
the archive migration to discard the update as invalid

Description of the change

remove the windows live plugin binary, the oauth package is already
having a conflict with it which makes it uninstallable and lead
the archive migration to discard the update as invalid

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=== removed file 'debian/account-plugin-windows-live.install'
2--- debian/account-plugin-windows-live.install 2015-04-17 08:53:11 +0000
3+++ debian/account-plugin-windows-live.install 1970-01-01 00:00:00 +0000
4@@ -1,2 +0,0 @@
5-etc/signon-ui/webkit-options.d/login.live.com.conf
6-usr/share/accounts/providers/windows-live.provider
7
8=== modified file 'debian/control'
9--- debian/control 2015-04-17 09:59:27 +0000
10+++ debian/control 2015-07-23 14:11:15 +0000
11@@ -89,14 +89,6 @@
12 Description: GNOME Control Center account plugin for single signon - foursquare
13 GNOME Control Center account plugins for single signon
14
15-Package: account-plugin-windows-live
16-Architecture: all
17-Depends: ${misc:Depends},
18- libaccount-plugin-generic-oauth,
19- unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
20-Description: GNOME Control Center account plugin for single signon - windows live
21- GNOME Control Center account plugins for single signon
22-
23 Package: account-plugin-sohu
24 Architecture: all
25 Depends: ${misc:Depends},
26
27=== modified file 'debian/rules'
28--- debian/rules 2014-04-09 09:03:20 +0000
29+++ debian/rules 2015-07-23 14:11:15 +0000
30@@ -25,6 +25,8 @@
31
32 override_dh_install:
33 rm -f debian/*/usr/lib/*/*/*.la
34+ # the service is not valid anymore so we don't ship those
35+ rm debian/tmp/etc/signon-ui/webkit-options.d/login.live.com.conf debian/tmp/usr/share/accounts/providers/windows-live.provider
36 mkdir -p debian/tmp/usr/share/account-plugins/tools
37 dh_install --fail-missing
38

Subscribers

People subscribed via source and target branches

to all changes: