Merge lp:~jelmer/bzr-builddeb/quilt-base into lp:bzr-builddeb

Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 671
Merged at revision: 671
Proposed branch: lp:~jelmer/bzr-builddeb/quilt-base
Merge into: lp:bzr-builddeb
Diff against target: 64 lines (+44/-0)
3 files modified
merge_quilt.py (+23/-0)
tests/__init__.py (+1/-0)
tests/test_merge_quilt.py (+20/-0)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/quilt-base
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+86411@code.launchpad.net

Description of the change

Add a file for quilt merge related code.

I'm going to propose a few different branches that all put things into these files, which will use this branch as prerequisite.

To post a comment you must log in.
lp:~jelmer/bzr-builddeb/quilt-base updated
671. By Jelmer Vernooij

Add base files for quilt handling.

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
=== added file 'merge_quilt.py'
--- merge_quilt.py 1970-01-01 00:00:00 +0000
+++ merge_quilt.py 2011-12-20 15:01:24 +0000
@@ -0,0 +1,23 @@
1# quilt.py -- Quilt patch handling
2# Copyright (C) 2011 Canonical Ltd.
3#
4# This file is part of bzr-builddeb.
5#
6# bzr-builddeb is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation; either version 2 of the License, or
9# (at your option) any later version.
10#
11# bzr-builddeb is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with bzr-builddeb; if not, write to the Free Software
18# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19#
20
21"""Quilt patch handling."""
22
23from __future__ import absolute_import
024
=== modified file 'tests/__init__.py'
--- tests/__init__.py 2011-10-24 16:34:02 +0000
+++ tests/__init__.py 2011-12-20 15:01:24 +0000
@@ -133,6 +133,7 @@
133 'test_import_dsc',133 'test_import_dsc',
134 'test_merge_changelog',134 'test_merge_changelog',
135 'test_merge_package',135 'test_merge_package',
136 'test_merge_quilt',
136 'test_merge_upstream',137 'test_merge_upstream',
137 'test_repack_tarball_extra',138 'test_repack_tarball_extra',
138 'test_revspec',139 'test_revspec',
139140
=== added file 'tests/test_merge_quilt.py'
--- tests/test_merge_quilt.py 1970-01-01 00:00:00 +0000
+++ tests/test_merge_quilt.py 2011-12-20 15:01:24 +0000
@@ -0,0 +1,20 @@
1# Copyright (C) 2011 Canonical Ltd
2#
3# This file is part of bzr-builddeb.
4#
5# bzr-builddeb is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2 of the License, or
8# (at your option) any later version.
9#
10# bzr-builddeb is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with bzr-builddeb; if not, write to the Free Software
17# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18#
19
20"""Tests for the merge_quilt code."""

Subscribers

People subscribed via source and target branches