summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-10-31 19:29:52 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-10-31 19:29:52 (GMT)
commit2eb088cc2b0e26780359fc55993d656bb54b1882 (patch)
treef18718536913a0b5948664a80f4343b85ec79696 /Swift/Packaging/Debian/debian/binary-overrides/swift-im
parentd7b73e460adab34f5bf0cc0038ffa21bd6b6c53a (diff)
parent68a59bf7ef72857d730e650887355911bc72c6e6 (diff)
downloadswift-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/debian/binary-overrides/swift-im')
-rw-r--r--Swift/Packaging/Debian/debian/binary-overrides/swift-im2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/Packaging/Debian/debian/binary-overrides/swift-im b/Swift/Packaging/Debian/debian/binary-overrides/swift-im
new file mode 100644
index 0000000..11ca729
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/binary-overrides/swift-im
@@ -0,0 +1,2 @@
+# The upstream numbering scheme is that 2.0~beta1 is prior to 2.0 but that 2.0~beta1+dev10 is ten commits later than 2.0~beta1, so in this case the warning is redundant.
+swift-im binary: rc-version-greater-than-expected-version