Merge ~morphis/libhybris/+git/libhybris-ubuntu:f/libcamera-deb into ~libhybris-maintainers/libhybris/+git/libhybris:master

[Simon Fels]

Move libcamera into its own debian package so that we other packages can depend on it without pulling our core package which provides libEGL & co in.

Unmerged commits

adb14bb... by Simon Fels on 2017-03-01

debian: split libcamera out into its own debian pacakge

diff --git a/debian/control.in b/debian/control.in
index 5b4d9e6..dd3facd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -63,6 +63,34 @@ Description: Development files for libmedia
  Hybris is a solution that allows the use of bionic-based HW adaptations in
  glibc systems.
 
+Package: libcamera0
+Architecture: armhf arm64 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 Camera HAL
+ Contains a library that provides access to the Android Camera HAL,
+ which abstract the access to the Android camera implementation.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
+Package: libcamera-dev
+Section: libdevel
+Architecture: armhf arm64 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 libcamera
+ Contains the development files for the Android Camera HAL, which
+ abstract the access to the Android camera implementation.
+ .
+ Hybris is a solution that allows the use of bionic-based HW adaptations in
+ glibc systems.
+
 Package: libhardware2
 Architecture: armhf arm64 i386 amd64
 Depends: ${shlibs:Depends},
diff --git a/debian/libcamera-dev.install b/debian/libcamera-dev.install
 new file mode 100644
index 0000000..5e18920
--- /dev/null
+++ b/debian/libcamera-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libcamera.so
+usr/lib/*/pkgconfig/libcamera.pc
diff --git a/debian/libcamera0.install b/debian/libcamera0.install
 new file mode 100644
index 0000000..12da6ab
--- /dev/null
+++ b/debian/libcamera0.install
@@ -0,0 +1 @@
+usr/lib/*/libcamera.so.*
diff --git a/debian/libhybris-dev.install b/debian/libhybris-dev.install
index 2a0b4fb..9ff968d 100644
--- a/debian/libhybris-dev.install
+++ b/debian/libhybris-dev.install
@@ -11,7 +11,6 @@ usr/lib/*/libvibrator.so
 usr/lib/*/pkgconfig/hwcomposer-egl.pc
 usr/lib/*/pkgconfig/hybris-egl-platform.pc
 usr/lib/*/pkgconfig/libis.pc
-usr/lib/*/pkgconfig/libcamera.pc
 usr/lib/*/pkgconfig/libwifi.pc
 usr/lib/*/pkgconfig/libvibrator.pc
 usr/lib/*/pkgconfig/libnfc_nxp.pc
diff --git a/debian/libhybris.install.in b/debian/libhybris.install.in
index 60e1c17..9b17a96 100644
--- a/debian/libhybris.install.in
+++ b/debian/libhybris.install.in
@@ -4,7 +4,6 @@ usr/lib/*/libsync.so.*
 usr/lib/*/libui.so.*
 usr/lib/*/libsf.so.*
 usr/lib/*/libis.so.*
-usr/lib/*/libcamera.so.*
 usr/lib/*/libwifi.so.*
 usr/lib/*/libnfc_nxp.so.*
 usr/lib/*/libvibrator.so.*