libhybris

Merge ~morphis/libhybris/+git/libhybris-ubuntu:review-fixes into ~libhybris-maintainers/libhybris/+git/libhybris:master

  1. Git
  2. lp:~morphis/libhybris/+git/libhybris-ubuntu
  3. review-fixes
  4. Merge into master
Proposed by Simon Fels on 2016-01-11
Status: Superseded
Proposed branch: ~morphis/libhybris/+git/libhybris-ubuntu:review-fixes
Merge into: ~libhybris-maintainers/libhybris/+git/libhybris:master
Diff against target: 49 lines (+0/-12)
3 files modified
debian/control (+0/-9)
debian/libhybris-dev.install (+0/-2)
debian/libhybris.install.in (+0/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve on 2016-01-11
Libhybris Maintainers 2016-01-11 Pending
Review via email: mp+282175@code.launchpad.net

This proposal has been superseded by a proposal from 2016-01-19.

Description of the Change

* 6bf99a7 debian: drop -dbg package as we generate them automatically
* 24f23a5 debian: drop files listed twice in .install files

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Unmerged commits

6bf99a7... by Simon Fels on 2016-01-11

debian: drop -dbg package as we generate them automatically

24f23a5... by Simon Fels on 2016-01-11

debian: drop files listed twice in .install files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index 31483da..5f07555 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -174,12 +174,3 @@ Description: Allows to run bionic-based HW adaptations in glibc systems - tests
6 .
7 Hybris is a solution that allows the use of bionic-based HW adaptations in
8 glibc systems.
9-
10-Package: libhybris-dbg
11-Section: devel
12-Architecture: armhf i386 amd64
13-Description: Allows to run bionic-based HW adaptations in glibc systems
14- Contains debug symbols.
15- .
16- Hybris is a solution that allows the use of bionic-based HW adaptations in
17- glibc systems.
18diff --git a/debian/libhybris-dev.install b/debian/libhybris-dev.install
19index 5f3cbf8..8ed8c1c 100644
20--- a/debian/libhybris-dev.install
21+++ b/debian/libhybris-dev.install
22@@ -3,7 +3,6 @@ usr/lib/*/libhybris-hwcomposerwindow.so
23 usr/lib/*/libsync.so
24 usr/lib/*/libui.so
25 usr/lib/*/libsf.so
26-usr/lib/*/libvibrator.so
27 usr/lib/*/libis.so
28 usr/lib/*/libcamera.so
29 usr/lib/*/libwifi.so
30@@ -15,7 +14,6 @@ usr/lib/*/pkgconfig/libcamera.pc
31 usr/lib/*/pkgconfig/libwifi.pc
32 usr/lib/*/pkgconfig/libvibrator.pc
33 usr/lib/*/pkgconfig/libsf.pc
34-usr/lib/*/pkgconfig/libvibrator.pc
35 usr/lib/*/pkgconfig/libsync.pc
36 usr/include/hybris/input
37 usr/include/hybris/camera
38diff --git a/debian/libhybris.install.in b/debian/libhybris.install.in
39index 8a6768d..96d83e8 100644
40--- a/debian/libhybris.install.in
41+++ b/debian/libhybris.install.in
42@@ -3,7 +3,6 @@ usr/lib/*/libhybris-hwcomposerwindow.so.*
43 usr/lib/*/libsync.so.*
44 usr/lib/*/libui.so.*
45 usr/lib/*/libsf.so.*
46-usr/lib/*/libvibrator.so.*
47 usr/lib/*/libis.so.*
48 usr/lib/*/libcamera.so.*
49 usr/lib/*/libwifi.so.*

Subscribers

People subscribed via source and target branches