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

[Jelmer Vernooij]

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.

[lp:~jelmer/bzr-builddeb/quilt-base]

671. By Jelmer Vernooij on 2011-12-20

Add base files for quilt handling.

[James Westby (james-w)]

review: Approve

=== 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 @@
+#    quilt.py -- Quilt patch handling
+#    Copyright (C) 2011 Canonical Ltd.
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+"""Quilt patch handling."""
+
+from __future__ import absolute_import

=== 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 @@
             'test_import_dsc',
             'test_merge_changelog',
             'test_merge_package',
+            'test_merge_quilt',
             'test_merge_upstream',
             'test_repack_tarball_extra',
             'test_revspec',

=== 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 @@
+#    Copyright (C) 2011 Canonical Ltd
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+"""Tests for the merge_quilt code."""