Merge ~morphis/libhybris/+git/libhybris-ubuntu:gcc-47-for-vivid-only into ~libhybris-maintainers/libhybris/+git/libhybris:master

[Simon Fels]

debian: adjust our build depends depending which distro we build for

On vivid we still depend on gcc 4.7 and can't switch yet to a newer
toolchain as this causes silent ABI regressions we didn't ruled out
yet. On newer distro 4.7 was removed from the archive so we have to
used a newer toolchain.

This change auto generates debian/control from a template in debian/
control.in and adds the build-dep on gcc-4.7/g++-4.7 on demand.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

As now debian/control is auto-generated we should

1. Remove it from version control
2. Add to .gitignore

Also, one question, how difficult will it be to remove the dependency on gcc 4.7? Do we already know what needs to be done to fix that?

review: Needs Fixing

[Simon Fels (morphis)]

We can't remove debian/control as debuild/dpkg-buildpackage expect it to be present to start the packge build process. However as first step in the packaging procress we're overriding debian/control with the autogenerated one which then is used for all other parts.

Dropping the dependency on gcc 4.7 needs some in deep investigation. We already tried it once but discovered some mysterious problems with the GPS HAL. That is on hold for now.

[Łukasz Zemczak (sil2100)]

Looks good in overall. One thing I would personally recommend is that in override_dh_auto_clean at the end you should still probably call dh_auto_clean - you call dh_clean which is good, but it's best to call the method that we actually override (extend) here. And I would remove the two unneeded debug echo's in debian/control generation.

Anyway, it's as Simon said, a debian/control dummy is required here. It's a bit confusing for people but yeah, not really any other solid way here.

[Simon Fels (morphis)]

Fixed Lukasz review comments.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

[Łukasz Zemczak (sil2100)]

Looks goodish. +1

review: Approve

diff --git a/debian/control b/debian/control
index 50ae6e7..6f3ed3a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,7 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
 Source: libhybris
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -5,8 +9,6 @@ Build-Depends: debhelper (>= 9.0.0),
                autotools-dev,
                dh-autoreconf,
                android-headers (>= 4.4.2),
-               gcc-4.7,
-               g++-4.7,
                quilt,
                pkg-config,
                libgles2-mesa-dev,
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..e500840
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,175 @@
+Source: libhybris
+Priority: extra
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9.0.0),
+               autotools-dev,
+               dh-autoreconf,
+               android-headers (>= 4.4.2),
+               @EXTRA_BUILD_DEPENDS@
+               quilt,
+               pkg-config,
+               libgles2-mesa-dev,
+               libwayland-dev
+Standards-Version: 3.9.5
+Section: libs
+Vcs-Git: https://git.launchpad.net/~libhybris-maintainers/libhybris/+git/libhybris
+Vcs-Browser: https://git.launchpad.net/~libhybris-maintainers/libhybris/+git/libhybris/
+
+Package: libandroid-properties1
+Architecture: armhf i386 amd64
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Library to provide access to get, set and list Android properties
+ Contains a library that provides access to get, set and list Android
+ properties, which can be used by any Ubuntu app that needs to probe
+ for properties (gps, modem, device specifics).
+
+Package: libandroid-properties-dev
+Section: libdevel
+Architecture: armhf i386 amd64
+Depends: libandroid-properties1 (= ${binary:Version}),
+         ${misc:Depends}
+Description: Development headers files for libandroid-properties
+ Contains the development files for use in applications that wants to get,
+ set or list the Android properties.
+
+Package: libmedia1
+Architecture: armhf i386 amd64
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu24)
+Breaks: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu24)
+Description: Library to provide access to the Android Media HAL
+ Contains a library that provides access to the Android Media HAL,
+ which abstract the access to the Android libstagefright based
+ decoders.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libmedia-dev
+Section: libdevel
+Architecture: armhf i386 amd64
+Depends: libmedia1 (= ${binary:Version}),
+         android-headers (>= 4.4.2),
+         ${misc:Depends}
+Replaces: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu24)
+Breaks: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu24)
+Description: Development files for libmedia
+ Contains the development files for the Android Media HAL, which
+ abstract the access to the Android libstagefright based decoders.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhardware2
+Architecture: armhf i386 amd64
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Breaks: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Description: Library to provide access to the Android libhardware HAL
+ Contains a library that provides access to the Android libhardware HAL,
+ which can be used to access a wide range of other HALs, such as audio,
+ power, gralloc, etc.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhardware-dev
+Section: libdevel
+Architecture: armhf i386 amd64
+Depends: libhardware2 (= ${binary:Version}),
+         android-headers (>= 4.4.2),
+         ${misc:Depends}
+Replaces: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Breaks: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Description: Development files for libhardware
+ Contains the development files for the Android libhardware HAL, which can
+ be used to access a wide range of other HALs, such as audio, power,
+ gralloc, etc.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris-common1
+Architecture: armhf i386 amd64
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Breaks: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Description: Common library that contains the Android linker and custom hooks
+ Contains a common library that contains the Android linker, used to
+ dynamically load and use symbols from Android based libraries.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris-common-dev
+Section: libdevel
+Architecture: armhf i386 amd64
+Depends: libhybris-common1 (= ${binary:Version}),
+         ${misc:Depends}
+Replaces: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Breaks: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
+Description: Development files for libhybris-common
+ Contains the development files for the common library that contains the
+ Android linker, used to dynamically load and use symbols from Android
+ based libraries.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris
+Architecture: armhf i386 amd64
+Depends: libandroid-properties1 (= ${binary:Version}),
+         libhardware2,
+         libmedia1,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: Allows to run bionic-based HW adaptations in glibc systems - libs
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris-dev
+Section: libdevel
+Architecture: armhf i386 amd64
+Depends: libhybris (= ${binary:Version}),
+         android-headers (>= 4.4.2),
+         libandroid-properties-dev (= ${binary:Version}),
+         libhardware-dev (= ${binary:Version}),
+         libmedia-dev (= ${binary:Version}),
+         libhybris-common-dev (= ${binary:Version}),
+         ${misc:Depends},
+         libgles2-mesa-dev,
+Description: Development headers and libraries for libhybris
+ Contains the header files for use in developing applications that use
+ the libhybris library.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris-utils
+Section: utils
+Architecture: armhf i386 amd64
+Depends: libhybris (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: Utilities to help working with the Android HW abstraction layer
+ Contains utilities used to help working with Android HW abstraction layer.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libhybris-test
+Section: devel
+Architecture: armhf i386 amd64
+Depends: libhybris (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: Allows to run bionic-based HW adaptations in glibc systems - tests
+ Contains the test applications used to validate libhybris (needs Android
+ libraries or container).
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
diff --git a/debian/rules b/debian/rules
index c953854..9151a63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ PKG_driver_dev  := libhybris-dev
 PKG_driver_dbg  := libhybris-dbg
 PKG_version     := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 PKG_source      := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+PKG_distro      := $(shell dpkg-parsechangelog | sed -n 's/^Distribution: //p')
 UPS_version     := $(shell echo '$(PKG_version)' | sed 's/.*://; s/-[^-]*$$//')
 GIT_rev         := $(shell echo '$(UPS_version)' | sed 's/.*+//')
 
@@ -17,9 +18,13 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Compiler
+ifeq ($(PKG_distro),vivid)
+# For vivid we still depend on GCC 4.7 as this seems to be still
+# required to workaround ABI issues.
 export CC=gcc-4.7
 export CXX=g++-4.7
+EXTRA_BUILD_DEPENDS = gcc-4.7, g++-4.7,
+endif
 
 # Strong needs at least gcc 4.9
 export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
@@ -47,6 +52,19 @@ alt_ld_so_conf_file     := alt_ld.so.conf
 ld_so_conf_path         := $(ld_so_conf_dir)/$(ld_so_conf_file)
 alt_ld_so_conf_path     := $(ld_so_conf_dir)/$(alt_ld_so_conf_file)
 
+.PHONY: debian/control
+debian/control: debian/control.in
+	if [ "$(EXTRA_BUILD_DEPENDS)" = "" ] ; then \
+		sed -e '/@EXTRA_BUILD_DEPENDS@/,+0d' \
+			debian/control.in > debian/control ; \
+	else \
+		sed -e "s/@EXTRA_BUILD_DEPENDS@/$(EXTRA_BUILD_DEPENDS)/" \
+			debian/control.in > debian/control ; \
+	fi
+
+override_dh_auto_clean: debian/control
+	dh_auto_clean
+
 # --remote doesn't work with github so this needs to be run from a local checkout
 get-packaged-orig-source:
 	rm -rf $(PKG_source)-$(UPS_version)