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
=== removed file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install 2015-04-17 08:53:11 +0000
+++ debian/account-plugin-windows-live.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1etc/signon-ui/webkit-options.d/login.live.com.conf
2usr/share/accounts/providers/windows-live.provider
30
=== modified file 'debian/control'
--- debian/control 2015-04-17 09:59:27 +0000
+++ debian/control 2015-07-23 14:11:15 +0000
@@ -89,14 +89,6 @@
89Description: GNOME Control Center account plugin for single signon - foursquare89Description: GNOME Control Center account plugin for single signon - foursquare
90 GNOME Control Center account plugins for single signon90 GNOME Control Center account plugins for single signon
9191
92Package: account-plugin-windows-live
93Architecture: all
94Depends: ${misc:Depends},
95 libaccount-plugin-generic-oauth,
96 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
97Description: GNOME Control Center account plugin for single signon - windows live
98 GNOME Control Center account plugins for single signon
99
100Package: account-plugin-sohu92Package: account-plugin-sohu
101Architecture: all93Architecture: all
102Depends: ${misc:Depends},94Depends: ${misc:Depends},
10395
=== modified file 'debian/rules'
--- debian/rules 2014-04-09 09:03:20 +0000
+++ debian/rules 2015-07-23 14:11:15 +0000
@@ -25,6 +25,8 @@
2525
26override_dh_install:26override_dh_install:
27 rm -f debian/*/usr/lib/*/*/*.la27 rm -f debian/*/usr/lib/*/*/*.la
28 # the service is not valid anymore so we don't ship those
29 rm debian/tmp/etc/signon-ui/webkit-options.d/login.live.com.conf debian/tmp/usr/share/accounts/providers/windows-live.provider
28 mkdir -p debian/tmp/usr/share/account-plugins/tools30 mkdir -p debian/tmp/usr/share/account-plugins/tools
29 dh_install --fail-missing31 dh_install --fail-missing
3032

Subscribers

People subscribed via source and target branches

to all changes: