aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2020-09-05 18:39:59 +0200
committerRobert Tari <robert@tari.in>2020-09-05 18:39:59 +0200
commit3588f56831b3cd15fbeb4a92be1138532c56c730 (patch)
tree7580eb8c7dd38eeefbd3e26718ae9ecb96e73705
parentd9923217fc684d382ec78a9c46b2ea9c4663ac9c (diff)
parenta4ca00564e841a42c836d07623a7c69750a4e68d (diff)
downloadayatana-indicator-datetime-3588f56831b3cd15fbeb4a92be1138532c56c730.tar.gz
ayatana-indicator-datetime-3588f56831b3cd15fbeb4a92be1138532c56c730.tar.bz2
ayatana-indicator-datetime-3588f56831b3cd15fbeb4a92be1138532c56c730.zip
Merge branch 'sunweaver-pr/break-ubuntu-indicator' into master
Attributes GH PR #18:https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/18
-rw-r--r--README.md5
-rw-r--r--debian/control2
2 files changed, 7 insertions, 0 deletions
diff --git a/README.md b/README.md
index 59ce0f4..32564b7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
# Ayatana Indicator DateTime
+## INSTALLATION
+
+When using the -datetime Ayatana Indicator, make sure that the -datetime
+Ubuntu Indicator (package name: indicator-datetime) is not installed.
+
## ACTIONS
* **desktop.open-settings-app**<br />
diff --git a/debian/control b/debian/control
index d2a27e5..d63c4d1 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,8 @@ Depends: ${shlibs:Depends},
Recommends: indicator-applet | mate-indicator-applet | xfce4-indicator-plugin | indicator-renderer,
evolution-data-server,
geoclue-provider,
+Breaks: indicator-datetime,
+Replaces: indicator-datetime,
Description: Ayatana Indicator providing clock and calendar
This Ayatana Indicator provides a combined calendar, clock, alarm and
event management tool.