Merge lp:~mvo/pocket-lint/packaging into lp:pocket-lint

Proposed by Michael Vogt
Status: Merged
Approved by: Curtis Hovey
Approved revision: 16
Merge reported by: Curtis Hovey
Merged at revision: not available
Proposed branch: lp:~mvo/pocket-lint/packaging
Merge into: lp:pocket-lint
Diff against target: 159 lines (+123/-0)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
changelog (+52/-0)
control (+30/-0)
copyright (+30/-0)
pyversions (+1/-0)
rules (+6/-0)
watch (+2/-0)
To merge this branch: bzr merge lp:~mvo/pocket-lint/packaging
Reviewer Review Type Date Requested Status
Curtis Hovey code Approve
Review via email: mp+41057@code.launchpad.net

Description of the change

Updates the packaging branch and adds a watch file to easy incorporating the upstream tarball. With that branch a simple "bzr-buildpackage" will generate a deb and "bzr-buildpackage -S" a source tarball suitable for upload.

To post a comment you must log in.
lp:~mvo/pocket-lint/packaging updated
16. By Michael Vogt

changelog: increment changelog version for the (not yet uploaded) upstream 0.5.5 tarball

Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for taking the time to do this. I am reminded that +downloads cannot be relied on for projects that release from the non-development branch. That is not a problem in this case, but I really must provide +watch that will guarantee that debwatch does not fail.

review: Approve (code)
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for reviewing this. Do you think the use of "+downloads" is a blocker to get this branch merged?

Revision history for this message
Curtis Hovey (sinzui) wrote :

+downloads is not a blocker. It just reminds me that I really need to fix Launchpad's support for debwatch.

Revision history for this message
Curtis Hovey (sinzui) wrote :

I merged this on the 17th. Oh, I see what is wrong, the merge target is really ~sinzui/pocket-lint/packaging/ This too is something I think Launchpad needs to address. It was only at UDS that I realised that many of use maintain a packaging branch. Lp should let me state flag the packaging series and present it as a default merge target.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Curtis! I should have checked that myself, I thought I proposed a merge into the packaging branch, not into trunk. Great that its merged :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2010-11-17 14:59:40 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+merge = True
8
9=== added file 'changelog'
10--- changelog 1970-01-01 00:00:00 +0000
11+++ changelog 2010-11-17 14:59:40 +0000
12@@ -0,0 +1,52 @@
13+pocket-lint (0.5.5-0ubuntu1) UNRELASED; urgency=low
14+
15+ * initial natty upload
16+
17+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Nov 2010 15:46:54 +0100
18+
19+pocket-lint (0.5.1-0ppa1) UNRELEASED; urgency=low
20+
21+ * Bump standards version to 3.9.1.
22+ * Remove leading space in description.
23+ * Add Vcs-Bzr header.
24+ * Change architecture to all. Fixes installation for all system-
25+ provided Pythons.
26+
27+ -- Jelmer Vernooij <jelmer@debian.org> Mon, 02 Aug 2010 23:27:33 +0200
28+
29+pocket-lint (0.5.1-0ppa0) lucid; urgency=low
30+
31+ * New uptream release that fixes a local import.
32+
33+ -- Curtis C. Hovey <sinzui.is@verizon.net> Sun, 01 Aug 2010 17:48:03 -0400
34+
35+pocket-lint (0.5.0-0ppa0) lucid; urgency=low
36+
37+ * New uptream release that improves type checking and fixes reporting
38+ issues
39+
40+ -- Curtis C. Hovey <sinzui.is@verizon.net> Thu, 29 Jul 2010 12:10:26 -0400
41+
42+pocket-lint (0.4.0-0ppa0) lucid; urgency=low
43+
44+ * Check for tabs, and non-ascii. Let python2.5 use the with statement.
45+
46+ -- Curtis Hovey <sinzui.is@verizon.net> Tue, 06 Jul 2010 13:01:30 -0400
47+
48+pocket-lint (0.3.0-0ppa0) lucid; urgency=low
49+
50+ * Fixed Zope zcml and pt mime-types.
51+
52+ -- Curtis Hovey <sinzui.is@verizon.net> Fri, 02 Jul 2010 15:17:00 -0400
53+
54+pocket-lint (0.2.0-0ppa0) lucid; urgency=low
55+
56+ * New javascript lintings
57+
58+ -- Curtis Hovey <sinzui.is@verizon.net> Tue, 30 Jun 2010 10:35:00 -0400
59+
60+pocket-lint (0.1.0-0ppa0) lucid; urgency=low
61+
62+ * First packaging of pocket-lint
63+
64+ -- Curtis Hovey <sinzui.is@verizon.net> Tue, 29 Jun 2010 13:34:00 -0400
65
66=== added file 'control'
67--- control 1970-01-01 00:00:00 +0000
68+++ control 2010-11-17 14:59:40 +0000
69@@ -0,0 +1,30 @@
70+Source: pocket-lint
71+Section: python
72+Priority: optional
73+Maintainer: Curtis Hovey <sinzui.is@verizon.net>
74+Homepage: https://launchpad.net/pocket-lint
75+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all, python-support (>= 0.5.3)
76+Vcs-Bzr: http://bazaar.launchpad.net/~sinzui/pocket-lint/packaging
77+Standards-Version: 3.9.1
78+
79+Package: python-pocket-lint
80+Architecture: all
81+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
82+Description: a composite linter and style checker
83+ Pocket-lint has several notable features:
84+ .
85+ * Provides a consistent report of issues raised by the subordinate
86+ checkers.
87+ * Alternate Reports can be written to change the report, or integrate
88+ the report into another application.
89+ * Supports checking of multiple source types:
90+ * Python syntax and style
91+ * Python doctest style
92+ * XML/HTML style and entities
93+ * CSS style
94+ * JavaScript syntax and style
95+ * Plain text
96+ * Supports reporting:
97+ * Python doctests
98+ * CSS
99+ * XML/HTML.
100
101=== added file 'copyright'
102--- copyright 1970-01-01 00:00:00 +0000
103+++ copyright 2010-11-17 14:59:40 +0000
104@@ -0,0 +1,30 @@
105+This package was debianized by Curtis C. Hovey.
106+ It was downloaded from https://launchpad.net/pocket-lint
107+
108+Copyright:
109+ Upstream Author: Curtis C. Hovey
110+
111+License:
112+ The MIT License:
113+
114+Permission is hereby granted, free of charge, to any person obtaining a copy
115+of this software and associated documentation files (the "Software"), to deal
116+in the Software without restriction, including without limitation the rights
117+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
118+copies of the Software, and to permit persons to whom the Software is
119+furnished to do so, subject to the following conditions:
120+
121+The above copyright notice and this permission notice shall be included in
122+all copies or substantial portions of the Software.
123+
124+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
125+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
126+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
127+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
128+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
129+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
130+THE SOFTWARE.
131+
132+The Debian packaging is:
133+ Copyright 2010 Curtis C. Hovey
134+ and is under the MIT licence.
135
136=== added file 'pyversions'
137--- pyversions 1970-01-01 00:00:00 +0000
138+++ pyversions 2010-11-17 14:59:40 +0000
139@@ -0,0 +1,1 @@
140+2.5-
141
142=== added file 'rules'
143--- rules 1970-01-01 00:00:00 +0000
144+++ rules 2010-11-17 14:59:40 +0000
145@@ -0,0 +1,6 @@
146+#!/usr/bin/make -f
147+
148+DEB_PYTHON_SYSTEM=pysupport
149+
150+include /usr/share/cdbs/1/rules/debhelper.mk
151+include /usr/share/cdbs/1/class/python-distutils.mk
152
153=== added file 'watch'
154--- watch 1970-01-01 00:00:00 +0000
155+++ watch 2010-11-17 14:59:40 +0000
156@@ -0,0 +1,2 @@
157+version=3
158+https://launchpad.net/pocket-lint/+download http://launchpad.net/pocket-lint/trunk/[0-9.]+/\+download/pocketlint-([0-9.]+)\.tar\.gz
159\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: