Merge ~ua-apps-devs/+git/gconf:fix-ftbfs into ~ua-apps-devs/+git/gconf:master

Proposed by Lucas Kanashiro
Status: Approved
Approved by: Bryce Harrington
Approved revision: c305ad472ac75d45c1faae77224a06a57195b372
Proposed branch: ~ua-apps-devs/+git/gconf:fix-ftbfs
Merge into: ~ua-apps-devs/+git/gconf:master
Diff against target: 46 lines (+15/-1)
3 files modified
debian/changelog (+13/-0)
debian/control.in (+1/-0)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Review via email: mp+377533@code.launchpad.net

Description of the change

Fix build failure:

- Disable doc generation
- B-d on dh-python

Here is the PPA with this package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/bionic-backports

DEP-8 test is also passing:

autopkgtest [18:50:24]: test build: [-----------------------
build: OK
run: OK
autopkgtest [18:50:25]: test build: -----------------------]
autopkgtest [18:50:25]: test build: - - - - - - - - - - results - - - - - - - - - -
build PASS
autopkgtest [18:50:25]: @@@@@@@@@@@@@@@@@@@@ summary
build PASS

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM +1

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

Go ahead and upload directly to the app-engine staging ppa

Revision history for this message
Bryce Harrington (bryce) wrote :

...and also update the shared google doc to mark the packaging task done.

Unmerged commits

c305ad4... by Lucas Kanashiro

Update changelog

cf2f829... by Lucas Kanashiro

debian/control.in: b-d on dh-python since dh_python3 is needed during the
build.

1461bb6... by Lucas Kanashiro

debian/rules: do not build documentation since it makes use of
gtkdoc-mktmpl executable from gtk-doc-tools and it was removed since
version 1.26 (bionic has version 1.27). If the doc genaration is needed
the gtkdocize executable can be executed in the root directory of the
project to update all the needed files (many files will be changed).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 054d5f2..bd5432d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
1gconf (3.2.6-4ubuntu1~18.04.1) bionic; urgency=medium
2
3 * Backport to bionic
4 * debian/rules: do not build documentation since it makes use of
5 gtkdoc-mktmpl executable from gtk-doc-tools and it was removed since
6 version 1.26 (bionic has version 1.27). If the doc genaration is needed
7 the gtkdocize executable can be executed in the root directory of the
8 project to update all the needed files (many files will be changed).
9 * debian/control.in: b-d on dh-python since dh_python3 is needed during the
10 build.
11
12 -- Lucas Kanashiro <lucas.kanashiro@canonical.com> Mon, 13 Jan 2020 18:38:17 -0300
13
1gconf (3.2.6-4ubuntu1) artful; urgency=low14gconf (3.2.6-4ubuntu1) artful; urgency=low
215
3 * Merge from Debian unstable (LP: #1696659). Remaining changes:16 * Merge from Debian unstable (LP: #1696659). Remaining changes:
diff --git a/debian/control.in b/debian/control.in
index 7b728fb..e304360 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,6 +7,7 @@ Uploaders: @GNOME_TEAM@
7Build-Depends: debhelper (>= 8.1.3),7Build-Depends: debhelper (>= 8.1.3),
8 cdbs (>= 0.4.93),8 cdbs (>= 0.4.93),
9 dh-autoreconf,9 dh-autoreconf,
10 dh-python,
10 gnome-pkg-tools (>= 0.14),11 gnome-pkg-tools (>= 0.14),
11 gtk-doc-tools (>= 1.0),12 gtk-doc-tools (>= 1.0),
12 libglib2.0-dev (>= 2.31.0),13 libglib2.0-dev (>= 2.31.0),
diff --git a/debian/rules b/debian/rules
index b4867fa..8f068b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ clean::
2121
22DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO22DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
2323
24DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \24DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc \
25 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \25 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
26 --libexecdir=\$${libdir}/gconf \26 --libexecdir=\$${libdir}/gconf \
27 --with-gtk=3.0 \27 --with-gtk=3.0 \

Subscribers

People subscribed via source and target branches

to all changes: