Skip to content

Commit 4afa2b5

Browse files
sunweaversunweaver
committed
Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.
1 parent cab972e commit 4afa2b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+194
-200
lines changed

‎.bzr-builddeb/default.conf

-2
This file was deleted.

‎data/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##
44

55
include (UseGSettings)
6-
set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml")
6+
set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
77
set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
88
set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
99

@@ -80,10 +80,10 @@ install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
8080
##
8181

8282
# where to install
83-
set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
83+
set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
8484
message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
8585

86-
set (UNITY_INDICATOR_NAME "com.canonical.indicator.datetime")
86+
set (UNITY_INDICATOR_NAME "org.ayatana.indicator.datetime")
8787
set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
8888

8989
install (FILES "${UNITY_INDICATOR_FILE}"

‎data/com.canonical.indicator.datetime

-20
This file was deleted.

‎data/indicator-datetime.desktop.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Type=Application
33
Name=Indicator Date & Time
44
Exec=@pkglibexecdir@/indicator-datetime-service
5-
OnlyShowIn=Unity;GNOME;Pantheon;
5+
OnlyShowIn=MATE;Unity;GNOME;Pantheon;
66
NoDisplay=true
77
StartupNotify=false
88
Terminal=false

‎data/org.ayatana.indicator.datetime

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[Indicator Service]
2+
Name=indicator-datetime
3+
ObjectPath=/org/ayatana/indicator/datetime
4+
Position=20
5+
6+
[desktop]
7+
ObjectPath=/org/ayatana/indicator/datetime/desktop
8+
9+
[desktop_greeter]
10+
ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
11+
12+
[desktop_lockscreen]
13+
ObjectPath=/org/ayatana/indicator/datetime/desktop_greeter
14+
15+
[phone]
16+
ObjectPath=/org/ayatana/indicator/datetime/phone
17+
18+
[phone_greeter]
19+
ObjectPath=/org/ayatana/indicator/datetime/phone_greeter
20+

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
33
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
4-
<interface name="com.canonical.indicator.datetime.AlarmProperties">
4+
<interface name="org.ayatana.indicator.datetime.AlarmProperties">
55

66
<property name="DefaultSound" type="s" access="readwrite">
77
<doc:doc>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<value nick="24-hour" value="2" />
66
<value nick="custom" value="3" />
77
</enum>
8-
<schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
8+
<schema id="com.canonical.indicator.datetime" path="/org/ayatana/indicator/datetime/" gettext-domain="indicator-datetime">
99
<key name="show-clock" type="b">
1010
<default>true</default>
1111
<_summary>Show the clock in the panel</_summary>

‎debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
ayatana-indicator-datetime (0.4.0-0) UNRELEASED; urgency=medium
2+
3+
* Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.
4+
5+
-- Mike Gabriel <[email protected]> Sat, 07 Nov 2015 12:44:19 +0100
6+
17
indicator-datetime (15.10) wily; urgency=medium
28

39
* Bump version to match the branch

‎debian/control

+8-18
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
Source: indicator-datetime
1+
Source: ayatana-indicator-datetime
22
Section: misc
33
Priority: optional
4-
Maintainer: Ubuntu Desktop Team <[email protected]>
4+
Maintainer: Mike Gabriel <[email protected]>
55
Build-Depends: cmake,
66
dbus,
77
debhelper (>= 9),
8-
dh-translations,
98
libglib2.0-dev (>= 2.35.4),
109
libnotify-dev (>= 0.7.6),
1110
libgstreamer1.0-dev,
@@ -21,31 +20,22 @@ Build-Depends: cmake,
2120
python3-dbusmock,
2221
# for 12h/24h locale unit tests:
2322
locales,
24-
language-pack-touch-en | language-pack-en-base,
2523
# for running live EDS tests:
2624
evolution-data-server,
2725
gvfs-daemons,
28-
Standards-Version: 3.9.3
29-
Homepage: https://launchpad.net/indicator-datetime
30-
# If you aren't a member of ~indicator-applet-developers but need to upload
31-
# packaging changes, just go ahead. ~indicator-applet-developers will notice
32-
# and sync up the code again.
33-
Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04
34-
Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04/files
26+
Standards-Version: 3.9.6
27+
Homepage: https://github.com/ArcticaProject/ayatana-indicator-datetime
28+
Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git
29+
Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-datetime.git/
3530

36-
Package: indicator-datetime
31+
Package: ayatana-indicator-datetime
3732
Architecture: any
3833
Depends: ${shlibs:Depends},
3934
${misc:Depends},
4035
systemd-services,
4136
systemd-shim,
4237
Recommends: indicator-applet | indicator-renderer,
4338
evolution-data-server,
44-
geoclue-ubuntu-geoip | geoclue-provider,
45-
unity-control-center (>= 14.04.3) | ubuntu-system-settings,
46-
ubuntu-touch-sounds,
47-
Suggests: click,
48-
Conflicts: indicator-datetime (<< 13.10.0)
49-
Replaces: indicator-datetime (<< 13.10.0)
39+
geoclue-provider,
5040
Description: Simple clock
5141
A simple clock appearing in the indicator bar

‎debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
44

55
%:
6-
dh $@ --with translations
6+
dh $@
77

88
override_dh_install:
99
dh_install --fail-missing

‎include/datetime/actions-live.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <datetime/actions.h>
2424

25-
namespace unity {
25+
namespace ayatana {
2626
namespace indicator {
2727
namespace datetime {
2828

@@ -59,6 +59,6 @@ class LiveActions: public Actions
5959

6060
} // namespace datetime
6161
} // namespace indicator
62-
} // namespace unity
62+
} // namespace ayatana
6363

6464
#endif // INDICATOR_DATETIME_ACTIONS_H

‎include/datetime/actions.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <gio/gio.h> // GSimpleActionGroup
3030

31-
namespace unity {
31+
namespace ayatana {
3232
namespace indicator {
3333
namespace datetime {
3434

@@ -76,6 +76,6 @@ class Actions
7676

7777
} // namespace datetime
7878
} // namespace indicator
79-
} // namespace unity
79+
} // namespace ayatana
8080

8181
#endif // INDICATOR_DATETIME_ACTIONS_H

‎include/datetime/alarm-queue-simple.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <datetime/planner.h>
2828
#include <datetime/wakeup-timer.h>
2929

30-
namespace unity {
30+
namespace ayatana {
3131
namespace indicator {
3232
namespace datetime {
3333

@@ -52,6 +52,6 @@ class SimpleAlarmQueue: public AlarmQueue
5252

5353
} // namespace datetime
5454
} // namespace indicator
55-
} // namespace unity
55+
} // namespace ayatana
5656

5757
#endif // INDICATOR_DATETIME_ALARM_QUEUE_H

‎include/datetime/alarm-queue.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <set>
2929
#include <string>
3030

31-
namespace unity {
31+
namespace ayatana {
3232
namespace indicator {
3333
namespace datetime {
3434

@@ -54,6 +54,6 @@ class AlarmQueue
5454

5555
} // namespace datetime
5656
} // namespace indicator
57-
} // namespace unity
57+
} // namespace ayatana
5858

5959
#endif // INDICATOR_DATETIME_ALARM_QUEUE_H

‎include/datetime/appointment.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string>
2626
#include <vector>
2727

28-
namespace unity {
28+
namespace ayatana {
2929
namespace indicator {
3030
namespace datetime {
3131

@@ -67,6 +67,6 @@ struct Appointment
6767

6868
} // namespace datetime
6969
} // namespace indicator
70-
} // namespace unity
70+
} // namespace ayatana
7171

7272
#endif // INDICATOR_DATETIME_APPOINTMENT_H

‎include/datetime/clock-mock.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <datetime/clock.h>
2424

25-
namespace unity {
25+
namespace ayatana {
2626
namespace indicator {
2727
namespace datetime {
2828

@@ -64,6 +64,6 @@ class MockClock: public Clock
6464

6565
} // namespace datetime
6666
} // namespace indicator
67-
} // namespace unity
67+
} // namespace ayatana
6868

6969
#endif // INDICATOR_DATETIME_CLOCK_MOCK_H

‎include/datetime/clock.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include <memory> // std::shared_ptr, std::unique_ptr
2929

30-
namespace unity {
30+
namespace ayatana {
3131
namespace indicator {
3232
namespace datetime {
3333

@@ -89,6 +89,6 @@ class LiveClock: public Clock
8989

9090
} // namespace datetime
9191
} // namespace indicator
92-
} // namespace unity
92+
} // namespace ayatana
9393

9494
#endif // INDICATOR_DATETIME_CLOCK_H

‎include/datetime/date-time.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <ctime> // time_t
2727
#include <memory> // std::shared_ptr
2828

29-
namespace unity {
29+
namespace ayatana {
3030
namespace indicator {
3131
namespace datetime {
3232

@@ -86,6 +86,6 @@ class DateTime
8686

8787
} // namespace datetime
8888
} // namespace indicator
89-
} // namespace unity
89+
} // namespace ayatana
9090

9191
#endif // INDICATOR_DATETIME_DATETIME_H

‎include/datetime/engine-eds.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <functional>
3030
#include <vector>
3131

32-
namespace unity {
32+
namespace ayatana {
3333
namespace indicator {
3434
namespace datetime {
3535

@@ -71,6 +71,6 @@ class EdsEngine: public Engine
7171

7272
} // namespace datetime
7373
} // namespace indicator
74-
} // namespace unity
74+
} // namespace ayatana
7575

7676
#endif // INDICATOR_DATETIME_ENGINE_EDS_H

‎include/datetime/engine-mock.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <datetime/engine.h>
2424

25-
namespace unity {
25+
namespace ayatana {
2626
namespace indicator {
2727
namespace datetime {
2828

@@ -66,6 +66,6 @@ class MockEngine: public Engine
6666

6767
} // namespace datetime
6868
} // namespace indicator
69-
} // namespace unity
69+
} // namespace ayatana
7070

7171
#endif // INDICATOR_DATETIME_ENGINE_MOCK_H

‎include/datetime/engine.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <functional>
2828
#include <vector>
2929

30-
namespace unity {
30+
namespace ayatana {
3131
namespace indicator {
3232
namespace datetime {
3333

@@ -64,6 +64,6 @@ class Engine
6464

6565
} // namespace datetime
6666
} // namespace indicator
67-
} // namespace unity
67+
} // namespace ayatana
6868

6969
#endif // INDICATOR_DATETIME_ENGINE_H

‎include/datetime/exporter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <memory> // std::shared_ptr
3030
#include <vector>
3131

32-
namespace unity {
32+
namespace ayatana {
3333
namespace indicator {
3434
namespace datetime {
3535

@@ -58,6 +58,6 @@ class Exporter
5858

5959
} // namespace datetime
6060
} // namespace indicator
61-
} // namespace unity
61+
} // namespace ayatana
6262

6363
#endif // INDICATOR_DATETIME_EXPORTER_H

‎include/datetime/formatter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <string>
3333
#include <memory>
3434

35-
namespace unity {
35+
namespace ayatana {
3636
namespace indicator {
3737
namespace datetime {
3838

@@ -133,6 +133,6 @@ class PhoneFormatter: public Formatter
133133

134134
} // namespace datetime
135135
} // namespace indicator
136-
} // namespace unity
136+
} // namespace ayatana
137137

138138
#endif // INDICATOR_DATETIME_CLOCK_H

0 commit comments

Comments
 (0)