Merge lp:~wesmason/conn-check/configs-debian-package into lp:~ubuntuone-hackers/conn-check/configs

Proposed by Wes Mason
Status: Merged
Approved by: Wes Mason
Approved revision: 30
Merged at revision: 20
Proposed branch: lp:~wesmason/conn-check/configs-debian-package
Merge into: lp:~ubuntuone-hackers/conn-check/configs
Diff against target: 184 lines (+102/-2)
11 files modified
.bzrignore (+3/-0)
MANIFEST.in (+4/-2)
Makefile (+18/-0)
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+15/-0)
debian/copyright (+27/-0)
debian/python-conn-check.install (+1/-0)
debian/rules (+26/-0)
debian/source/format (+1/-0)
debian/source/options (+1/-0)
To merge this branch: bzr merge lp:~wesmason/conn-check/configs-debian-package
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+244072@code.launchpad.net

Commit message

Add debian package info

Description of the change

Adds a simple debian package dir which lists it under python-conn-check-configs and just relies on python-yaml, no hybrid virtualenv solution necessary.

To post a comment you must log in.
28. By Wes Mason

Remove patches

29. By Wes Mason

Exclude Makefile from build

30. By Wes Mason

Ignore extra build files

Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-09-24 11:20:16 +0000
3+++ .bzrignore 2014-12-15 15:21:20 +0000
4@@ -3,3 +3,6 @@
5 dist
6 wheels
7 virtualenv
8+.pc
9+debian/python-conn-check*
10+debian/files
11
12=== modified file 'MANIFEST.in'
13--- MANIFEST.in 2014-09-24 21:05:52 +0000
14+++ MANIFEST.in 2014-12-15 15:21:20 +0000
15@@ -1,3 +1,5 @@
16 include LICENSE
17-include **/*.rst
18-include **/*.txt
19+include CHANGELOG
20+include *.rst
21+include *.txt
22+recursive-include conn_check_configs *.txt
23
24=== modified file 'Makefile'
25--- Makefile 2014-09-24 21:07:14 +0000
26+++ Makefile 2014-12-15 15:21:20 +0000
27@@ -1,5 +1,7 @@
28 ENV=virtualenv
29 WHEELSDIR=./wheels
30+CONN_CHECK_CONFIGS_VERSION=$(shell cat conn_check_configs/version.txt)
31+CONN_CHECK_PPA=ppa:wesmason/conn-check
32
33 $(ENV):
34 virtualenv $(ENV)
35@@ -21,6 +23,9 @@
36 install-debs:
37 sudo xargs --arg-file deb-dependencies.txt apt-get install -y
38
39+install-deb-pkg-debs: install-debs
40+ sudo apt-get install -y build-essential packaging-dev dh-make
41+
42 pip-wheel: $(ENV)
43 @$(ENV)/bin/pip install wheel
44
45@@ -35,6 +40,19 @@
46 @echo
47 @echo "Don't forget: bzr tag" `cat conn_check_configs/version.txt` '&& bzr push'
48
49+build-deb: $(ENV)
50+ -rm ../python-conn-check_$(CONN_CHECK_CONFIGS_VERSION)-*
51+ -rm ../conn-check-configs_$(CONN_CHECK_CONFIGS_VERSION)-*
52+ $(ENV)/bin/python setup.py sdist
53+ cp dist/conn-check-configs-$(CONN_CHECK_CONFIGS_VERSION).tar.gz ../conn-check-configs_$(CONN_CHECK_CONFIGS_VERSION).orig.tar.gz
54+ debuild -S -sa
55+
56+test-build-deb: build-deb
57+ debuild
58+
59+update-ppa:
60+ cd .. && dput $(CONN_CHECK_PPA) conn-check-configs_$(CONN_CHECK_CONFIGS_VERSION)-*_source.changes
61+
62
63 .PHONY: test build pip-wheel build-wheels clean install-debs upload
64 .DEFAULT_GOAL := test
65
66=== added directory 'debian'
67=== added file 'debian/changelog'
68--- debian/changelog 1970-01-01 00:00:00 +0000
69+++ debian/changelog 2014-12-15 15:21:20 +0000
70@@ -0,0 +1,5 @@
71+conn-check-configs (1.0.6-1) trusty; urgency=low
72+
73+ * source package automatically created by stdeb 0.8.2
74+
75+ -- Wes Mason (1stvamp) <wes@1stvamp.org> Fri, 05 Dec 2014 20:39:19 +0000
76
77=== added file 'debian/compat'
78--- debian/compat 1970-01-01 00:00:00 +0000
79+++ debian/compat 2014-12-15 15:21:20 +0000
80@@ -0,0 +1,1 @@
81+7
82
83=== added file 'debian/control'
84--- debian/control 1970-01-01 00:00:00 +0000
85+++ debian/control 2014-12-15 15:21:20 +0000
86@@ -0,0 +1,15 @@
87+Source: conn-check-configs
88+Maintainer: Wes Mason <wesley.mason@canonical.com>
89+Section: python
90+Priority: optional
91+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7.4.3)
92+Standards-Version: 3.9.5
93+
94+
95+
96+Package: python-conn-check-configs
97+Architecture: all
98+Depends: ${misc:Depends}, ${python:Depends}, python-yaml
99+Description: Utilities for generating conn-check YAML configs from other
100+ This is a set of Python modules and utilities for generating conn-check
101+ config YAML from other sources, such as Django settings modules.
102
103=== added file 'debian/copyright'
104--- debian/copyright 1970-01-01 00:00:00 +0000
105+++ debian/copyright 2014-12-15 15:21:20 +0000
106@@ -0,0 +1,27 @@
107+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
108+Upstream-Name: conn-check-configs
109+Upstream-Contact: Wes Mason <wesley.mason@canonical.com>
110+Source: https://launchpad.net/conn-check
111+
112+Files: *
113+Copyright: 2014, Canonical Ltd.
114+License: GPL-3+
115+
116+License: GPL-3+
117+ Ansible is free software: you can redistribute it and/or modify
118+ it under the terms of the GNU General Public License as published by
119+ the Free Software Foundation, either version 3 of the License, or
120+ (at your option) any later version.
121+ .
122+ Ansible is distributed in the hope that it will be useful,
123+ but WITHOUT ANY WARRANTY; without even the implied warranty of
124+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
125+ GNU General Public License for more details.
126+ .
127+ You should have received a copy of the GNU General Public License
128+ along with Ansible. If not, see <http://www.gnu.org/licenses/>.
129+ .
130+ On Debian systems, the full text of the GNU General Public
131+ License version 3 can be found in the file
132+ `/usr/share/common-licenses/GPL-3'.
133+
134
135=== added file 'debian/python-conn-check.install'
136--- debian/python-conn-check.install 1970-01-01 00:00:00 +0000
137+++ debian/python-conn-check.install 2014-12-15 15:21:20 +0000
138@@ -0,0 +1,1 @@
139+debian/python-conn-check-configs/usr /
140
141=== added file 'debian/rules'
142--- debian/rules 1970-01-01 00:00:00 +0000
143+++ debian/rules 2014-12-15 15:21:20 +0000
144@@ -0,0 +1,26 @@
145+#!/usr/bin/make -f
146+
147+# This file was automatically generated by stdeb 0.8.2 at
148+# Fri, 05 Dec 2014 20:39:19 +0000
149+
150+%:
151+ dh $@ --with python2 --buildsystem=python_distutils
152+
153+
154+override_dh_auto_clean:
155+ python setup.py clean -a
156+ find . -name \*.pyc -exec rm {} \;
157+
158+
159+
160+override_dh_auto_build:
161+ python setup.py build --force
162+
163+
164+
165+override_dh_auto_install:
166+ python setup.py install --force --root=debian/python-conn-check-configs --no-compile -O0 --install-layout=deb --prefix=/usr
167+
168+
169+
170+
171
172=== added directory 'debian/source'
173=== added file 'debian/source/format'
174--- debian/source/format 1970-01-01 00:00:00 +0000
175+++ debian/source/format 2014-12-15 15:21:20 +0000
176@@ -0,0 +1,1 @@
177+3.0 (quilt)
178
179=== added file 'debian/source/options'
180--- debian/source/options 1970-01-01 00:00:00 +0000
181+++ debian/source/options 2014-12-15 15:21:20 +0000
182@@ -0,0 +1,1 @@
183+extend-diff-ignore="(\.egg-info|dist|virtualenv|Makefile)"
184\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: