Unity HUD

Merge lp:~khurshid-alam/hud/reupload-to-focal into lp:hud

  1. reupload-to-focal
  2. Merge into trunk.15.10
Proposed by Khurshid Alam
Status: Merged
Merged at revision: 419
Proposed branch: lp:~khurshid-alam/hud/reupload-to-focal
Merge into: lp:hud
Diff against target: 65 lines (+6/-6)
3 files modified
debian/control (+4/-3)
debian/hud-tools.install (+0/-2)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~khurshid-alam/hud/reupload-to-focal
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+380283@code.launchpad.net

Commit message

* Fix python dependency

* Disable gtk-doc for now. It can be enabled later.

Gtkdoc-mktmpl was removed from gtk-doc >= 1.26. Instead it now, itself, provides GtkDocConfig.cmake module but doesn't say much about the migration other than https://developer.gnome.org/gtk-doc-manual/stable/cmake.html.en. So disable it until it is fixed.

Fixes LP: #1866180

Description of the change

Note I disabled the gtk-doc here. The migration doc specified here https://developer.gnome.org/gtk-doc-manual/stable/cmake.html.en didn't work and require more time to investigate. So considering the time constraint I think it is acceptable to do it here. This doesn't hamper the functionality any way.

It will be fixed later.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

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 2017-06-19 09:20:50 +0000
3+++ debian/control 2020-03-05 12:29:08 +0000
4@@ -5,6 +5,7 @@
5 Build-Depends: cmake (>= 3.4),
6 cmake-extras (>= 0.10),
7 debhelper (>= 9),
8+ python3,
9 gnome-common,
10 gobject-introspection,
11 google-mock (>= 1.6.0+svn437),
12@@ -25,7 +26,7 @@
13 libqtdbustest1-dev (>= 0.2),
14 libqtdbusmock1-dev (>= 0.2),
15 pkg-config,
16- python-setuptools,
17+ python3-setuptools,
18 qtbase5-dev,
19 qtdbustest-runner,
20 systemd,
21@@ -72,8 +73,8 @@
22 ${shlibs:Depends},
23 hud (= ${binary:Version}),
24 sqlite3,
25- python-lxml,
26- python-polib,
27+ python3-lxml,
28+ python3-polib,
29 Conflicts: indicator-appmenu-tools (<< 13),
30 Description: Tools for debugging the Unity HUD.
31 Unity HUD is a heads-up-display interface for controlling the behavior of
32
33=== removed file 'debian/hud-doc.install'
34=== modified file 'debian/hud-tools.install'
35--- debian/hud-tools.install 2013-11-08 09:03:30 +0000
36+++ debian/hud-tools.install 2020-03-05 12:29:08 +0000
37@@ -1,5 +1,3 @@
38 usr/bin
39 usr/share/hud-gtk
40 usr/share/applications
41-usr/share/man
42-usr/lib/python*
43
44=== removed file 'debian/libhud-client2-doc.install'
45=== removed file 'debian/libhud-gtk1-doc.install'
46=== removed file 'debian/libhud2-doc.install'
47=== modified file 'debian/rules'
48--- debian/rules 2016-12-07 16:48:24 +0000
49+++ debian/rules 2020-03-05 12:29:08 +0000
50@@ -8,13 +8,14 @@
51 ENABLE_BAMF = OFF
52 else
53 ENABLE_BAMF = ON
54+ ENABLE_DOCUMENTATION = OFF
55 endif
56
57 %:
58 dh $@
59
60 override_dh_auto_configure:
61- dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF)
62+ dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF) -DENABLE_DOCUMENTATION=$(ENABLE_DOCUMENTATION)
63
64 override_dh_install:
65 dh_install --fail-missing

Subscribers

People subscribed via source and target branches