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
=== modified file 'debian/changelog'
--- debian/changelog 2016-01-11 11:38:04 +0000
+++ debian/changelog 2016-01-11 17:14:57 +0000
@@ -1,11 +1,5 @@
1click-toolbelt (0.5.1) xenial; urgency=low1click-toolbelt (0.5.1) xenial; urgency=low
22
3 * fixed storeapi upload functions invalid calls to get_oauth_session without config3 * Initial release. (LP: #1531186)
44
5 -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 11 Jan 2016 08:37:00 -03005 -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 11 Jan 2016 08:37:00 -0300
6
7click-toolbelt (0.5.0) xenial; urgency=low
8
9 * Initial release.
10
11 -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 08 Jan 2016 12:27:00 -0300
126
=== modified file 'debian/control'
--- debian/control 2016-01-05 18:39:30 +0000
+++ debian/control 2016-01-11 17:14:57 +0000
@@ -1,23 +1,29 @@
1Source: click-toolbelt1Source: click-toolbelt
2Section: utils2Section: utils
3Priority: extra3Priority: extra
4Maintainer: Canonical Online Services <onlineservices@lists.launchpad.net>4Maintainer: Ricardo Kirkner <ricardo.kirkner@canonical.com>
5Build-Depends: debhelper (>= 9),5Build-Depends: debhelper (>= 9),
6 dh-python,6 dh-python,
7 help2man,
7 python3-all (>= 3.4),8 python3-all (>= 3.4),
9 python3-cliff,
8 python3-mock,10 python3-mock,
9 python3-responses11 python3-responses,
12 python3-setuptools,
13 python3-ssoclient,
14 python3-xdg
10Homepage: https://launchpad.net/click-toolbelt15Homepage: https://launchpad.net/click-toolbelt
11Standards-Version: 3.9.616Standards-Version: 3.9.6
1217
13Package: click-toolbelt18Package: click-toolbelt
14Architecture: all19Architecture: all
15Depends: python3-cliff,20Depends: python3-cliff,
21 python3-requests,
16 python3-requests-oauthlib,22 python3-requests-oauthlib,
17 python3-requests,23 python3-ssoclient,
18 python3-xdg,24 python3-xdg,
19 python3-ssoclient,
20 ${misc:Depends},25 ${misc:Depends},
21 ${python3:Depends}26 ${python3:Depends}
22Description: set of tools to work with click packages27Description: set of tools to work with click packages
23 Click Toolbelt is a set of tools to make it easier to work with click (and snap) packages.28 Click Toolbelt is a set of tools to make it easier to work with click (and
29 snap) packages.
2430
=== modified file 'debian/rules'
--- debian/rules 2016-01-05 18:39:43 +0000
+++ debian/rules 2016-01-11 17:14:57 +0000
@@ -1,7 +1,17 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-2# -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-
33
4export PYBUILD_NAME = click-toolbelt4export PYBUILD_NAME=click-toolbelt
5
6pkgversion=$(shell dpkg-parsechangelog --show-field version)
7
58
6%:9%:
7 dh $@ --with python3 --buildsystem=pybuild10 dh $@ --with python3 --buildsystem=pybuild
11
12override_dh_installman:
13 help2man -n click-toolbelt -s 1 -o debian/click-toolbelt.1 \
14 --version-string=$(pkgversion) \
15 --no-discard-stderr --no-info \
16 debian/click-toolbelt/usr/bin/click-toolbelt
17 dh_installman
818
=== modified file 'debian/source/options'
--- debian/source/options 2015-12-28 17:18:41 +0000
+++ debian/source/options 2016-01-11 17:14:57 +0000
@@ -1,2 +1,6 @@
1# Ignore standard files (like .bzr)1# Ignore standard files (like .bzr)
2tar-ignore2tar-ignore = "dist"
3tar-ignore = ".eggs"
4tar-ignore = ".tox"
5tar-ignore = ".bzr"
6tar-ignore = "**/__pycache__"

Subscribers

People subscribed via source and target branches