Merge lp:~dbarth/account-plugins/fix-maintainer-scripts into lp:account-plugins

Proposed by David Barth on 2014-04-09
Status: Merged
Approved by: Alberto Mardegan on 2014-04-09
Approved revision: 138
Merged at revision: 137
Proposed branch: lp:~dbarth/account-plugins/fix-maintainer-scripts
Merge into: lp:account-plugins
Diff against target: 44 lines (+2/-12)
5 files modified
debian/account-plugin-flickr.maintscript (+1/-0)
debian/account-plugin-flickr.postinst (+0/-4)
debian/account-plugin-flickr.postrm (+0/-4)
debian/account-plugin-flickr.preinst (+0/-4)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~dbarth/account-plugins/fix-maintainer-scripts
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2014-04-09 Approve on 2014-04-09
PS Jenkins bot (community) continuous-integration Approve on 2014-04-09
Review via email: mp+214998@code.launchpad.net

Commit message

This change is to fix the maintainer scripts for the flickr settings. It mostly undoes the changes of https://code.launchpad.net/~mardy/account-plugins/lp1299659/+merge/213415 which are considered dangerous.

Description of the change

This change is to fix the maintainer scripts for the flickr settings. It mostly undoes the changes of https://code.launchpad.net/~mardy/account-plugins/lp1299659/+merge/213415 which are considered dangerous.

To post a comment you must log in.
138. By David Barth on 2014-04-09

add a rev. number to the flicker maintscript to avoid unnecessary re-runs in the future

Alberto Mardegan (mardy) wrote :

Thanks David!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/account-plugin-flickr.maintscript'
2--- debian/account-plugin-flickr.maintscript 1970-01-01 00:00:00 +0000
3+++ debian/account-plugin-flickr.maintscript 2014-04-09 17:49:30 +0000
4@@ -0,0 +1,1 @@
5+rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140408
6
7=== removed file 'debian/account-plugin-flickr.postinst'
8--- debian/account-plugin-flickr.postinst 2014-04-01 11:13:41 +0000
9+++ debian/account-plugin-flickr.postinst 1970-01-01 00:00:00 +0000
10@@ -1,4 +0,0 @@
11-#!/bin/sh
12-set -e
13-
14-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
15
16=== removed file 'debian/account-plugin-flickr.postrm'
17--- debian/account-plugin-flickr.postrm 2014-04-01 11:13:41 +0000
18+++ debian/account-plugin-flickr.postrm 1970-01-01 00:00:00 +0000
19@@ -1,4 +0,0 @@
20-#!/bin/sh
21-set -e
22-
23-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
24
25=== removed file 'debian/account-plugin-flickr.preinst'
26--- debian/account-plugin-flickr.preinst 2014-04-01 11:13:41 +0000
27+++ debian/account-plugin-flickr.preinst 1970-01-01 00:00:00 +0000
28@@ -1,4 +0,0 @@
29-#!/bin/sh
30-set -e
31-
32-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
33
34=== modified file 'debian/rules'
35--- debian/rules 2013-06-12 05:49:46 +0000
36+++ debian/rules 2014-04-09 17:49:30 +0000
37@@ -12,6 +12,7 @@
38 --with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
39 --with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
40 --with-windows-live-client-id="00000000400D5635" \
41+ --with-facebook-client-id="271112146382618" \
42 --with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
43 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
44 --with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \

Subscribers

People subscribed via source and target branches

to all changes: