[Pkg-bazaar-commits] r264 ./bzr-svn/unstable: Merge 0.3.5.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 264
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Thu 2007-07-19 15:42:03 +0200
message:
  Merge 0.3.5.
modified:
  NEWS
  __init__.py
  convert.py
  debian/changelog
  debian/control
  setup.py
  tests/test_blackbox.py
    ------------------------------------------------------------
    revno: 220.1.235
    merged: jelmer at samba.org-20070615185425-t2urwi30eagritbl
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Fri 2007-06-15 20:54:25 +0200
    message:
      start working on 0.3.5
    ------------------------------------------------------------
    revno: 220.1.236
    merged: jelmer at samba.org-20070719133620-pvqq7vo65v2n58jw
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Thu 2007-07-19 15:36:20 +0200
    message:
      Fix exception constructor.
    ------------------------------------------------------------
    revno: 220.1.237
    merged: jelmer at samba.org-20070719133642-17ach5j1lpew8yzu
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Thu 2007-07-19 15:36:42 +0200
    message:
      Avoid deprecated functions.
    ------------------------------------------------------------
    revno: 220.1.238
    merged: jelmer at samba.org-20070719133749-aezaely9dtvqyvre
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Thu 2007-07-19 15:37:49 +0200
    message:
      Release 0.3.5.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-06-15 15:46:07 +0000
+++ b/NEWS	2007-07-19 13:42:03 +0000
@@ -1,3 +1,11 @@
+bzr-svn 0.3.5	2007-07-19
+ 
+  BUG FIXES
+
+  * Fix compatibility with bazaar 0.18.
+
+  * Fix broken constructor for NotDumpFile exception.
+
 bzr-svn 0.3.4	2007-06-15
 
   BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2007-06-15 15:46:07 +0000
+++ b/__init__.py	2007-07-19 13:42:03 +0000
@@ -24,8 +24,8 @@
 
 from bzrlib.trace import warning
 
-__version__ = '0.3.4'
-COMPATIBLE_BZR_VERSIONS = [(0, 15), (0, 16), (0, 17)]
+__version__ = '0.3.5'
+COMPATIBLE_BZR_VERSIONS = [(0, 15), (0, 16), (0, 17), (0, 18)]
 
 def check_bzrlib_version(desired):
     """Check that bzrlib is compatible.

=== modified file 'convert.py'
--- a/convert.py	2007-06-15 15:46:07 +0000
+++ b/convert.py	2007-07-19 13:42:03 +0000
@@ -49,7 +49,7 @@
     """A file specified was not a dump file."""
     _fmt = """%(dumpfile)s is not a dump file."""
     def __init__(self, dumpfile):
-        super(NotDumpFile, self).__init__()
+        BzrError.__init__(self)
         self.dumpfile = dumpfile
 
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-19 10:56:05 +0000
+++ b/debian/changelog	2007-07-19 13:42:03 +0000
@@ -1,9 +1,12 @@
-bzr-svn (0.3.4-2) unstable; urgency=low
+bzr-svn (0.3.5-1) unstable; urgency=low
 
+  * New upstream release. (Closes: #428758)
   * Let bzr-svn enhance bzr.
+
+  [Reinhard Tartler]
   * Let bzr-svn enhance subversion. (LP: #122073)
 
- -- Jelmer Vernooij <jelmer at samba.org>  Mon, 16 Jul 2007 12:06:37 +0200
+ -- Jelmer Vernooij <jelmer at samba.org>  Thu, 19 Jul 2007 15:41:02 +0200
 
 bzr-svn (0.3.4-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-07-18 17:31:05 +0000
+++ b/debian/control	2007-07-19 13:42:03 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jelmer at samba.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends-Indep: python-subversion, bzr (>= 0.15~rc1), python-pysqlite2
+Build-Depends-Indep: python-subversion, bzr (>= 0.18~rc1), python-pysqlite2
 Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python-dev, debhelper (>= 5.0.37.2)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
@@ -11,7 +11,7 @@
 
 Package: bzr-svn
 Architecture: all
-Depends: bzr (>= 0.15~rc1), bzr (<< 0.18~), python-subversion (>= 1.4.1), ${python:Depends}
+Depends: bzr (>= 0.18~rc1), bzr (<< 0.19~), python-subversion (>= 1.4.1), ${python:Depends}
 Enhances: bzr, subversion
 Recommends: python-pysqlite2
 XB-Python-Version: ${python:Versions}

=== modified file 'setup.py'
--- a/setup.py	2007-06-15 15:46:07 +0000
+++ b/setup.py	2007-07-19 13:42:03 +0000
@@ -5,7 +5,7 @@
 setup(name='bzr-svn',
       description='Support for Subversion branches in Bazaar',
       keywords='plugin bzr svn',
-      version='0.3.4',
+      version='0.3.5',
       url='http://bazaar-vcs.org/BzrForeignBranches/Subversion',
       download_url='http://bazaar-vcs.org/BzrSvn',
       license='GPL',

=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py	2007-06-15 15:46:07 +0000
+++ b/tests/test_blackbox.py	2007-07-19 13:42:03 +0000
@@ -21,8 +21,8 @@
 class TestBranch(ExternalBase,TestCaseWithSubversionRepository):
     def test_branch_empty(self):
         repos_url = self.make_client('d', 'de')
-        self.runbzr(['branch', repos_url, 'dc'])
+        self.run_bzr("branch %s dc" % repos_url)
         
     def test_log_empty(self):
         repos_url = self.make_client('d', 'de')
-        self.assertEquals('', self.runbzr(['log', repos_url])[1])
+        self.check_output('', "log %s" % repos_url)