From ba4ba4c0aca3ead8658ff687abe5ee4fea341a62 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 23 Mar 2014 09:45:38 -0500 Subject: make geoclue recommended, rather than required. --- CMakeLists.txt | 1 - debian/control | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b468a5..378dc03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ include (FindPkgConfig) pkg_check_modules (SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-unix-2.0>=2.36 - geoclue>=0.12 libical>=0.48 libecal-1.2>=3.5 libedataserver-1.2>=3.5 diff --git a/debian/control b/debian/control index 84f76ca..3b71725 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Build-Depends: cmake, libnotify-dev (>= 0.7.6), libcanberra-dev, libido3-0.1-dev (>= 0.2.90), - libgeoclue-dev (>= 0.12.0), libecal1.2-dev (>= 3.5), libical-dev (>= 1.0), libgtk-3-dev (>= 3.1.4), @@ -42,11 +41,11 @@ Package: indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - geoclue-ubuntu-geoip | geoclue-provider, 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, Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) -- cgit v1.2.3 From d2a5d4519110c4d8627e5508d1ce3cc988c2b28c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 23 Mar 2014 10:20:12 -0500 Subject: in debian/control, remove unneeded GUI Build-Depends libcairo2-dev, libgtk-3-dev, libido3-0.1-dev, libxorg-gtest-dev --- debian/control | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/control b/debian/control index 3b71725..906d2fa 100644 --- a/debian/control +++ b/debian/control @@ -12,16 +12,12 @@ Build-Depends: cmake, intltool (>= 0.35.0), gnome-common, language-pack-en-base, - libxorg-gtest-dev, libgtest-dev, libglib2.0-dev (>= 2.35.4), libnotify-dev (>= 0.7.6), libcanberra-dev, - libido3-0.1-dev (>= 0.2.90), libecal1.2-dev (>= 3.5), libical-dev (>= 1.0), - libgtk-3-dev (>= 3.1.4), - libcairo2-dev (>= 1.10), libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 3.5), libgconf2-dev (>= 2.31), -- cgit v1.2.3 From 8894e0f1d4d6a010ae5c4c48939792cc9d377c17 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 23 Mar 2014 10:25:03 -0500 Subject: in debian/control, remove unneeded GNOME Build-Depends gnome-common, libgconf2-dev --- debian/control | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/control b/debian/control index 906d2fa..3b38fbb 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: cmake, debhelper (>= 9), dh-translations, intltool (>= 0.35.0), - gnome-common, language-pack-en-base, libgtest-dev, libglib2.0-dev (>= 2.35.4), @@ -20,7 +19,6 @@ Build-Depends: cmake, libical-dev (>= 1.0), libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 3.5), - libgconf2-dev (>= 2.31), liburl-dispatcher1-dev, libproperties-cpp-dev, libdbustest1-dev, -- cgit v1.2.3 From 380b845ee5e6435b9f426f16399b5c5da273be64 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 23 Mar 2014 10:25:54 -0500 Subject: in debian/control, remove unneeded Build-Depends libpolkit-gobject-1-dev --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 3b38fbb..b8b18e2 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,6 @@ Build-Depends: cmake, libcanberra-dev, libecal1.2-dev (>= 3.5), libical-dev (>= 1.0), - libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 3.5), liburl-dispatcher1-dev, libproperties-cpp-dev, -- cgit v1.2.3 From 95e497e326220d21828117e1a417b056c24ce3d5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 23 Mar 2014 15:11:06 -0500 Subject: in debian/rules, move unneeded intltool and .desktop file rules. --- debian/control | 1 - debian/rules | 9 --------- 2 files changed, 10 deletions(-) diff --git a/debian/control b/debian/control index b8b18e2..30b71e9 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: cmake, python3-dbusmock, debhelper (>= 9), dh-translations, - intltool (>= 0.35.0), language-pack-en-base, libgtest-dev, libglib2.0-dev (>= 2.35.4), diff --git a/debian/rules b/debian/rules index 0e7a91f..cedb6b4 100755 --- a/debian/rules +++ b/debian/rules @@ -5,12 +5,3 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: dh $@ --with translations -override_dh_install: - cd po; intltool-update --pot --verbose - dh_install --fail-missing - # Language packs - for d in $$(find debian/indicator-datetime -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ - sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ - echo "X-Ubuntu-Gettext-Domain=indicator-datetime" >> $$d; \ - done; - -- cgit v1.2.3 From 9b093e7c80946c9d11e7ac18b0a301697f93a248 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 24 Mar 2014 10:46:04 -0500 Subject: restore 'override_dh_install: dh_install --fail-missing' based on seb128's feedback (thanks seb) --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index cedb6b4..d2889aa 100755 --- a/debian/rules +++ b/debian/rules @@ -5,3 +5,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: dh $@ --with translations +override_dh_install: + dh_install --fail-missing + + -- cgit v1.2.3