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

[David Barth]

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.

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/27/rebuild

review: Approve (continuous-integration)

[lp:~dbarth/account-plugins/fix-maintainer-scripts]

138. By David Barth on 2014-04-09

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/28/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Thanks David!

review: Approve

=== added file 'debian/account-plugin-flickr.maintscript'
--- debian/account-plugin-flickr.maintscript	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.maintscript	2014-04-09 17:49:30 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140408
 
=== removed file 'debian/account-plugin-flickr.postinst'
--- debian/account-plugin-flickr.postinst	2014-04-01 11:13:41 +0000
+++ debian/account-plugin-flickr.postinst	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
 
=== removed file 'debian/account-plugin-flickr.postrm'
--- debian/account-plugin-flickr.postrm	2014-04-01 11:13:41 +0000
+++ debian/account-plugin-flickr.postrm	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
 
=== removed file 'debian/account-plugin-flickr.preinst'
--- debian/account-plugin-flickr.preinst	2014-04-01 11:13:41 +0000
+++ debian/account-plugin-flickr.preinst	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-
-dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf -- "$@"
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-12 05:49:46 +0000
+++ debian/rules	2014-04-09 17:49:30 +0000
@@ -12,6 +12,7 @@
 		--with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
 		--with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
 		--with-windows-live-client-id="00000000400D5635" \
+		--with-facebook-client-id="271112146382618" \
 		--with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
 		--with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
 		--with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \