Merge lp:~seb128/indicator-datetime/systemd-packaging-update into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Sebastien Bacher]

Use systemd's service backend

Use systemd's service backend

[lp:~seb128/indicator-datetime/systemd-packaging-update]

213. By Sebastien Bacher on 2013-03-26

Port to timedated instead of gnome-settings-daemon datetime mechanism

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 02:01:22 +0000
+++ debian/changelog	2013-03-26 19:00:31 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-datetime (12.10.3daily13.03.07-0ubuntu1) raring; urgency=low
 
   [ Michael Terry ]
@@ -19,6 +20,15 @@
 
  -- Automatic PS uploader <[e-mail]>  Wed, 06 Mar 2013 02:01:48 +0000
 
+=======
+indicator-datetime (12.10.3daily13.02.06-0ubuntu2) UNRELEASED; urgency=low
+
+  * Use systemd's service backend, ffe lp: #1153567
+  * debian/control: depends on systemd-services and systemd-shim
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 26 Mar 2013 19:53:55 +0100
+
+>>>>>>> MERGE-SOURCE
 indicator-datetime (12.10.3daily13.02.06-0ubuntu1) raring; urgency=low
 
   [ Colin Watson ]

=== modified file 'debian/control'
--- debian/control	2013-01-17 21:17:40 +0000
+++ debian/control	2013-03-26 19:00:31 +0000
@@ -40,6 +40,8 @@
          ${misc:Depends},
          gnome-control-center,
          geoclue-ubuntu-geoip | geoclue-provider,
+         systemd-services,
+         systemd-shim
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
 Description: Simple clock