Update to U. Desktop

3 files changed, 20 insertions, 66 deletions

diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml
deleted file mode 100644
index c794d83..0000000
--- a/data/org.ayatana.indicator.datetime.gschema.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<schemalist>
-	<enum id="time-enum">
-		<value nick="locale-default" value="0" />
-		<value nick="12-hour" value="1" />
-		<value nick="24-hour" value="2" />
-		<value nick="custom" value="3" />
-	</enum>
-	<schema id="org.ayatana.indicator.datetime" path="/apps/indicators/datetime/" gettext-domain="indicator-datetime">
-		<key name="time-format" enum="time-enum">
-			<default>'locale-default'</default>
-			<summary>What the time format should be</summary>
-			<description>
-			  Controls the time format that is displayed in the indicator.  For almost
-			  all users this should be the default for their locale.  If you think the
-			  setting is wrong for your locale please join or talk to the translation
-			  team for your langauge.  If you just want something different you can
-			  adjust this to be either 12 or 24 time.  Or, you can use a custom format
-			  string and set the custom-time-format setting.
-			</description>
-		</key>
-		<key name="show-seconds" type="b">
-			<default>false</default>
-			<summary>Show the number of seconds in the indicator</summary>
-			<description>
-			  Makes the datetime indicator show the number of seconds in the indicator.
-			  It's important to note that this will cause additional battery drain as
-			  the time will update 60 times as often, so it is not recommended.  Also,
-			  this setting will be ignored if the time-format value is set to custom.
-			</description>
-		</key>
-		<key name="show-day" type="b">
-			<default>false</default>
-			<summary>Show the day of the week in the indicator</summary>
-			<description>
-			  Puts the day of the week on the panel along with the time and/or date
-			  depending on settings.  This setting will be ignored if the time-format
-			  value is set to custom.
-			</description>
-		</key>
-		<key name="show-date" type="b">
-			<default>false</default>
-			<summary>Show the month and date in the indicator</summary>
-			<description>
-			  Puts the month and the date in the panel along with the time and/or day
-			  of the week depending on settings.  This setting will be ignored if the
-			  time-format value is set to custom.
-			</description>
-		</key>
-		<key name="custom-time-format" type="s">
-			<default>"%l:%M %p"</default>
-			<summary>The format string passed to strftime</summary>
-			<description>
-			  The format of the time and/or date that is visible on the panel when using
-			  the indicator.  For most users this will be a set of predefined values as
-			  determined by the configuration utility, but advanced users can change it
-			  to anything strftime can accept.  Look at the man page on strftime for
-			  more information.
-			</description>
-		</key>
-	</schema>
-</schemalist>
diff --git a/debian/changelog b/debian/changelog
index 8dfb783..13c9645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-indicator-datetime (0.2.91-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-datetime (0.2.91-0ubuntu2) oneiric; urgency=low
 
+  * No change rebuild for evolution-data-server 3.1.3.1
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 12 Jul 2011 13:45:24 -0400
+
+indicator-datetime (0.2.91-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
   * New upstream release.
     * libindicator 0.4 transition
     * Making preferences a gnome-control-center plugin
@@ -7,7 +14,13 @@ indicator-datetime (0.2.91-0ubuntu1~ppa1) oneiric; urgency=low
     * Fixing timezone setting with new gsd
   * Dropped debian/patches/fix-timezones.patch: merged upstream
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jul 2011 16:26:11 -0500
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped build depends for libindicator to >= 0.3.90
+    - Added build depends on libgnome-control-center-dev
+    - Added depends for gnome-control-center
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 08 Jul 2011 09:38:50 -0400
 
 indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index b830e91..5b210b1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Build-Depends: cdbs,
                debhelper (>= 5), 
                quilt,
                intltool (>= 0.35.0), 
-               libindicator-dev (>= 0.3.19),
-               libindicator3-dev (>= 0.3.19),
+               libindicator-dev (>= 0.3.90),
+               libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.3.90),
                libdbusmenu-gtk-dev (>= 0.3.94),
                libdbusmenu-gtk3-dev (>= 0.3.94),
@@ -27,6 +27,7 @@ Build-Depends: cdbs,
                libedataserver1.2-dev (>= 2.30),
                libedataserverui-3.0-dev,
                libgconf2-dev (>= 2.31),
+               libgnome-control-center-dev,
                dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/indicator-datetime
@@ -36,6 +37,7 @@ Package: indicator-datetime
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+         gnome-control-center,
          geoclue-ubuntu-geoip | geoclue-provider
 Recommends: indicator-applet | indicator-renderer
 Description: Simple clock
@@ -46,9 +48,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
          indicator-datetime (= ${binary:Version}),
+         gnome-control-center,
          geoclue-ubuntu-geoip | geoclue-provider
 Replaces: indicator-datetime (<< 0.2.90)
 Recommends: indicator-applet | indicator-renderer
 Description: Simple clock
  A simple clock appearing in the indicator bar
-