diff options
| -rw-r--r-- | debian/ayatana-indicator-datetime-common.install | 3 | ||||
| -rw-r--r-- | debian/ayatana-indicator-datetime.install | 3 | ||||
| -rw-r--r-- | debian/control | 62 | ||||
| -rw-r--r-- | debian/lomiri-indicator-datetime.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 68 |
5 files changed, 125 insertions, 13 deletions
diff --git a/debian/ayatana-indicator-datetime-common.install b/debian/ayatana-indicator-datetime-common.install new file mode 100644 index 0000000..4c7a9da --- /dev/null +++ b/debian/ayatana-indicator-datetime-common.install @@ -0,0 +1,3 @@ +usr/share/ayatana/indicators/ +usr/share/glib-2.0/schemas/ +usr/share/locale/ diff --git a/debian/ayatana-indicator-datetime.install b/debian/ayatana-indicator-datetime.install new file mode 100644 index 0000000..b694faa --- /dev/null +++ b/debian/ayatana-indicator-datetime.install @@ -0,0 +1,3 @@ +etc/xdg/autostart/ayatana-indicator-datetime.desktop +usr/libexec/ayatana-indicator-datetime/ayatana-indicator-datetime-service +usr/lib/systemd/user/ayatana-indicator-datetime.service diff --git a/debian/control b/debian/control index 3657a03..64d69f6 100644 --- a/debian/control +++ b/debian/control @@ -12,14 +12,21 @@ Build-Depends: cmake, libglib2.0-dev (>= 2.35.4), libnotify-dev (>= 0.7.6), libgstreamer1.0-dev, + libmessaging-menu-dev, + uuid-dev, +# for non-Lomiri ICS data storage backend libecal2.0-dev (>= 3.16), libical-dev (>= 1.0), libedataserver1.2-dev (>= 3.5), - lomiri-schemas | hello, +# for Lomiri ICS data storage backend + libkf5calendarcore-dev, + libmkcal-qt5-dev, +# more Lomiri features + extra-cmake-modules, + lomiri-schemas, + lomiri-sounds, libproperties-cpp-dev, - liblomiri-url-dispatcher-dev | hello, - libmessaging-menu-dev, - uuid-dev, + liblomiri-url-dispatcher-dev, # for the test harness: libgtest-dev <!nocheck>, libdbustest1-dev <!nocheck>, @@ -30,7 +37,9 @@ Build-Depends: cmake, # for running live EDS tests: evolution-data-server <!nocheck>, gvfs-daemons <!nocheck>, - systemd [linux-any], + systemd-dev [linux-any], +# for running live mkcal tests: + mkcal-bin <!nocheck>, # for phone alarm/calendar notification sound tests: lomiri-sounds | hello, # tests that require the org.ayatana.common GSchema @@ -45,6 +54,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ayatana-indicator-common, + ayatana-indicator-datetime-common (>= ${source:Version}), libglib2.0-bin, Recommends: indicator-applet | mate-indicator-applet | xfce4-indicator-plugin | indicator-renderer, evolution-data-server, @@ -55,5 +65,43 @@ Description: Ayatana Indicator providing clock and calendar This Ayatana Indicator provides a combined calendar, clock, alarm and event management tool. . - On Lomiri, this Indicator supports phone devices. On other systems, - the phone support has been disabled at build-time. + This variant of the datetime indicator is to be used for non-Lomiri + operating environments such as MATE, Xfce, etc. + . + This variant of the datetime indicator has been built for using + evolution-data-server as ICS data storage backend. + +Package: lomiri-indicator-datetime +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ayatana-indicator-common, + ayatana-indicator-datetime-common (>= ${source:Version}), + libglib2.0-bin, +Recommends: geoclue-provider, + mkcal-bin, +Suggests: lomiri, +Breaks: indicator-datetime, +Replaces: indicator-datetime, +Description: Lomiri Indicator providing clock and calendar + This Lomiri Indicator provides a combined calendar, clock, alarm and + event management tool. + . + This variant of the datetime indicator is targetted for being used on + Lomiri, this indicator supports phone devices. + . + This variant of the datetime indicator has been built for using + msyncd (mkcal) as ICS data storage backend. + +Package: ayatana-indicator-datetime-common +Architecture: any +Depends: ${misc:Depends}, +Breaks: ayatana-indicator-datetime (<< 25.4.0), +Replaces: ayatana-indicator-datetime (<< 25.4.0), +Description: Common files used by both Ayatana/Lomiri Indicator Datetime variants + Ayatana / Lomiri Indicator Datetime are two variants of the Ayatana + Datetime Indicator built for different use cases. They provide a + combined calendar, clock, alarm and event management tool for common + desktop environments and for the Lomiri operating environment. + . + This package contains files used by both variants. diff --git a/debian/lomiri-indicator-datetime.install b/debian/lomiri-indicator-datetime.install new file mode 100644 index 0000000..cc3bd95 --- /dev/null +++ b/debian/lomiri-indicator-datetime.install @@ -0,0 +1,2 @@ +usr/libexec/lomiri-indicator-datetime/lomiri-indicator-datetime-service +usr/lib/systemd/user/lomiri-indicator-datetime.service diff --git a/debian/rules b/debian/rules index 072094a..932a8d8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,70 @@ #!/usr/bin/make -f -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +DEB_CMAKE_EXTRA_FLAGS = \ + -DENABLE_COVERAGE=OFF \ + $(NULL) + +ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),) + DEB_CMAKE_EXTRA_FLAGS += -DENABLE_TESTS=ON +endif %: dh $@ -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_configure: - dh_auto_configure -- -DENABLE_TESTS=ON -endif + dh_auto_configure --builddirectory=lomiri-variant \ + --buildsystem=cmake \ + -- \ + $(DEB_CMAKE_EXTRA_FLAGS) \ + -DENABLE_LOMIRI_FEATURES=ON \ + .. + dh_auto_configure --builddirectory=ayatana-variant \ + --buildsystem=cmake \ + -- \ + $(DEB_CMAKE_EXTRA_FLAGS) \ + -DENABLE_LOMIRI_FEATURES=OFF \ + .. + +override_dh_auto_build: + dh_auto_build --builddirectory=lomiri-variant \ + --buildsystem=cmake \ + .. + dh_auto_build --builddirectory=ayatana-variant \ + --buildsystem=cmake \ + .. + +override_dh_auto_test: + dh_auto_test --no-parallel \ + --builddirectory=lomiri-variant \ + --buildsystem=cmake \ + .. + dh_auto_test --no-parallel \ + --builddirectory=ayatana-variant \ + --buildsystem=cmake \ + .. + +override_dh_auto_install: + dh_auto_install --builddirectory=lomiri-variant \ + --buildsystem=cmake \ + .. + dh_auto_install --builddirectory=ayatana-variant \ + --buildsystem=cmake \ + .. + +override_dh_auto_clean: + dh_auto_clean --builddirectory=lomiri-variant \ + --buildsystem=cmake \ + .. + dh_auto_clean --builddirectory=ayatana-variant \ + --buildsystem=cmake \ + .. -override_dh_install: - dh_install --fail-missing +override_dh_missing: + dh_missing --fail-missing |