4 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 556747b..e44807b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ shotwell (0.26.2-1) UNRELEASED; urgency=medium
   * Use the upstream ChangeLog as changelog and add NEWS to docs.
   * Remove debian/shotwell.1 to use the upstream man page.
   * Don't install man page at shotwell-common.
+  * Some packaging improvements (Closes:# 856708):
+    - Move .desktop and appstream metadata from shotwell-common to shotwell.
+    - Thanks to Jeremy Bicha <jbicha@ubuntu.com>
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 22 Mar 2017 06:51:19 +0100
 
diff --git a/debian/control b/debian/control
index 84843fb..ed8e593 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Depends:
  dconf-cli,
  default-dbus-session-bus | dbus-session-bus,
  librsvg2-common
+Breaks: shotwell-common (<< 0.26.2-1)
+Replaces: shotwell-common (<< 0.26.2-1)
 Description: digital photo organizer
  Shotwell is a digital photo organizer designed for the GNOME desktop
  environment. It allows you to import photos, pictures, images and videos
@@ -58,6 +60,7 @@ Package: shotwell-common
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: shotwell
+Breaks: shotwell (<< 0.26.2-1)
 Description: digital photo organizer - common files
  Shotwell is a digital photo organizer designed for the GNOME desktop
  environment. It allows you to import photos, pictures, images and videos
diff --git a/debian/shotwell-common.install b/debian/shotwell-common.install
index cd7f004..191266c 100644
--- a/debian/shotwell-common.install
+++ b/debian/shotwell-common.install
@@ -1,5 +1,3 @@
-usr/share/appdata
-usr/share/applications
 usr/share/glib-2.0
 usr/share/help
 usr/share/icons
diff --git a/debian/shotwell.install b/debian/shotwell.install
index 527b78f..4afb4cf 100644
--- a/debian/shotwell.install
+++ b/debian/shotwell.install
@@ -1,2 +1,4 @@
 usr/bin
 usr/lib
+usr/share/appdata
+usr/share/applications