Merge lp:~sergiusens/powerd/daily into lp:powerd

[Sergio Schvezov]

Daily release preparation

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/powerd-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/47/rebuild

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Thanks for the changes! Approving :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/powerd-ci/48/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/powerd-autolanding/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-autolanding/3/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 16:31:23 +0000
+++ debian/changelog	2013-06-04 06:44:36 +0000
@@ -1,5 +1,13 @@
-powerd (0.12) UNRELEASED; urgency=low
-
+powerd (0.13-0ubuntu1) UNRELEASED; urgency=low
+
+  * Automatic snapshot from revision 30 (bootstrap)
+  * Daily release packaging.
+
+ -- Sergio Schvezov <[e-mail]>  Tue, 04 Jun 2013 03:12:48 -0300
+
+powerd (0.12) saucy; urgency=low
+
+  [ Seth Forshee ]
   * Fix use of uninitialized variable in wait_for_fb_thread(). Also
     change type of the variable to elimante warning on 64-bit builds.
   * Remove unnecessary calls to g_type_init()
@@ -7,7 +15,10 @@
   * Add test for supplying an invalidly formatted UUID to clearSysState
   * Improve dbus error handling
 
- -- Seth Forshee <[e-mail]>  Fri, 31 May 2013 10:24:56 -0500
+  [ Ken VanDine ]
+  * Don't listen for proximity events of prox_sensor is NULL (LP: #1186706)
+
+ -- Sergio Schvezov <[e-mail]>  Mon, 03 Jun 2013 17:33:36 -0300
 
 powerd (0.11) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-05-31 13:52:37 +0000
+++ debian/control	2013-06-04 06:44:36 +0000
@@ -10,13 +10,17 @@
                libgles2-mesa-dev,
                python,
                libplatform-api1-dev,
-               uuid-dev
+               uuid-dev,
 Standards-Version: 3.9.4
-Vcs-Bzr: lp:powerd
+Homepage: https://launchpad.net/powerd
+# If you aren't a member of ~phablet-team but need to upload packaging changes,
+# just go ahead.  ~phablet-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/powerd/trunk
 
 Package: powerd
 Architecture: armhf
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: ofono
 Description: Power daemon to monitor and control system and display power state
  This daemon monitors and controls system and display power states for Ubuntu
  phone and tablet. It provides a dbus interface for system services to request

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-20 15:42:12 +0000
+++ debian/copyright	2013-06-04 06:44:36 +0000
@@ -4,7 +4,7 @@
 Source: https://launchpad.net/~rocket-scientists/aal+/powerd
 
 Files: *
-Copyright: Copyright (C) 2012, Canonical Ltd
+Copyright: Copyright (C) 2012-2013, Canonical Ltd
 License: GPL-3
 
 License: GPL-3

=== modified file 'debian/rules'
--- debian/rules	2013-02-20 15:52:29 +0000
+++ debian/rules	2013-06-04 06:44:36 +0000
@@ -7,3 +7,6 @@
 
 %:
 	dh $@
+
+override_dh_install:
+	dh_install --fail-missing

=== modified file 'debian/upstart'
--- debian/upstart	2013-05-20 17:33:44 +0000
+++ debian/upstart	2013-06-04 06:44:36 +0000
@@ -13,17 +13,13 @@
 export ANDROID_ASSETS=/system/app
 export ANDROID_BOOTLOGO=1
 export USER=phablet
-export LD_LIBRARY_PATH=/opt/qt5/lib:/vendor/lib:/system/lib
-export QML_IMPORT_PATH=/opt/qt5/imports
-export QT_FONT_PATH=/opt/qt5/lib/fonts
-export PATH=/opt/qt5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 export ANDROID_DATA=/data
 export QT_QPA_PLATFORM=hybris
 export SHLVL=1
 export MKSH=/system/bin/sh
 export ANDROID_ROOT=/system
 export EXTERNAL_STORAGE=/mnt/sdcard
-export QT_PLUGIN_PATH=/opt/qt5/plugins
 # for debugging purposes, remove when closer to shipping (mfisch)
 export G_MESSAGES_DEBUG=all