Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 21 deletions

diff --git a/debian/control b/debian/control
index 02d320a..ffcb851 100644
--- a/debian/control
+++ b/debian/control
@@ -28,22 +28,22 @@ Build-Depends:
  libsqlite3-dev (>= 3.5.9),
  libwebkit2gtk-4.0-dev,
  libxml2 (>= 2.6.32),
- m4,
  valac (>= 0.22.0)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: https://wiki.gnome.org/Apps/Shotwell
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/
 
 Package: shotwell
 Architecture: linux-any
-Depends: 
+Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  shotwell-common (= ${source:Version}),
  dconf-cli,
  default-dbus-session-bus | dbus-session-bus,
  librsvg2-common
+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 +58,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
@@ -69,21 +70,3 @@ Description: digital photo organizer - common files
  to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2.
  .
  This package provides image files and documentation for Shotwell.
-
-Package: shotwell-dbg
-Priority: extra
-Section: debug
-Architecture: linux-any
-Depends: ${misc:Depends},
-         shotwell (= ${binary:Version})
-Description: digital photo organizer - debugging symbols
- Shotwell is a digital photo organizer designed for the GNOME desktop
- environment. It allows you to import photos, pictures, images and videos
- from disk or camera. Shotwell can organize them in collections and in other
- various ways. The viewer shows them in full-window or fullscreen mode and
- presents them as galleries or slideshows. The integrated editor can rotate,
- flip, crop and tag the photos, adjust the colors und remove red eyes. Export
- is possible to facebook, Flickr or Youtube to share with others. It is able
- to manage a lot of image formats such as JPEG, PNG, BMP, TIFF and Raw CR2.
- .
- This package contains the debugging symbols for Shotwell.