summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-10-14 15:35:33 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-10-15 09:59:04 (GMT)
commit0992d02c8a29f3017edb66e7c31b4ae27c56d684 (patch)
treec27c31ce552f046d6e9bba9f97cf2bddfec11eb3
parentbe4115d57838310896a37e74c4692aa161ea3d5f (diff)
downloadswift-contrib-0992d02c8a29f3017edb66e7c31b4ae27c56d684.zip
swift-contrib-0992d02c8a29f3017edb66e7c31b4ae27c56d684.tar.bz2
Don't install the overrides for other packages in swift-im
Change-Id: I2847529219842597234a5a74b448c9426b6db05a
-rw-r--r--Swift/Packaging/Debian/changelog.debian-unstable10
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.install5
2 files changed, 14 insertions, 1 deletions
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