Merge lp:~charlesk/indicator-datetime/remove-unneeded-dependencies into lp:indicator-datetime/14.04

[Charles Kerr]

Remove unused dependencies from packaging.

Remove unused things from debian/control and debian/rules.

Removed:
 * libpolkit-gobject-1-dev
 * gnome-common
 * libgconf2-dev
 * libcairo2-dev
 * libgtk-3-dev
 * libido3-0.1-dev
 * libxorg-gtest-dev

Changed from Required to Recommended:
 * geoclue

In debian/rules, don't override_dh_install. This needs another pair of eyes to confirm, but but none of the other indicators use anything like the rule being removed. Removing this has two effects on the build-area: (1) The unused file "untitled.pot" is no longer generated, (2) indicator-datetime.desktop no longer has a duplicate X-Ubuntu-Gettext-Domain entry.

=====

Comparing two builddeb logs, this is the section that disappears by removing the override_dh_install code:

   debian/rules override_dh_install
make[1]: Entering directory `/home/phablet/src/indicator-datetime/build-area/indicator-datetime-13.10.0+14.04.20140321'
cd po; intltool-update --pot --verbose
Unsuccessful open on filename containing newline at /usr/bin/intltool-update line 1149.
Building untitled.pot...
Running xgettext --add-comments --directory=. --default-domain=untitled --flag=g_strdup_printf:1:c-format --flag=g_string_printf:2:c-format --flag=g_string_append_printf:2:c-format --flag=g_error_new:3:c-format --flag=g_set_error:4:c-format --flag=g_markup_printf_escaped:1:c-format --flag=g_log:3:c-format --flag=g_print:1:c-format --flag=g_printerr:1:c-format --flag=g_printf:1:c-format --flag=g_fprintf:2:c-format --flag=g_sprintf:2:c-format --flag=g_snprintf:3:c-format --flag=g_scanner_error:2:c-format --flag=g_scanner_warn:2:c-format --output=untitled.pot --files-from=./POTFILES.in.temp --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=T_ --from-code=UTF-8 --<email address hidden>" --from-code=UTF-8
Removing generated header (.h) files...done.
Wrote untitled.pot
dh_install --fail-missing
Can't stat debian/tmp: No such file or directory
 at /usr/bin/dh_install line 245.
# 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;

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/215/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/95/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/215/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-datetime/remove-unneeded-dependencies]

332. By Charles Kerr on 2014-03-23

in debian/rules, move unneeded intltool and .desktop file rules.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/96/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/216/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

> In debian/rules, don't override_dh_install. This needs another pair of eyes to confirm, but but none of the other indicators use anything like the rule being removed.

Thanks Charles, those changes look good! The intltool/gettext domain work is indeed not needed since the package use dh_translations (--with translations being listed in rules). You need to keep the override section with the "dh_install --fail-missing" line though. That lines makes the build stop if new files are installed by "make install" but not ending in any .deb, that allows us to not overlook installing new files when we get some

review: Needs Fixing

[lp:~charlesk/indicator-datetime/remove-unneeded-dependencies]

333. By Charles Kerr on 2014-03-24

restore 'override_dh_install: dh_install --fail-missing' based on seb128's feedback (thanks seb)

[Charles Kerr (charlesk)]

> You need to keep the override section with the "dh_install --fail-missing" line though

Thanks for pointing that out!

Fixed r333

[Sebastien Bacher (seb128)]

great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/217/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/97/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/217/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-19 15:35:51 +0000
+++ CMakeLists.txt	2014-03-24 15:47:32 +0000
@@ -34,7 +34,6 @@
 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

=== modified file 'debian/control'
--- debian/control	2014-02-19 15:35:51 +0000
+++ debian/control	2014-03-24 15:47:32 +0000
@@ -9,23 +9,14 @@
                python3-dbusmock,
                debhelper (>= 9), 
                dh-translations,
-               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),
-               libgeoclue-dev (>= 0.12.0),
                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),
                liburl-dispatcher1-dev,
                libproperties-cpp-dev,
                libdbustest1-dev,
@@ -42,11 +33,11 @@
 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)

=== modified file 'debian/rules'
--- debian/rules	2013-12-13 18:20:58 +0000
+++ debian/rules	2014-03-24 15:47:32 +0000
@@ -6,11 +6,6 @@
 	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;
+