Merge lp:~smoser/curtin/xenial.lp1666986 into lp:~curtin-dev/curtin/xenial

Proposed by Scott Moser
Status: Merged
Merged at revision: 62
Proposed branch: lp:~smoser/curtin/xenial.lp1666986
Merge into: lp:~curtin-dev/curtin/xenial
Diff against target: 34 lines (+12/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~smoser/curtin/xenial.lp1666986
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Review via email: mp+318005@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-02-09 00:40:46 +0000
3+++ debian/changelog 2017-02-22 16:30:37 +0000
4@@ -1,3 +1,10 @@
5+curtin (0.1.0~bzr460-0ubuntu1~16.04.2) UNRELEASED; urgency=medium
6+
7+ * debian/rules: record debian package version in installed package.
8+ (LP: #1666986)
9+
10+ -- Scott Moser <smoser@ubuntu.com> Wed, 22 Feb 2017 11:19:00 -0500
11+
12 curtin (0.1.0~bzr460-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
13
14 * New upstream snapshot.
15
16=== modified file 'debian/rules'
17--- debian/rules 2013-09-20 16:59:25 +0000
18+++ debian/rules 2017-02-22 16:30:37 +0000
19@@ -3,6 +3,10 @@
20 PYVERS := $(shell pyversions -r)
21 PY3VERS := $(shell py3versions -r)
22
23+DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version)
24+UPSTREAM_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x%-*}")
25+PKG_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x\#\#*-}")
26+
27 %:
28 dh $@ --with=python2,python3
29
30@@ -13,3 +17,4 @@
31 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
32 done
33 chmod 755 $(CURDIR)/debian/tmp/usr/lib/curtin/helpers/*
34+ for f in $$(find $(CURDIR)/debian/tmp/usr/lib -type f -name version.py); do [ -f "$$f" ] || continue; sed -i 's,@@PACKAGED_VERSION@@,$(DEB_VERSION),' "$$f"; done

Subscribers

People subscribed via source and target branches

to all changes: