From 0992d02c8a29f3017edb66e7c31b4ae27c56d684 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Mon, 14 Oct 2013 16:35:33 +0100
Subject: Don't install the overrides for other packages in swift-im

Change-Id: I2847529219842597234a5a74b448c9426b6db05a

diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index 383f864..a609535 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,3 +1,13 @@
+swift-im (2.0+dev6-1) unstable; urgency=low
+
+  * Update from upstream.
+  * Don't conflict with libswiften2 overrides. Closes: 726289
+  * Don't conflict with swift-im-dbg overrides. Closes: 726290
+  * Don't conflict with libswiften-dev overrides. Closes: 726291
+
+
+ -- Kevin Smith <kevin@kismith.co.uk>  Mon, 14 Oct 2013 16:42:12 -0000
+
 swift-im (2.0+dev5-1) unstable; urgency=low
 
   * Update from upstream.
diff --git a/Swift/Packaging/Debian/debian/swift-im.install b/Swift/Packaging/Debian/debian/swift-im.install
index ccced41..68e0f9e 100644
--- a/Swift/Packaging/Debian/debian/swift-im.install
+++ b/Swift/Packaging/Debian/debian/swift-im.install
@@ -1,3 +1,6 @@
 usr/bin/swift-im
-usr/share
+usr/share/icons
+usr/share/pixmaps
+usr/share/swift
+usr/share/applications
 usr/share/lintian/overrides/swift-im
-- 
cgit v0.10.2-6-g49f6