15 files changed, 37 insertions, 15 deletions
diff --git a/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev b/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev
new file mode 100644
index 0000000..93497a5
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev
@@ -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.
+libswiften-dev binary: rc-version-greater-than-expected-version
diff --git a/Swift/Packaging/Debian/debian/binary-overrides/libswiften2 b/Swift/Packaging/Debian/debian/binary-overrides/libswiften2
new file mode 100644
index 0000000..ae16e89
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/binary-overrides/libswiften2
@@ -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.
+libswiften2 binary: rc-version-greater-than-expected-version
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
diff --git a/Swift/Packaging/Debian/debian/binary-overrides/swift-im-dbg b/Swift/Packaging/Debian/debian/binary-overrides/swift-im-dbg
new file mode 100644
index 0000000..d993122
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/binary-overrides/swift-im-dbg
@@ -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-dbg binary: rc-version-greater-than-expected-version
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 51a3cf3..fa734f6 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -2,8 +2,8 @@ Source: swift-im
 Section: net
 Priority: optional
-Maintainer: Swift Package Maintainers <packages@swift.im>
-Uploaders: Remko Tronçon <dev@el-tramo.be>, Kevin Smith <kevin@kismith.co.uk>, Olly Betts <olly@survex.com>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libxml2-dev (>= 2.7.6), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils %WEBKIT_DEPENDENCY%
-Standards-Version: 3.9.3
+Maintainer: Swift Package Maintainer <packages@swift.im>
+Uploaders: Remko Tronçon <dev@el-tramo.be>, Kevin Smith <kevin@kismith.co.uk>
+Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libxml2-dev (>= 2.7.6), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils, libhunspell-dev, libnatpmp-dev, libminiupnpc-dev, libsqlite3-dev %WEBKIT_DEPENDENCY%
+Standards-Version: 3.9.4
 Vcs-Git: git://swift.im/swift
 Vcs-Browser: http://swift.im/git/swift
@@ -12,5 +12,5 @@ Homepage: http://swift.im
 Package: libswiften%SWIFTEN_SOVERSION%
 Architecture: any
-Section: net
+Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -24,5 +24,5 @@ Architecture: any
 Section: libdevel
 Priority: optional
-Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1)
 Description: XMPP library (development files)
  Swiften is a robust, high-quality, standards-compliant, cross-platform,
diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.install b/Swift/Packaging/Debian/debian/libswiften-dev.install
index 545c6d9..273c86b 100644
--- a/Swift/Packaging/Debian/debian/libswiften-dev.install
+++ b/Swift/Packaging/Debian/debian/libswiften-dev.install
@@ -2,2 +2,3 @@ usr/lib/libSwiften.so
 usr/include
 usr/bin/swiften-config
+usr/share/lintian/overrides/libswiften-dev
diff --git a/Swift/Packaging/Debian/debian/libswiften.install b/Swift/Packaging/Debian/debian/libswiften.install
index 2603436..878fe4f 100644
--- a/Swift/Packaging/Debian/debian/libswiften.install
+++ b/Swift/Packaging/Debian/debian/libswiften.install
@@ -1 +1,2 @@
 usr/lib/libSwiften.so.*
+usr/share/lintian/overrides/libswiften2
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index d05e34a..0d42744 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -4,5 +4,5 @@
 export PYTHONDONTWRITEBYTECODE=1
 
-SCONS_FLAGS=V=1 optimize=1 debug=1 allow_warnings=1 swiften_dll=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 
+SCONS_FLAGS=V=1 optimize=1 debug=1 allow_warnings=1 swiften_dll=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 linkflags="$(shell dpkg-buildflags --get LDFLAGS)" ccflags="$(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS)"
 
 clean: 
@@ -24,4 +24,6 @@ install: build
 	dh_installdirs
 	scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr $(CURDIR)/debian/tmp
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides
+	cp debian/binary-overrides/* $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
 
 binary-indep: install
diff --git a/Swift/Packaging/Debian/debian/source/lintian-overrides b/Swift/Packaging/Debian/debian/source/lintian-overrides
new file mode 100644
index 0000000..b3f7bdd
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/source/lintian-overrides
@@ -0,0 +1,5 @@
+# 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 source: rc-version-greater-than-expected-version
+libswiften-dev source: rc-version-greater-than-expected-version
+libswiften2 source: rc-version-greater-than-expected-version
+swift-im-dbg source: rc-version-greater-than-expected-version
diff --git a/Swift/Packaging/Debian/debian/swift-im-dbg.install b/Swift/Packaging/Debian/debian/swift-im-dbg.install
new file mode 100644
index 0000000..e2db5d9
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swift-im-dbg.install
@@ -0,0 +1 @@
+usr/share/lintian/overrides/swift-im-dbg
diff --git a/Swift/Packaging/Debian/debian/swift.1 b/Swift/Packaging/Debian/debian/swift-im.1
index 6626b40..b7262bf 100644
--- a/Swift/Packaging/Debian/debian/swift.1
+++ b/Swift/Packaging/Debian/debian/swift-im.1
@@ -2,7 +2,7 @@
 .TH SWIFT "1" "June 2011" "Swift" "Swift Manual"
 .SH NAME
-Swift \- swift
+swift-im \- Swift
 .SH SYNOPSIS
-.B swift
+.B swift-im
 [\fIOPTIONS\fR]...
 .SH DESCRIPTION
diff --git a/Swift/Packaging/Debian/debian/swift-im.install b/Swift/Packaging/Debian/debian/swift-im.install
index 3144192..68e0f9e 100644
--- a/Swift/Packaging/Debian/debian/swift-im.install
+++ b/Swift/Packaging/Debian/debian/swift-im.install
@@ -1,2 +1,6 @@
-usr/bin/swift
-usr/share
+usr/bin/swift-im
+usr/share/icons
+usr/share/pixmaps
+usr/share/swift
+usr/share/applications
+usr/share/lintian/overrides/swift-im
diff --git a/Swift/Packaging/Debian/debian/swift-im.manpages b/Swift/Packaging/Debian/debian/swift-im.manpages
index f3fb91e..287f11f 100644
--- a/Swift/Packaging/Debian/debian/swift-im.manpages
+++ b/Swift/Packaging/Debian/debian/swift-im.manpages
@@ -1 +1 @@
-debian/swift.1
+debian/swift-im.1
diff --git a/Swift/Packaging/Debian/debian/swift-im.menu b/Swift/Packaging/Debian/debian/swift-im.menu
new file mode 100644
index 0000000..68b621d
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swift-im.menu
@@ -0,0 +1,3 @@
+?package(swift-im):needs="X11" section="Applications/Network/Communication"\
+  title="Swift IM" command="/usr/bin/swift-im"\
+	icon="/usr/share/pixmaps/swift.xpm"
diff --git a/Swift/Packaging/Debian/debian/swift.menu b/Swift/Packaging/Debian/debian/swift.menu
deleted file mode 100644
index f9c2f26..0000000
--- a/Swift/Packaging/Debian/debian/swift.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(swift):needs="X11" section="Applications/Network/Communication"\
-  title="Swift IM" command="/usr/bin/swift"\
-	icon="/usr/share/pixmaps/swift.xpm"