[caja] 01/01: Move AppStream metadata from caja-common to caja

[Jeremy Bicha]

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

jbicha pushed a commit to branch master
in repository caja.

commit 762dd2efa333e29ac522202aa1ecbd904aa9b4d1
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date:   Fri Mar 9 06:26:56 2018 -0500

    Move AppStream metadata from caja-common to caja
    
    https://wiki.debian.org/AppStream/Guidelines
    https://www.freedesktop.org/software/appstream/docs/sect-Quickstart-Distros.html
---
 debian/caja-common.install | 1 -
 debian/caja.install        | 1 +
 debian/control             | 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/caja-common.install b/debian/caja-common.install
index 89883d5..df0a9f6 100644
--- a/debian/caja-common.install
+++ b/debian/caja-common.install
@@ -1,4 +1,3 @@
-usr/share/metainfo/
 usr/share/caja/
 usr/share/dbus-1/
 usr/share/glib-2.0/
diff --git a/debian/caja.install b/debian/caja.install
index 4bf0451..45d1832 100644
--- a/debian/caja.install
+++ b/debian/caja.install
@@ -1,2 +1,3 @@
 usr/bin/
 usr/share/applications/
+usr/share/metainfo/
diff --git a/debian/control b/debian/control
index 3b6e360..cb8238f 100644
--- a/debian/control
+++ b/debian/control
@@ -50,9 +50,11 @@ Recommends: gvfs-backends,
 Suggests: engrampa,
           gstreamer1.0-tools,
           meld,
-Breaks: libcaja-extension (<< 1.10.0),
+Breaks: caja-common (<< 1.20.0-2~),
+        libcaja-extension (<< 1.10.0),
         libcaja-extension1 (<< 1.10.0),
         mate-session-manager (<< 1.8.1-7),
+Replaces: caja-common (<< 1.20.0-2~)
 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