Snappy

Merge lp:~chipaca/snappy/manpage-ftbfs into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. manpage-ftbfs
  2. Merge into snappy-moved-to-github
Proposed by John Lenton on 2015-08-18
Status: Merged
Approved by: John Lenton on 2015-08-18
Approved revision: 633
Merged at revision: 632
Proposed branch: lp:~chipaca/snappy/manpage-ftbfs
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 56 lines (+10/-6)
3 files modified
debian/rules (+8/-4)
dependencies.tsv (+1/-1)
po/snappy.pot (+1/-1)
To merge this branch: bzr merge lp:~chipaca/snappy/manpage-ftbfs
Reviewer Review Type Date Requested Status
Oliver Grawert 2015-08-18 Approve on 2015-08-18
Review via email: mp+268330@code.launchpad.net

Commit Message

Fix manpage generation.

Description of the Change

Manpage generation not working properly in the schroot. This one works again.

To post a comment you must log in.
Oliver Grawert (ogra) wrote :

looks fine

review: Approve
Snappy Tarmac (snappydevtarmac) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2015-08-18 10:42:27 +0000
3+++ debian/rules 2015-08-18 13:45:09 +0000
4@@ -59,12 +59,13 @@
5 -pubuntu-snappy \
6 snappy-wait4network.service
7
8+# we need the builddir; is there a simpler way to get it?
9+BUILDDIR:=${CURDIR}/obj-$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
10+
11 override_dh_auto_build:
12 dh_auto_build
13 # this will update the i18n stuff using our build-in xgettext-go
14- # (for this it needs the builddir gopath, I wonder if there is
15- # simpler way to get the builddir?)
16- GOPATH=${CURDIR}/obj-$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) go generate ./i18n
17+ GOPATH=${BUILDDIR} go generate ./i18n
18
19 override_dh_auto_install: snappy.8
20 dh_auto_install -O--buildsystem=golang
21@@ -72,5 +73,8 @@
22 rm -rf ${CURDIR}/debian/ubuntu-snappy/usr/share/gocode
23
24 snappy.8:
25- ./debian/ubuntu-snappy/usr/bin/snappy man > $@
26+ ${BUILDDIR}/bin/snappy man > $@
27
28+override_dh_auto_clean:
29+ dh_auto_clean -O--buildsystem=golang
30+ rm -vf snappy.8
31
32=== modified file 'dependencies.tsv'
33--- dependencies.tsv 2015-07-22 08:16:51 +0000
34+++ dependencies.tsv 2015-08-18 13:45:09 +0000
35@@ -1,7 +1,7 @@
36 github.com/blakesmith/ar git c9a977dd0cc1392b023382c7bfa5a22af8d3b730 2013-02-19T04:59:55Z
37 github.com/cheggaaa/pb git e8c7cc515bfde3e267957a3b110080ceed51354e 2014-12-02T07:01:21Z
38 github.com/gosexy/gettext git 98b7b91596d20b96909e6b60d57411547dd9959c 2013-02-21T11:21:43Z
39-github.com/jessevdk/go-flags git 15347ef417a300349807983f15af9e65cd2e1b3a 2015-01-25T08:53:51Z
40+github.com/jessevdk/go-flags git 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4 2015-08-16T10:05:21Z
41 github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
42 github.com/mvo5/uboot-go git 361f6ebcbb54f389d15dc9faefa000e996ba3e37 2015-07-22T06:53:46Z
43 golang.org/x/crypto git 60052bd85f2d91293457e8811b0cf26b773de469 2015-06-22T23:34:07Z
44
45=== modified file 'po/snappy.pot'
46--- po/snappy.pot 2015-08-14 12:36:46 +0000
47+++ po/snappy.pot 2015-08-18 13:45:09 +0000
48@@ -7,7 +7,7 @@
49 msgid ""
50 msgstr "Project-Id-Version: snappy\n"
51 "Report-Msgid-Bugs-To: snappy-devel@lists.ubuntu.com\n"
52- "POT-Creation-Date: 2015-08-14 13:36+0100\n"
53+ "POT-Creation-Date: 2015-08-18 13:59+0100\n"
54 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
55 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
56 "Language-Team: LANGUAGE <LL@li.org>\n"

Subscribers

People subscribed via source and target branches