Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-10-31 19:29:52 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-10-31 19:29:52 (GMT) |
| commit | 2eb088cc2b0e26780359fc55993d656bb54b1882 (patch) | |
| tree | f18718536913a0b5948664a80f4343b85ec79696 /Swift/Packaging/Debian/changelog.debian-unstable | |
| parent | d7b73e460adab34f5bf0cc0038ffa21bd6b6c53a (diff) | |
| parent | 68a59bf7ef72857d730e650887355911bc72c6e6 (diff) | |
| download | swift-2eb088cc2b0e26780359fc55993d656bb54b1882.zip swift-2eb088cc2b0e26780359fc55993d656bb54b1882.tar.bz2 | |
Merge branch 'swift-2.x'
* swift-2.x:
Update Hebrew translation
Don't install the overrides for other packages in swift-im
Update Debian building for latest lintian rules
Don't allow passing NULL to the JID ctor
Conflicts:
Swift/Packaging/Debian/debian/control.in
Change-Id: Iadbd434627e190d7369aa61f67ab211e4fbcf02a
Diffstat (limited to 'Swift/Packaging/Debian/changelog.debian-unstable')
| -rw-r--r-- | Swift/Packaging/Debian/changelog.debian-unstable | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable index d5cbd3d..a609535 100644 --- a/Swift/Packaging/Debian/changelog.debian-unstable +++ b/Swift/Packaging/Debian/changelog.debian-unstable @@ -1,7 +1,27 @@ -swift-im (2.0~beta1+dev46-1) unstable; urgency=low +swift-im (2.0+dev6-1) unstable; urgency=low * Update from upstream. - * Rename /usr/bin/swift binary to not conflict with other package. Closes: #674504 + * 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. + * Compiles with boost >= 1.50.0; will build on sid again. Closes: #713725 + * Include dependencies for libswiften so that other packages + can depend on it. Closes: #714902 + + -- Kevin Smith <kevin@kismith.co.uk> Mon, 12 Aug 2013 16:18:09 -0000 + +swift-im (2.0~beta1+dev47-1) unstable; urgency=low + + * Update from upstream. + * Rename /usr/bin/swift binary to not conflict with + other package. Closes: #674504 -- Kevin Smith <kevin@kismith.co.uk> Tue, 12 Jun 2012 19:25:12 -0000 |