[Pkg-bazaar-commits] r202 ./bzr-builddeb/people/jdw/dev: Merge from trunk.
James Westby
jw+debian at jameswestby.net
Tue Oct 30 14:36:08 UTC 2007
------------------------------------------------------------
revno: 202
committer: James Westby <jw+debian at jameswestby.net>
branch nick: dev
timestamp: Sun 2007-09-30 10:53:38 +0100
message:
Merge from trunk.
added:
tests/blackbox/test_merge_upstream.py
version.py
modified:
__init__.py
debian/changelog
debian/control
specs/do-command
specs/hooks
tests/blackbox/__init__.py
tests/test_version.py
------------------------------------------------------------
revno: 178.1.1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Mon 2007-09-17 18:15:01 +0100
message:
Use None instead of [] to revert all files.
The latter is deprecated in 0.91. This requires a bump of the version of
bzr required.
modified:
debian/changelog
debian/control
import_dsc.py
merge_upstream.py
------------------------------------------------------------
revno: 178.1.2
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2007-09-21 18:38:14 +0100
message:
Change version_info to be in its own module to make it easily testable.
added:
version.py
modified:
__init__.py
tests/test_version.py
------------------------------------------------------------
revno: 178.1.3
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2007-09-21 18:42:09 +0100
message:
Merge some cool stuff like hooks, bd-do, blackbox tests.
added:
debian/NEWS
doc/user_manual/hooks.rst
hooks.py
specs/do-command
specs/hooks
tests/blackbox/
tests/blackbox/__init__.py
tests/blackbox/test_builddeb.py
tests/blackbox/test_do.py
tests/test_hooks.py
modified:
README
__init__.py
builder.py
config.py
debian/changelog
doc/user_manual/building.rst
doc/user_manual/configuration.rst
doc/user_manual/export_upstream.rst
doc/user_manual/index.rst
doc/user_manual/merge.rst
doc/user_manual/mode_selector.rst
errors.py
repack_tarball.py
specs/import-dsc
tests/__init__.py
tests/test_builder.py
tests/test_config.py
tests/test_import_dsc.py
tests/test_version.py
------------------------------------------------------------
revno: 178.1.4
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2007-09-21 18:43:17 +0100
message:
Update spec status.
modified:
specs/do-command
specs/hooks
------------------------------------------------------------
revno: 178.1.5
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2007-09-21 18:57:50 +0100
message:
Remove the -dev from the python build dependency.
We don't need the headers, just all versions, so python-all is fine.
However this introduces two lintian warnings. The first is that
one of python | python-dev | python-all-dev should be in build-depends.
The first could be added, but I didn't.
The second is that python-all is not needed in Build-Depends, just
Build-Depends-Indep, as no architecture specific packages are built. However
it is used to run the clean target, so we need it. This is a lintian false
positive.
modified:
debian/control
------------------------------------------------------------
revno: 178.1.6
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Fri 2007-09-21 19:00:58 +0100
message:
Update the version_info for release.
modified:
version.py
------------------------------------------------------------
revno: 178.1.7
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Sun 2007-09-30 10:41:17 +0100
message:
Fix merge-upstream options so that -v doesn't clash.
added:
tests/blackbox/test_merge_upstream.py
modified:
__init__.py
tests/blackbox/__init__.py
-------------- next part --------------
=== added file 'tests/blackbox/test_merge_upstream.py'
--- a/tests/blackbox/test_merge_upstream.py 1970-01-01 00:00:00 +0000
+++ b/tests/blackbox/test_merge_upstream.py 2007-09-30 09:41:17 +0000
@@ -0,0 +1,28 @@
+# test_merge_upstream.py -- Blackbox tests for merge-upstream.
+# Copyright (C) 2007 James Westby <jw+debian at jameswestby.net>
+#
+# 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
+#
+
+from tests import BuilddebTestCase
+
+
+class TestMergeUpstream(BuilddebTestCase):
+
+ def test_merge_upstream_available(self):
+ self.run_bzr('merge-upstream --help')
+
=== added file 'version.py'
--- a/version.py 1970-01-01 00:00:00 +0000
+++ b/version.py 2007-09-21 18:00:58 +0000
@@ -0,0 +1,29 @@
+# version.py -- Defines the version of builddeb.
+# Copyright (C) 2007 James Westby <jw+debian at jameswestby.net>
+#
+# 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
+#
+
+# same format as sys.version_info: "A tuple containing the five components of
+# the version number: major, minor, micro, releaselevel, and serial. All
+# values except releaselevel are integers; the release level is 'alpha',
+# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
+# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
+# releaselevel of 'dev' for unreleased under-development code.
+#
+# Please set this to 'final' before upload.
+version_info = (0, 91, 0, 'final', 0)
=== modified file '__init__.py'
--- a/__init__.py 2007-09-17 20:46:33 +0000
+++ b/__init__.py 2007-09-30 09:41:17 +0000
@@ -46,17 +46,7 @@
from hooks import run_hook
from properties import BuildProperties
from util import goto_branch, find_changelog, tarball_name
-
-
-# same format as sys.version_info: "A tuple containing the five components of
-# the version number: major, minor, micro, releaselevel, and serial. All
-# values except releaselevel are integers; the release level is 'alpha',
-# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
-# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
-# releaselevel of 'dev' for unreleased under-development code.
-#
-# Please set this to 'final' before upload.
-version_info = (0, 91, 0, 'dev', 0)
+from version import version_info
dont_purge_opt = Option('dont-purge',
@@ -328,7 +318,7 @@
package_opt = Option('package', help="The name of the source package.",
type=str)
version_opt = Option('version', help="The version number of the new "
- "upstream release. (Required).", type=str, short_name='v')
+ "upstream release. (Required).", type=str)
takes_options = [package_opt, version_opt]
def run(self, path, version=None, package=None):
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-09-17 20:46:33 +0000
+++ b/debian/changelog 2007-09-21 17:42:09 +0000
@@ -12,6 +12,8 @@
* Add version_info attribute so that bzrlib can find out the version of
the plugin. Please try and remember to update it when releasing (set
the word to 'final').
+ * Use None instead of [] to revert all files as the latter is deprecated
+ in bzr 0.91. Bump the required version accordingly.
* Build the working tree by default (so --working-tree now has no effect,
along with --ignore-changes).
* Add --revision option to allow building an old revision of the branch
@@ -25,9 +27,8 @@
in the build.
* Support $UPSTREAM_VERSION in the export-upstream-revision configuration
option. This allows builddeb to find the correct upstream revision based
- on tags with no user intervention. Thanks to Jelmer for the idea.
- -- James Westby <jw+debian at jameswestby.net> Mon, 17 Sep 2007 21:45:10 +0100
+ -- James Westby <jw+debian at jameswestby.net> Fri, 21 Sep 2007 18:41:34 +0100
bzr-builddeb (0.90) unstable; urgency=low
=== modified file 'debian/control'
--- a/debian/control 2007-08-13 21:12:10 +0000
+++ b/debian/control 2007-09-21 17:57:50 +0000
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
Uploaders: Reinhard Tartler <siretart at tauware.de>, James Westby <jw+debian at jameswestby.net>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 0.18~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 0.18), patchutils
+Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
+Build-Depends-Indep: bzr (>= 0.91~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 0.18), patchutils
XS-Python-Version: >= 2.4
Standards-Version: 3.7.2
Package: bzr-builddeb
Architecture: all
-Depends: bzr (>= 0.18~), python-debian (>= 0.1.4), ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 0.18), devscripts, patchutils
+Depends: bzr (>= 0.91~), python-debian (>= 0.1.4), ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 0.18), devscripts, patchutils
Provides: bzr-buildpackage
XB-Python-Version: ${python:Versions}
Description: bzr plugin for Debian package management
=== modified file 'specs/do-command'
--- a/specs/do-command 2007-09-15 22:11:56 +0000
+++ b/specs/do-command 2007-09-21 17:43:17 +0000
@@ -2,6 +2,7 @@
==========
Status: Partial Implementation
+Version: 0.91
Rationale
---------
=== modified file 'specs/hooks'
--- a/specs/hooks 2007-09-16 17:38:22 +0000
+++ b/specs/hooks 2007-09-21 17:43:17 +0000
@@ -1,7 +1,8 @@
Hooks
=====
-Status: Draft
+Status: Partial Implementation
+Version: 0.91
Rationale
---------
=== modified file 'tests/blackbox/__init__.py'
--- a/tests/blackbox/__init__.py 2007-09-30 09:48:08 +0000
+++ b/tests/blackbox/__init__.py 2007-09-30 09:53:38 +0000
@@ -26,6 +26,7 @@
'test_builddeb',
'test_do',
'test_import_dsc',
+ 'test_merge_upstream',
]
loader = TestUtil.TestLoader()
suite = loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i)
=== modified file 'tests/test_version.py'
--- a/tests/test_version.py 2007-09-17 19:57:48 +0000
+++ b/tests/test_version.py 2007-09-21 17:42:09 +0000
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-from bzrlib.plugins import builddeb
+import version
import bzrlib
from bzrlib.tests import TestCase, KnownFailure
@@ -27,6 +27,6 @@
def test_version_matches(self):
"""An abused test case to warn when the version doesn't match bzrlib."""
- if builddeb.version_info != bzrlib.version_info:
+ if version.version_info != bzrlib.version_info:
raise KnownFailure("builddeb version doesn't match bzrlib version")
More information about the Pkg-bazaar-commits
mailing list