Merge lp:~ricardokirkner/click-toolbelt/packaging-fixes into lp:click-toolbelt

Proposed by Ricardo Kirkner on 2016-01-11
Status: Merged
Approved by: Ricardo Kirkner on 2016-01-11
Approved revision: 58
Merged at revision: 57
Proposed branch: lp:~ricardokirkner/click-toolbelt/packaging-fixes
Merge into: lp:click-toolbelt
Diff against target: 90 lines (+28/-14)
4 files modified
debian/changelog (+1/-7)
debian/control (+11/-5)
debian/rules (+11/-1)
debian/source/options (+5/-1)
To merge this branch: bzr merge lp:~ricardokirkner/click-toolbelt/packaging-fixes
Reviewer Review Type Date Requested Status
Colin Watson 2016-01-11 Approve on 2016-01-11
Review via email: mp+282197@code.launchpad.net

Commit message

final modifications for proper packaging

- fixed changelog entry
- fixed dependencies
- exclude unnecessary files from tarball
- include man page

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve
58. By Ricardo Kirkner on 2016-01-11

do not needlessly export pkgversion

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 2016-01-11 11:38:04 +0000
3+++ debian/changelog 2016-01-11 17:14:57 +0000
4@@ -1,11 +1,5 @@
5 click-toolbelt (0.5.1) xenial; urgency=low
6
7- * fixed storeapi upload functions invalid calls to get_oauth_session without config
8+ * Initial release. (LP: #1531186)
9
10 -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 11 Jan 2016 08:37:00 -0300
11-
12-click-toolbelt (0.5.0) xenial; urgency=low
13-
14- * Initial release.
15-
16- -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 08 Jan 2016 12:27:00 -0300
17
18=== modified file 'debian/control'
19--- debian/control 2016-01-05 18:39:30 +0000
20+++ debian/control 2016-01-11 17:14:57 +0000
21@@ -1,23 +1,29 @@
22 Source: click-toolbelt
23 Section: utils
24 Priority: extra
25-Maintainer: Canonical Online Services <onlineservices@lists.launchpad.net>
26+Maintainer: Ricardo Kirkner <ricardo.kirkner@canonical.com>
27 Build-Depends: debhelper (>= 9),
28 dh-python,
29+ help2man,
30 python3-all (>= 3.4),
31+ python3-cliff,
32 python3-mock,
33- python3-responses
34+ python3-responses,
35+ python3-setuptools,
36+ python3-ssoclient,
37+ python3-xdg
38 Homepage: https://launchpad.net/click-toolbelt
39 Standards-Version: 3.9.6
40
41 Package: click-toolbelt
42 Architecture: all
43 Depends: python3-cliff,
44+ python3-requests,
45 python3-requests-oauthlib,
46- python3-requests,
47+ python3-ssoclient,
48 python3-xdg,
49- python3-ssoclient,
50 ${misc:Depends},
51 ${python3:Depends}
52 Description: set of tools to work with click packages
53- Click Toolbelt is a set of tools to make it easier to work with click (and snap) packages.
54+ Click Toolbelt is a set of tools to make it easier to work with click (and
55+ snap) packages.
56
57=== modified file 'debian/rules'
58--- debian/rules 2016-01-05 18:39:43 +0000
59+++ debian/rules 2016-01-11 17:14:57 +0000
60@@ -1,7 +1,17 @@
61 #!/usr/bin/make -f
62 # -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-
63
64-export PYBUILD_NAME = click-toolbelt
65+export PYBUILD_NAME=click-toolbelt
66+
67+pkgversion=$(shell dpkg-parsechangelog --show-field version)
68+
69
70 %:
71 dh $@ --with python3 --buildsystem=pybuild
72+
73+override_dh_installman:
74+ help2man -n click-toolbelt -s 1 -o debian/click-toolbelt.1 \
75+ --version-string=$(pkgversion) \
76+ --no-discard-stderr --no-info \
77+ debian/click-toolbelt/usr/bin/click-toolbelt
78+ dh_installman
79
80=== modified file 'debian/source/options'
81--- debian/source/options 2015-12-28 17:18:41 +0000
82+++ debian/source/options 2016-01-11 17:14:57 +0000
83@@ -1,2 +1,6 @@
84 # Ignore standard files (like .bzr)
85-tar-ignore
86+tar-ignore = "dist"
87+tar-ignore = ".eggs"
88+tar-ignore = ".tox"
89+tar-ignore = ".bzr"
90+tar-ignore = "**/__pycache__"

Subscribers

People subscribed via source and target branches