[Pkg-bazaar-commits] ./bzr-svn/unstable r305: Merge 0.4.10-2.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 305
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Fri 2008-07-04 19:30:10 +0200
message:
  Merge 0.4.10-2.
modified:
  debian/changelog
  debian/control
    ------------------------------------------------------------
    revno: 304.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: debian
    timestamp: Thu 2008-06-19 18:16:00 +0200
    message:
      Add dependency on libsvn-dev for the next version.
    modified:
      debian/changelog
      debian/control
    ------------------------------------------------------------
    revno: 304.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4.10-fixed
    timestamp: Fri 2008-07-04 16:49:07 +0200
    message:
      Make imports absolute to avoid conflicts.
    modified:
      Makefile
      __init__.py
      branch.py
      commit.py
      convert.py
      fetch.py
      fileids.py
      format.py
      logwalker.py
      mapping.py
      mapping3/__init__.py
      mapping3/scheme.py
      parents.py
      remote.py
      repository.py
      revids.py
      svk.py
      tests/test_blackbox.py
      tests/test_branch.py
      tests/test_branchprops.py
      tests/test_checkout.py
      tests/test_commit.py
      tests/test_config.py
      tests/test_convert.py
      tests/test_errors.py
      tests/test_fetch.py
      tests/test_fileids.py
      tests/test_logwalker.py
      tests/test_mapping.py
      tests/test_push.py
      tests/test_radir.py
      tests/test_repos.py
      tests/test_revids.py
      tests/test_revspec.py
      tests/test_scheme.py
      tests/test_svk.py
      tests/test_transport.py
      tests/test_tree.py
      tests/test_upgrade.py
      tests/test_workingtree.py
      transport.py
      tree.py
      upgrade.py
      workingtree.py
    ------------------------------------------------------------
    revno: 304.2.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4.10-fixed
    timestamp: Fri 2008-07-04 16:57:36 +0200
    message:
      Fix compatibility with Subversion 1.5
    modified:
      debian/changelog
      transport.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-11 23:49:46 +0000
+++ b/debian/changelog	2008-07-04 17:30:10 +0000
@@ -1,3 +1,20 @@
+bzr-svn (0.4.11-1) unstable; urgency=low
+
+  * New upstream release.
+   + Make package arch-dependent since it now includes arch-dependent
+     extensions.
+   + Add dependency on libsvn-dev rather than python-subversion.
+  * Bump standards version to 3.8.0.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Thu, 19 Jun 2008 18:13:21 +0200
+
+bzr-svn (0.4.10-2) unstable; urgency=high
+
+  * Fix compatibility with Subversion 1.5.
+  * Get rid of relative imports since they conflict with some other plugins.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Fri, 04 Jul 2008 16:56:59 +0200
+
 bzr-svn (0.4.10-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- a/debian/control	2008-05-11 19:31:44 +0000
+++ b/debian/control	2008-06-19 16:16:00 +0000
@@ -5,15 +5,15 @@
 Homepage: http://bazaar-vcs.org/BzrSvn
 Uploaders: Jelmer Vernooij <jelmer at samba.org>, Reinhard Tartler <siretart at tauware.de>, Robert Collins <robertc at robertcollins.net>
 Build-Depends-Indep: python-subversion, bzr (>= 1.4~), python (>= 2.5) | python-pysqlite2
-Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2)
-Standards-Version: 3.7.3
+Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2), libsvn-dev
+Standards-Version: 3.8.0
 XS-Python-Version: >= 2.4
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
 DM-Upload-Allowed: yes
 
 Package: bzr-svn
-Architecture: all
-Depends: bzr (>= 1.4~), bzr (<< 1.6~), python-subversion (>= 1.4.1), ${python:Depends}, python (>= 2.5) | python-pysqlite2
+Architecture: any
+Depends: bzr (>= 1.4~), bzr (<< 1.6~),  python-subversion (>= 1.4.1), ${shlibs:Depends}, ${python:Depends}, python (>= 2.5) | python-pysqlite2
 Enhances: bzr, subversion
 Recommends: bzr-rebase (>= 0.2~)
 XB-Python-Version: ${python:Versions}