[caja] 07/12: debian/control: Fix conflict between caja and libcaja-extension1 1.8.x.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository caja.

commit 86dc08698885c230ebacdced57090f2e275f7aa7
Author: Martin Wimpress <code at flexion.org>
Date:   Wed May 4 15:23:54 2016 +0100

    debian/control: Fix conflict between caja and libcaja-extension1 1.8.x.
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 5775672..a53bf1c 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,8 @@ Suggests: engrampa,
           meld,
 Breaks: libcaja-extension (<< 1.10.0),
         mate-session-manager (<< 1.8.1-7),
+        libcaja-extension1 (<< 1.10.0),
+Replaces: libcaja-extension1 (<< 1.10.0)
 Description: file manager for the MATE desktop
  Caja is the official file manager for the MATE desktop. It allows one
  to browse directories, preview files and launch applications associated

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja.git