Merge lp:~seb128/unity-control-center/new-bluez-tweaks into lp:unity-control-center

Proposed by Sebastien Bacher on 2015-08-11
Status: Merged
Approved by: Sebastien Bacher on 2015-08-13
Approved revision: 12824
Merged at revision: 12821
Proposed branch: lp:~seb128/unity-control-center/new-bluez-tweaks
Merge into: lp:unity-control-center
Prerequisite: lp:~larsu/unity-control-center/bluez5-gnome-bluetooth
Diff against target: 39 lines (+7/-0)
3 files modified
debian/control (+1/-0)
debian/unity-control-center.install (+1/-0)
po/POTFILES.in (+5/-0)
To merge this branch: bzr merge lp:~seb128/unity-control-center/new-bluez-tweaks
Reviewer Review Type Date Requested Status
Robert Ancell 2015-08-12 Approve on 2015-08-13
Unity Control Center development team 2015-08-11 Pending
Review via email: mp+267671@code.launchpad.net

Commit message

Some tweaks for the new bluez changes
- include libgnome-bluetooth lib in the deb
- refresh translatable sources list
- updated build-depends

Description of the change

Some tweaks for the new bluez changes
- include libgnome-bluetooth lib in the deb
- refresh translatable sources list
- updated build-depends

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-03-12 19:18:11 +0000
3+++ debian/control 2015-08-11 14:44:04 +0000
4@@ -50,6 +50,7 @@
5 libxft-dev (>= 2.1.2),
6 libxkbfile-dev,
7 libxklavier-dev (>= 5.1),
8+ libxml2-utils,
9 libxml2-dev,
10 locales,
11 network-manager-dev (>= 0.9.6.4) [linux-any],
12
13=== modified file 'debian/unity-control-center.install'
14--- debian/unity-control-center.install 2014-02-24 17:28:38 +0000
15+++ debian/unity-control-center.install 2015-08-11 14:44:04 +0000
16@@ -1,6 +1,7 @@
17 etc/xdg/menus
18 usr/bin
19 usr/lib/*/unity-control-center-1/panels/*.so
20+usr/lib/*/libgnome-bluetooth.so.*
21 usr/share/applications
22 usr/share/bash-completion
23 usr/share/man
24
25=== modified file 'po/POTFILES.in'
26--- po/POTFILES.in 2014-09-15 21:09:13 +0000
27+++ po/POTFILES.in 2015-08-11 14:44:04 +0000
28@@ -9,6 +9,11 @@
29 panels/bluetooth/unity-bluetooth-panel.desktop.in.in
30 [type: gettext/glade]panels/bluetooth/bluetooth.ui
31 panels/bluetooth/cc-bluetooth-panel.c
32+panels/bluetooth/gnome-bluetooth/lib/bluetooth-chooser.c
33+panels/bluetooth/gnome-bluetooth/lib/bluetooth-filter-widget.c
34+panels/bluetooth/gnome-bluetooth/lib/bluetooth-utils.c
35+panels/bluetooth/gnome-bluetooth/wizard/main.c
36+[type: gettext/glade]panels/bluetooth/gnome-bluetooth/wizard/wizard.ui
37 panels/color/cc-color-panel.c
38 [type: gettext/glade]panels/color/color.ui
39 panels/color/unity-color-panel.desktop.in.in

Subscribers

People subscribed via source and target branches