Merge lp:~codygarver/pantheon-photos/conflicts-replace-shotwell into lp:~elementary-os/pantheon-photos/deb-packaging

[Cody Garver]

Conflicts and replace shotwell

The rebrand has landed and it was as nonintrusive as possible. Because of its nonintrusiveness, we must conflict with regular shotwell.

[lp:~codygarver/pantheon-photos/conflicts-replace-shotwell]

4. By Cody Garver on 2014-05-22

Conflict with shotwell

[Sergey "Shnatsel" Davidoff <unprivileged account> (shnatsel-unprivileged)]

I'm pretty sure this requires "breaks" not "conflicts" as per Debian policy (or at least that's what lintian yells when I switch it to pedantic mode), but that might not play well with dpkg, e.g. it might not suggest removal of shotwell package. That needs testing though.

[Cody Garver (codygarver)]

Changing Conflicts to Breaks results in

codygarver@asus:/tmp/tmp.TgkWw4fMIY/p$ sudo dpkg -i ../pantheon-photos*.deb
[sudo] password for codygarver:
Selecting previously unselected package pantheon-photos.
dpkg: regarding .../pantheon-photos_0.17_amd64.deb containing pantheon-photos:
 pantheon-photos breaks shotwell
  shotwell (version 0.18.0-0ubuntu4) is present and installed.

dpkg: error processing archive ../pantheon-photos_0.17_amd64.deb (--install):
 installing pantheon-photos would break shotwell, and
 deconfiguration is not permitted (--auto-deconfigure might help)
Selecting previously unselected package pantheon-photos-common.
dpkg: regarding .../pantheon-photos-common_0.17_all.deb containing pantheon-photos-common:
 pantheon-photos-common breaks shotwell-common
  shotwell-common (version 0.18.0-0ubuntu4) is present and installed.

dpkg: error processing archive ../pantheon-photos-common_0.17_all.deb (--install):
 installing pantheon-photos-common would break shotwell-common, and
 deconfiguration is not permitted (--auto-deconfigure might help)
Errors were encountered while processing:
 ../pantheon-photos_0.17_amd64.deb
 ../pantheon-photos-common_0.17_all.deb

[lp:~codygarver/pantheon-photos/conflicts-replace-shotwell]

5. By Cody Garver on 2014-05-23

Cleanup

[Sergey "Shnatsel" Davidoff (shnatsel)]

Yeah, that's what I expected. Thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-02-24 07:11:46 +0000
+++ debian/control	2014-05-23 07:43:05 +0000
@@ -35,6 +35,8 @@
 
 Package: pantheon-photos
 Architecture: linux-any
+Conflicts: shotwell
+Replaces: shotwell
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          pantheon-photos-common (= ${source:Version}),
@@ -52,8 +54,8 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: pantheon-photos
-Breaks: shotwell (<< 0.14.1-1)
-Replaces: shotwell (<< 0.14.1-1)
+Conflicts: shotwell-common
+Replaces: shotwell-common
 Description: digital photo organizer - common files
  Photos is a digital photo organizer designed for elementary's Pantheon desktop
  environment. It allows you to import photos from disk or camera, organize