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

Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
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 Approve
Unity Control Center development team 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.
Revision history for this message
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
=== modified file 'debian/control'
--- debian/control 2015-03-12 19:18:11 +0000
+++ debian/control 2015-08-11 14:44:04 +0000
@@ -50,6 +50,7 @@
50 libxft-dev (>= 2.1.2),50 libxft-dev (>= 2.1.2),
51 libxkbfile-dev,51 libxkbfile-dev,
52 libxklavier-dev (>= 5.1),52 libxklavier-dev (>= 5.1),
53 libxml2-utils,
53 libxml2-dev,54 libxml2-dev,
54 locales,55 locales,
55 network-manager-dev (>= 0.9.6.4) [linux-any],56 network-manager-dev (>= 0.9.6.4) [linux-any],
5657
=== modified file 'debian/unity-control-center.install'
--- debian/unity-control-center.install 2014-02-24 17:28:38 +0000
+++ debian/unity-control-center.install 2015-08-11 14:44:04 +0000
@@ -1,6 +1,7 @@
1etc/xdg/menus1etc/xdg/menus
2usr/bin2usr/bin
3usr/lib/*/unity-control-center-1/panels/*.so3usr/lib/*/unity-control-center-1/panels/*.so
4usr/lib/*/libgnome-bluetooth.so.*
4usr/share/applications5usr/share/applications
5usr/share/bash-completion6usr/share/bash-completion
6usr/share/man7usr/share/man
78
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2014-09-15 21:09:13 +0000
+++ po/POTFILES.in 2015-08-11 14:44:04 +0000
@@ -9,6 +9,11 @@
9panels/bluetooth/unity-bluetooth-panel.desktop.in.in9panels/bluetooth/unity-bluetooth-panel.desktop.in.in
10[type: gettext/glade]panels/bluetooth/bluetooth.ui10[type: gettext/glade]panels/bluetooth/bluetooth.ui
11panels/bluetooth/cc-bluetooth-panel.c11panels/bluetooth/cc-bluetooth-panel.c
12panels/bluetooth/gnome-bluetooth/lib/bluetooth-chooser.c
13panels/bluetooth/gnome-bluetooth/lib/bluetooth-filter-widget.c
14panels/bluetooth/gnome-bluetooth/lib/bluetooth-utils.c
15panels/bluetooth/gnome-bluetooth/wizard/main.c
16[type: gettext/glade]panels/bluetooth/gnome-bluetooth/wizard/wizard.ui
12panels/color/cc-color-panel.c17panels/color/cc-color-panel.c
13[type: gettext/glade]panels/color/color.ui18[type: gettext/glade]panels/color/color.ui
14panels/color/unity-color-panel.desktop.in.in19panels/color/unity-color-panel.desktop.in.in

Subscribers

People subscribed via source and target branches