[shotwell] Packaging change to put shotwell-common fix on reg. PPA: Bug #724080

[Jim Nelson <jnelson src gnome org>]

commit 6817a778ce9239798775d6460d246571fd93ceef
Author: Jim Nelson <jim yorba org>
Date:   Thu Nov 13 19:37:34 2014 -0800

    Packaging change to put shotwell-common fix on reg. PPA: Bug #724080

 debian/changelog |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index 59e6119..68e5431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shotwell (0.20.2-1~trusty2) trusty; urgency=low
+
+  * Mark as Conflicts/Replaces Ubuntu's shotwell-common package (#724080)
+
+ -- Jim Nelson <jim yorba org>  Thu, 13 Nov 2014 19:12:06 -0800
+
+
 shotwell (0.20.2-1~trusty1) trusty; urgency=low
 
   * Set Desktop Slideshow dialog resource now included in distribution (#739095)