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 (community) 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
=== modified file 'debian/changelog'
--- debian/changelog 2017-02-09 00:40:46 +0000
+++ debian/changelog 2017-02-22 16:30:37 +0000
@@ -1,3 +1,10 @@
1curtin (0.1.0~bzr460-0ubuntu1~16.04.2) UNRELEASED; urgency=medium
2
3 * debian/rules: record debian package version in installed package.
4 (LP: #1666986)
5
6 -- Scott Moser <smoser@ubuntu.com> Wed, 22 Feb 2017 11:19:00 -0500
7
1curtin (0.1.0~bzr460-0ubuntu1~16.04.1) xenial-proposed; urgency=medium8curtin (0.1.0~bzr460-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
29
3 * New upstream snapshot.10 * New upstream snapshot.
411
=== modified file 'debian/rules'
--- debian/rules 2013-09-20 16:59:25 +0000
+++ debian/rules 2017-02-22 16:30:37 +0000
@@ -3,6 +3,10 @@
3PYVERS := $(shell pyversions -r)3PYVERS := $(shell pyversions -r)
4PY3VERS := $(shell py3versions -r)4PY3VERS := $(shell py3versions -r)
55
6DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version)
7UPSTREAM_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x%-*}")
8PKG_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x\#\#*-}")
9
6%:10%:
7 dh $@ --with=python2,python311 dh $@ --with=python2,python3
812
@@ -13,3 +17,4 @@
13 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \17 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
14 done18 done
15 chmod 755 $(CURDIR)/debian/tmp/usr/lib/curtin/helpers/*19 chmod 755 $(CURDIR)/debian/tmp/usr/lib/curtin/helpers/*
20 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: