[shotwell] Conflicts/Replaces shotwell-common: Bug #724080

[Jim Nelson <jnelson src gnome org>]

commit efc9fbfe1868d6a7cb86f7e8fdf04b7033d17b36
Author: Jim Nelson <jim yorba org>
Date:   Thu Nov 13 18:37:48 2014 -0800

    Conflicts/Replaces shotwell-common: Bug #724080
    
    Stop-gap to work around packaging conflict issue between Ubuntu's
    repos and our PPAs.

 debian/control |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/debian/control b/debian/control
index f6d18d5..5cbefa2 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,8 @@ Homepage: http://www.yorba.org/shotwell
 Package: shotwell
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, librsvg2-common, dbus-x11, dconf-tools
+Conflicts: shotwell-common
+Replaces: shotwell-common
 Description: Digital photo manager
  Shotwell is a digital photo manager designed for the GNOME desktop 
  environment. It allows you to import photos from disk or camera, organize 
@@ -38,5 +40,5 @@ Description: Digital photo manager
  export and share them with others by publishing them to popular web
  services.
  .
- Visit http://www.yorba.org/shotwell to read about the current state of 
+ Visit https://wiki.gnome.org/Apps/Shotwell to read about the current state of 
  Shotwell's development.