Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.

data/CMakeLists.txt

@@ -3,7 +3,7 @@
 ##
 
 include (UseGSettings)
-set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml")
+set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
 
@@ -80,10 +80,10 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
 message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
 
-set (UNITY_INDICATOR_NAME "com.canonical.indicator.datetime")
+set (UNITY_INDICATOR_NAME "org.ayatana.indicator.datetime")
 set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
 
 install (FILES "${UNITY_INDICATOR_FILE}"

data/indicator-datetime.desktop.in

@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Date & Time
 Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=Unity;GNOME;Pantheon;
+OnlyShowIn=MATE;Unity;GNOME;Pantheon;
 NoDisplay=true
 StartupNotify=false
 Terminal=false

data/org.ayatana.indicator.datetime

@@ -0,0 +1,20 @@
+[Indicator Service]
+Name=indicator-datetime
+ObjectPath=/org/ayatana/indicator/datetime
+Position=20
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/datetime/desktop
+
+[desktop_greeter]
+ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
+
+[desktop_lockscreen]
+ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
+
+[phone]
+ObjectPath=/org/ayatana/indicator/datetime/phone
+
+[phone_greeter]
+ObjectPath=/org/ayatana/indicator/datetime/phone_greeter
+

data/com.canonical.indicator.datetime.AlarmProperties.xml → data/org.ayatana.indicator.datetime.AlarmProperties.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="com.canonical.indicator.datetime.AlarmProperties">
+  <interface name="org.ayatana.indicator.datetime.AlarmProperties">
 
     <property name="DefaultSound" type="s" access="readwrite">
       <doc:doc>

data/com.canonical.indicator.datetime.gschema.xml.in → data/org.ayatana.indicator.datetime.gschema.xml.in

@@ -5,7 +5,7 @@
 		<value nick="24-hour" value="2" />
 		<value nick="custom" value="3" />
 	</enum>
-	<schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
+	<schema id="com.canonical.indicator.datetime" path="/org/ayatana/indicator/datetime/" gettext-domain="indicator-datetime">
 		<key name="show-clock" type="b">
 			<default>true</default>
 			<_summary>Show the clock in the panel</_summary>

debian/changelog

@@ -1,3 +1,9 @@
+ayatana-indicator-datetime (0.4.0-0) UNRELEASED; urgency=medium
+
+  * Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.
+
+ -- Mike Gabriel <[email protected]>  Sat, 07 Nov 2015 12:44:19 +0100
+
 indicator-datetime (15.10) wily; urgency=medium
 
   * Bump version to match the branch

debian/control

@@ -1,11 +1,10 @@
-Source: indicator-datetime
+Source: ayatana-indicator-datetime
 Section: misc
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[email protected]>
+Maintainer: Mike Gabriel <[email protected]>
 Build-Depends: cmake,
                dbus,
                debhelper (>= 9), 
-               dh-translations,
                libglib2.0-dev (>= 2.35.4),
                libnotify-dev (>= 0.7.6),
                libgstreamer1.0-dev,
@@ -21,31 +20,22 @@ Build-Depends: cmake,
                python3-dbusmock,
 # for 12h/24h locale unit tests:
                locales,
-               language-pack-touch-en | language-pack-en-base,
 # for running live EDS tests:
                evolution-data-server,
                gvfs-daemons,
-Standards-Version: 3.9.3
-Homepage: https://launchpad.net/indicator-datetime
-# If you aren't a member of ~indicator-applet-developers but need to upload
-# packaging changes, just go ahead.  ~indicator-applet-developers will notice
-# and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04/files
+Standards-Version: 3.9.6
+Homepage: https://github.com/ArcticaProject/ayatana-indicator-datetime
+Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git
+Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git/
 
-Package: indicator-datetime
+Package: ayatana-indicator-datetime
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
          systemd-services,
          systemd-shim,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
-            geoclue-ubuntu-geoip | geoclue-provider,
-            unity-control-center (>= 14.04.3) | ubuntu-system-settings,
-            ubuntu-touch-sounds,
-Suggests: click,
-Conflicts: indicator-datetime (<< 13.10.0)
-Replaces: indicator-datetime (<< 13.10.0)
+            geoclue-provider,
 Description: Simple clock
  A simple clock appearing in the indicator bar

debian/rules

@@ -3,7 +3,7 @@
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %:
-	dh $@ --with translations
+	dh $@
 
 override_dh_install:
 	dh_install --fail-missing

include/datetime/actions-live.h

@@ -22,7 +22,7 @@
 
 #include <datetime/actions.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -59,6 +59,6 @@ class LiveActions: public Actions
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ACTIONS_H

include/datetime/actions.h

@@ -28,7 +28,7 @@
 
 #include <gio/gio.h> // GSimpleActionGroup
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -76,6 +76,6 @@ class Actions
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ACTIONS_H

include/datetime/alarm-queue-simple.h

@@ -27,7 +27,7 @@
 #include <datetime/planner.h>
 #include <datetime/wakeup-timer.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -52,6 +52,6 @@ class SimpleAlarmQueue: public AlarmQueue
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ALARM_QUEUE_H

include/datetime/alarm-queue.h

@@ -28,7 +28,7 @@
 #include <set>
 #include <string>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -54,6 +54,6 @@ class AlarmQueue
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ALARM_QUEUE_H

include/datetime/appointment.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -67,6 +67,6 @@ struct Appointment
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_APPOINTMENT_H

include/datetime/clock-mock.h

@@ -22,7 +22,7 @@
 
 #include <datetime/clock.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -64,6 +64,6 @@ class MockClock: public Clock
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_CLOCK_MOCK_H

include/datetime/clock.h

@@ -27,7 +27,7 @@
 
 #include <memory> // std::shared_ptr, std::unique_ptr
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -89,6 +89,6 @@ class LiveClock: public Clock
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_CLOCK_H

include/datetime/date-time.h

@@ -26,7 +26,7 @@
 #include <ctime> // time_t
 #include <memory> // std::shared_ptr
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -86,6 +86,6 @@ class DateTime
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_DATETIME_H

include/datetime/engine-eds.h

@@ -29,7 +29,7 @@
 #include <functional>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -71,6 +71,6 @@ class EdsEngine: public Engine
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ENGINE_EDS_H

include/datetime/engine-mock.h

@@ -22,7 +22,7 @@
 
 #include <datetime/engine.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -66,6 +66,6 @@ class MockEngine: public Engine
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ENGINE_MOCK_H

include/datetime/engine.h

@@ -27,7 +27,7 @@
 #include <functional>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -64,6 +64,6 @@ class Engine
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_ENGINE_H

include/datetime/exporter.h

@@ -29,7 +29,7 @@
 #include <memory> // std::shared_ptr
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -58,6 +58,6 @@ class Exporter
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_EXPORTER_H

include/datetime/formatter.h

@@ -32,7 +32,7 @@
 #include <string>
 #include <memory>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -133,6 +133,6 @@ class PhoneFormatter: public Formatter
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
 #endif // INDICATOR_DATETIME_CLOCK_H