Merge lp:~dpm/reminders-app/account-plugin-evernote-upload into lp:reminders-app

[David Planella]

Trunk release.

Null merge branch (i.e. no changes) submitted only to go through the CI process and upload the new version of the account-plugin-evernote package.

Once successfully built, packages will be available at:
https://launchpad.net/~ci-train-ppa-service/+archive/landing-013/

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/reminders-app-ci/448/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/839
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/839/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/144

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/448/rebuild

review: Approve (continuous-integration)

[lp:~dpm/reminders-app/account-plugin-evernote-upload]

173. By David Planella on 2014-07-03

Changed Debian versioning to make the CI train happy

174. By David Planella on 2014-07-03

Added bzr builddeb dir

175. By David Planella on 2014-07-04

Removed debian/source as recommended at https://wiki.ubuntu.com/DailyRelease/InlinePackaging, marked .install file explicitly as +x to ensure that info is not lost in the .diff.gz file and thus dh-exec can do variable expansion

[David Planella (dpm)]

Some context for the changes: it seems upon generation of the diff.gz file the +x information of the account-plugin-evernote.install file was lost, so I'm now explicitly making it +x in debian/rules, and also dropping the debian/source/ directory as instructed here [1].

[1] https://wiki.ubuntu.com/DailyRelease/InlinePackaging

[David Planella (dpm)]

Sorry, I forgot to add that losing the +x info on account-plugin-evernote.install had meant that dh-exec could not expand ${DEB_HOST_MULTIARCH}, so although the build succeeded, the resulting packages contained files literally in /usr/lib/${DEB_HOST_MULTIARCH}

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2014-07-04 07:27:25 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-01 13:27:32 +0000
+++ debian/changelog	2014-07-04 07:27:25 +0000
@@ -1,3 +1,9 @@
+reminders-app (0.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Trunk release. 
+
+ -- David Planella <[e-mail]>  Fri, 04 Jul 2014 00:32:41 +0200
+
 reminders-app (0.4+bzr182ppa4~utopic) utopic; urgency=medium
 
   * Fixed the account provider file and the condition to check

=== modified file 'debian/rules'
--- debian/rules	2014-06-27 15:57:59 +0000
+++ debian/rules	2014-07-04 07:27:25 +0000
@@ -15,4 +15,6 @@
 		-DEVERNOTE_CONSUMER_SECRET="174a72ce5bffbcad"
 
 override_dh_install:
+	# Make sure the dh-exec variable expansion works
+	chmod a+x debian/account-plugin-evernote.install
 	dh_install --fail-missing

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2013-11-20 21:49:45 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1.0