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
=== modified file 'debian/control'
--- debian/control 2017-06-19 09:20:50 +0000
+++ debian/control 2020-03-05 12:29:08 +0000
@@ -5,6 +5,7 @@
5Build-Depends: cmake (>= 3.4),5Build-Depends: cmake (>= 3.4),
6 cmake-extras (>= 0.10),6 cmake-extras (>= 0.10),
7 debhelper (>= 9),7 debhelper (>= 9),
8 python3,
8 gnome-common,9 gnome-common,
9 gobject-introspection,10 gobject-introspection,
10 google-mock (>= 1.6.0+svn437),11 google-mock (>= 1.6.0+svn437),
@@ -25,7 +26,7 @@
25 libqtdbustest1-dev (>= 0.2),26 libqtdbustest1-dev (>= 0.2),
26 libqtdbusmock1-dev (>= 0.2),27 libqtdbusmock1-dev (>= 0.2),
27 pkg-config,28 pkg-config,
28 python-setuptools,29 python3-setuptools,
29 qtbase5-dev,30 qtbase5-dev,
30 qtdbustest-runner,31 qtdbustest-runner,
31 systemd,32 systemd,
@@ -72,8 +73,8 @@
72 ${shlibs:Depends},73 ${shlibs:Depends},
73 hud (= ${binary:Version}),74 hud (= ${binary:Version}),
74 sqlite3,75 sqlite3,
75 python-lxml,76 python3-lxml,
76 python-polib,77 python3-polib,
77Conflicts: indicator-appmenu-tools (<< 13),78Conflicts: indicator-appmenu-tools (<< 13),
78Description: Tools for debugging the Unity HUD.79Description: Tools for debugging the Unity HUD.
79 Unity HUD is a heads-up-display interface for controlling the behavior of80 Unity HUD is a heads-up-display interface for controlling the behavior of
8081
=== removed file 'debian/hud-doc.install'
=== modified file 'debian/hud-tools.install'
--- debian/hud-tools.install 2013-11-08 09:03:30 +0000
+++ debian/hud-tools.install 2020-03-05 12:29:08 +0000
@@ -1,5 +1,3 @@
1usr/bin1usr/bin
2usr/share/hud-gtk2usr/share/hud-gtk
3usr/share/applications3usr/share/applications
4usr/share/man
5usr/lib/python*
64
=== removed file 'debian/libhud-client2-doc.install'
=== removed file 'debian/libhud-gtk1-doc.install'
=== removed file 'debian/libhud2-doc.install'
=== modified file 'debian/rules'
--- debian/rules 2016-12-07 16:48:24 +0000
+++ debian/rules 2020-03-05 12:29:08 +0000
@@ -8,13 +8,14 @@
8 ENABLE_BAMF = OFF8 ENABLE_BAMF = OFF
9else9else
10 ENABLE_BAMF = ON10 ENABLE_BAMF = ON
11 ENABLE_DOCUMENTATION = OFF
11endif12endif
1213
13%:14%:
14 dh $@15 dh $@
1516
16override_dh_auto_configure:17override_dh_auto_configure:
17 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF)18 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF) -DENABLE_DOCUMENTATION=$(ENABLE_DOCUMENTATION)
1819
19override_dh_install:20override_dh_install:
20 dh_install --fail-missing21 dh_install --fail-missing

Subscribers

People subscribed via source and target branches