[Pkg-bazaar-commits] ./bzr-rebase/unstable r57: Add conflict with older versions of bzr-svn (<< 0.6.0) that also provide

[Jelmer Vernooij]

------------------------------------------------------------
revno: 57
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Wed 2009-05-20 18:06:51 +0200
message:
  Add conflict with older versions of bzr-svn (<< 0.6.0) that also provide 
  the foreign-mapping-upgrade command.
modified:
  debian/changelog
  debian/control
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-05-20 15:51:50 +0000
+++ b/debian/changelog	2009-05-20 16:06:51 +0000
@@ -1,3 +1,10 @@
+bzr-rebase (0.5.0-2) unstable; urgency=low
+
+  * Add conflict with older versions of bzr-svn (<< 0.6.0) that also provide 
+    the foreign-mapping-upgrade command.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 20 May 2009 18:06:39 +0200
+
 bzr-rebase (0.5.0-1) unstable; urgency=low
 
   * Move to section vcs.

=== modified file 'debian/control'
--- a/debian/control	2009-05-20 15:51:50 +0000
+++ b/debian/control	2009-05-20 16:06:51 +0000
@@ -13,6 +13,7 @@
 Package: bzr-rebase
 Architecture: all
 Depends: bzr (>= 1.14~), ${python:Depends}, ${misc:Depends}
+Conflicts: bzr-svn (<< 0.6.0)
 Enhances: bzr
 XB-Python-Version: ${python:Versions}
 Description: Rebase plugin for Bazaar