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
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2010-11-17 14:59:40 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2merge = True
03
=== added file 'changelog'
--- changelog 1970-01-01 00:00:00 +0000
+++ changelog 2010-11-17 14:59:40 +0000
@@ -0,0 +1,52 @@
1pocket-lint (0.5.5-0ubuntu1) UNRELASED; urgency=low
2
3 * initial natty upload
4
5 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Nov 2010 15:46:54 +0100
6
7pocket-lint (0.5.1-0ppa1) UNRELEASED; urgency=low
8
9 * Bump standards version to 3.9.1.
10 * Remove leading space in description.
11 * Add Vcs-Bzr header.
12 * Change architecture to all. Fixes installation for all system-
13 provided Pythons.
14
15 -- Jelmer Vernooij <jelmer@debian.org> Mon, 02 Aug 2010 23:27:33 +0200
16
17pocket-lint (0.5.1-0ppa0) lucid; urgency=low
18
19 * New uptream release that fixes a local import.
20
21 -- Curtis C. Hovey <sinzui.is@verizon.net> Sun, 01 Aug 2010 17:48:03 -0400
22
23pocket-lint (0.5.0-0ppa0) lucid; urgency=low
24
25 * New uptream release that improves type checking and fixes reporting
26 issues
27
28 -- Curtis C. Hovey <sinzui.is@verizon.net> Thu, 29 Jul 2010 12:10:26 -0400
29
30pocket-lint (0.4.0-0ppa0) lucid; urgency=low
31
32 * Check for tabs, and non-ascii. Let python2.5 use the with statement.
33
34 -- Curtis Hovey <sinzui.is@verizon.net> Tue, 06 Jul 2010 13:01:30 -0400
35
36pocket-lint (0.3.0-0ppa0) lucid; urgency=low
37
38 * Fixed Zope zcml and pt mime-types.
39
40 -- Curtis Hovey <sinzui.is@verizon.net> Fri, 02 Jul 2010 15:17:00 -0400
41
42pocket-lint (0.2.0-0ppa0) lucid; urgency=low
43
44 * New javascript lintings
45
46 -- Curtis Hovey <sinzui.is@verizon.net> Tue, 30 Jun 2010 10:35:00 -0400
47
48pocket-lint (0.1.0-0ppa0) lucid; urgency=low
49
50 * First packaging of pocket-lint
51
52 -- Curtis Hovey <sinzui.is@verizon.net> Tue, 29 Jun 2010 13:34:00 -0400
053
=== added file 'control'
--- control 1970-01-01 00:00:00 +0000
+++ control 2010-11-17 14:59:40 +0000
@@ -0,0 +1,30 @@
1Source: pocket-lint
2Section: python
3Priority: optional
4Maintainer: Curtis Hovey <sinzui.is@verizon.net>
5Homepage: https://launchpad.net/pocket-lint
6Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all, python-support (>= 0.5.3)
7Vcs-Bzr: http://bazaar.launchpad.net/~sinzui/pocket-lint/packaging
8Standards-Version: 3.9.1
9
10Package: python-pocket-lint
11Architecture: all
12Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
13Description: a composite linter and style checker
14 Pocket-lint has several notable features:
15 .
16 * Provides a consistent report of issues raised by the subordinate
17 checkers.
18 * Alternate Reports can be written to change the report, or integrate
19 the report into another application.
20 * Supports checking of multiple source types:
21 * Python syntax and style
22 * Python doctest style
23 * XML/HTML style and entities
24 * CSS style
25 * JavaScript syntax and style
26 * Plain text
27 * Supports reporting:
28 * Python doctests
29 * CSS
30 * XML/HTML.
031
=== added file 'copyright'
--- copyright 1970-01-01 00:00:00 +0000
+++ copyright 2010-11-17 14:59:40 +0000
@@ -0,0 +1,30 @@
1This package was debianized by Curtis C. Hovey.
2 It was downloaded from https://launchpad.net/pocket-lint
3
4Copyright:
5 Upstream Author: Curtis C. Hovey
6
7License:
8 The MIT License:
9
10Permission is hereby granted, free of charge, to any person obtaining a copy
11of this software and associated documentation files (the "Software"), to deal
12in the Software without restriction, including without limitation the rights
13to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14copies of the Software, and to permit persons to whom the Software is
15furnished to do so, subject to the following conditions:
16
17The above copyright notice and this permission notice shall be included in
18all copies or substantial portions of the Software.
19
20THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
26THE SOFTWARE.
27
28The Debian packaging is:
29 Copyright 2010 Curtis C. Hovey
30 and is under the MIT licence.
031
=== added file 'pyversions'
--- pyversions 1970-01-01 00:00:00 +0000
+++ pyversions 2010-11-17 14:59:40 +0000
@@ -0,0 +1,1 @@
12.5-
02
=== added file 'rules'
--- rules 1970-01-01 00:00:00 +0000
+++ rules 2010-11-17 14:59:40 +0000
@@ -0,0 +1,6 @@
1#!/usr/bin/make -f
2
3DEB_PYTHON_SYSTEM=pysupport
4
5include /usr/share/cdbs/1/rules/debhelper.mk
6include /usr/share/cdbs/1/class/python-distutils.mk
07
=== added file 'watch'
--- watch 1970-01-01 00:00:00 +0000
+++ watch 2010-11-17 14:59:40 +0000
@@ -0,0 +1,2 @@
1version=3
2https://launchpad.net/pocket-lint/+download http://launchpad.net/pocket-lint/trunk/[0-9.]+/\+download/pocketlint-([0-9.]+)\.tar\.gz
0\ No newline at end of file3\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: