Merge lp:~xnox/unity/fix-packaging into lp:unity

[Dimitri John Ledkov]

* Add missing build-dep on doxygen
* Drop broken CFLAGS processing, obsolete, and now actively prevents distro-default flags to be used
* Support DEB_BUILD_OPTIONS=nocheck in the override_dh_auto_test target
* Use stock variables from /usr/share/dpkg/default.mk instead of generating custom ones
* Use dpkg-buildflags to enfoce distro-default flags

* Add missing build-dep on doxygen
* Drop broken CFLAGS processing, obsolete, and now actively prevents distro-default flags to be used
* Support DEB_BUILD_OPTIONS=nocheck in the override_dh_auto_test target
* Use stock variables from /usr/share/dpkg/default.mk instead of generating custom ones
* Use dpkg-buildflags to enfoce distro-default flags

[Stephen M. Webb (bregma)]

No changes without a bug number. LP: #1284047 might be a good candidate.

review: Needs Fixing

[Stephen M. Webb (bregma)]

Also, Unity uses debhelper compat level 9, where including /usr/share/dpkg/default.mk is deprecated. This change should use DEB_C[XX]FLAGS_STRIP and DEB_C[XX]FLAGS_APPEND instead (see dpkg-buildflags(1)).

[lp:~xnox/unity/fix-packaging]

3682. By Dimitri John Ledkov on 2014-02-24

bug references

[Dimitri John Ledkov (xnox)]

done.

review: Approve

[lp:~xnox/unity/fix-packaging]

3683. By Dimitri John Ledkov on 2014-02-24

Drop redundant DPKG_EXPORT_BUILDFLAGS

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3681
http://jenkins.qa.ubuntu.com/job/unity-ci/705/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/237/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/239/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/705/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3683
http://jenkins.qa.ubuntu.com/job/unity-ci/706/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/240/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/706/rebuild

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

 override_dh_auto_test:
 - make -C obj-$(DEB_HOST_GNU_TYPE) check-headless
 + dh_auto_test -- check-headless

Running dh_auto_test _always_ runs "make check" regardless of any additional make target specified. 'make check' will fail in a headless package build environment (which is why the check-headless target exists). The original line explicitly running the 'make' command is correct. If you want to support 'nocheck' you will have to use the old ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) trick.

Unmerged revisions

3683. By Dimitri John Ledkov on 2014-02-24

Drop redundant DPKG_EXPORT_BUILDFLAGS

3682. By Dimitri John Ledkov on 2014-02-24

bug references

3681. By Dimitri John Ledkov on 2014-02-24

* Add missing build-dep on doxygen
* Drop broken CFLAGS processing, obsolete, and now actively prevents distro-default flags to be used
* Support DEB_BUILD_OPTIONS=nocheck in the override_dh_auto_test target
* Use stock variables from /usr/share/dpkg/default.mk instead of generating custom ones
* Use dpkg-buildflags to enfoce distro-default flags

=== modified file 'debian/control'
--- debian/control	2014-02-20 07:08:01 +0000
+++ debian/control	2014-02-24 14:18:46 +0000
@@ -8,6 +8,7 @@
                dbus-test-runner,
                dh-migrations,
                dh-translations (>= 94),
+               doxygen,
                google-mock (>= 1.6.0+svn437),
                google-mock,
                gsettings-desktop-schemas-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2014-01-30 17:39:24 +0000
+++ debian/rules	2014-02-24 14:18:46 +0000
@@ -3,15 +3,9 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+include /usr/share/dpkg/default.mk
 gles2_architectures := armel armhf
 
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-
-export CFLAGS=$(shell echo $$CFLAGS | sed -e 's/\-Wall//') -Wno-error=deprecated-declarations
-export CXXFLAGS=$(shell echo $$CXXFLAGS | sed -e 's/\-Wall//') -Wno-error=deprecated-declarations
-
 # http://ccache.samba.org/manual.html#_precompiled_headers
 CCACHE_SLOPPINESS=time_macros
 
@@ -55,7 +49,7 @@
 	dh_shlibdeps -l$(LIBUNITY_PRIVATE) -O--parallel
 
 override_dh_auto_test:
-	make -C obj-$(DEB_HOST_GNU_TYPE) check-headless
+	dh_auto_test -- check-headless
 
 %:
 	dh $@ --with translations,quilt,python2,migrations --parallel