Merge lp:~pete-woods/libusermetrics/packaging into lp:libusermetrics

[Pete Woods]

Improve the packaging

Improve the packaging

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-saucy-armhf-ci/29

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libusermetrics-ci/29/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-15 09:06:26 +0000
+++ debian/control	2013-08-15 13:12:48 +0000
@@ -2,19 +2,19 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               dbus,
                debhelper (>= 9),
                doxygen,
+               gettext,
                google-mock (>= 1.6.0+svn437),
                libgtest-dev,
-               qtbase5-dev,
                libqdjango-dev,
-               valgrind,
-               pkg-config,
                libqt5sql5-sqlite,
                libqtdbustest1-dev,
+               pkg-config,
+               qtbase5-dev,
                sqlite3,
-               dbus,
-               gettext,
+               valgrind,
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://launchpad.net/libusermetrics
@@ -23,25 +23,17 @@
 Vcs-Bzr: http://bazaar.launchpad.net/~indicator-applet-developers/libusermetrics/trunk
 Vcs-Browser: https://code.launchpad.net/~indicator-applet-developers/libusermetrics/trunk
 
-Package: libusermetrics-tools
-Architecture: any
-Depends: libusermetricsinput1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: library for exporting anonymous metrics about users
- This package contains command line tools to operate the library.
- 
 Package: usermetricsservice
 Architecture: any
-Multi-Arch: same
-Depends: dbus,
+Depends: adduser,
+         dbus,
+         libqt5sql5-sqlite,
          sqlite3,
-         libqt5sql5-sqlite,
-         adduser,
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Description: library for exporting anonymous metrics about users
  This package contains the service which stores the metrics.
+Multi-Arch: same
 
 Package: libusermetricsinput1-dev
 Section: libdevel
@@ -56,8 +48,8 @@
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: usermetricsservice (= ${binary:Version}),
-         gettext,
+Depends: gettext,
+         usermetricsservice (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Pre-Depends: ${misc:Pre-Depends},
@@ -90,3 +82,12 @@
 Depends: ${misc:Depends},
 Description: API documentation for libusermetrics
  This package installs the libusermetrics API documentation.
+
+Package: libusermetrics-tools
+Architecture: any
+Depends: libusermetricsinput1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: library for exporting anonymous metrics about users
+ This package contains command line tools to operate the library.
+

=== modified file 'debian/libusermetrics-tools.install'
--- debian/libusermetrics-tools.install	2013-07-01 17:13:45 +0000
+++ debian/libusermetrics-tools.install	2013-08-15 13:12:48 +0000
@@ -1,1 +1,1 @@
-usr/bin
\ No newline at end of file
+usr/bin

=== modified file 'debian/usermetricsservice.install'
--- debian/usermetricsservice.install	2013-07-05 15:31:22 +0000
+++ debian/usermetricsservice.install	2013-08-15 13:12:48 +0000
@@ -1,4 +1,4 @@
+etc
 usr/lib/*/libusermetrics
 usr/share/dbus-1
 usr/share/locale
-etc
\ No newline at end of file

=== added file 'debian/usermetricsservice.postinst'
--- debian/usermetricsservice.postinst	1970-01-01 00:00:00 +0000
+++ debian/usermetricsservice.postinst	2013-08-15 13:12:48 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+dbus-send --system --print-reply                        \
+        --dest=org.freedesktop.DBus                     \
+        /org/freedesktop/DBus                           \
+        org.freedesktop.DBus.StartServiceByName         \
+        string:"com.canonical.UserMetrics" uint32:0
+
+#DEBHELPER#
+
+exit 0

=== renamed file 'debian/usermetricsservice.postinst' => 'debian/usermetricsservice.preinst'
--- debian/usermetricsservice.postinst	2013-07-03 13:38:01 +0000
+++ debian/usermetricsservice.preinst	2013-08-15 13:12:48 +0000
@@ -25,9 +25,6 @@
   chmod 0750 /var/lib/usermetrics
 fi
 
-# Force dbus to reload its configuration
-touch "/etc/dbus-1/system.d/com.canonical.UserMetrics.conf"
-
 #DEBHELPER#
 
 exit 0