summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-08-12 13:55:19 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-10-13 12:33:50 (GMT)
commitbe4115d57838310896a37e74c4692aa161ea3d5f (patch)
tree01948ae2f22bf11c4d1c9fc138701a856ae61e17 /Swift
parent1e4b2b1ee68865eaa0670a21ad0a0af1777c8099 (diff)
downloadswift-be4115d57838310896a37e74c4692aa161ea3d5f.zip
swift-be4115d57838310896a37e74c4692aa161ea3d5f.tar.bz2
Update Debian building for latest lintian rules
Change-Id: I394f3a1fbd1971421979700ea70d882d0730c679
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Packaging/Debian/changelog.debian-unstable14
-rw-r--r--Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev2
-rw-r--r--Swift/Packaging/Debian/debian/binary-overrides/libswiften22
-rw-r--r--Swift/Packaging/Debian/debian/binary-overrides/swift-im2
-rw-r--r--Swift/Packaging/Debian/debian/binary-overrides/swift-im-dbg2
-rw-r--r--Swift/Packaging/Debian/debian/control.in6
-rw-r--r--Swift/Packaging/Debian/debian/libswiften-dev.install1
-rw-r--r--Swift/Packaging/Debian/debian/libswiften.install1
-rwxr-xr-xSwift/Packaging/Debian/debian/rules2
-rw-r--r--Swift/Packaging/Debian/debian/source/lintian-overrides5
-rw-r--r--Swift/Packaging/Debian/debian/swift-im-dbg.install1
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.install1
12 files changed, 34 insertions, 5 deletions
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index d5cbd3d..383f864 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,7 +1,17 @@
-swift-im (2.0~beta1+dev46-1) unstable; urgency=low
+swift-im (2.0+dev5-1) unstable; urgency=low
* Update from upstream.
- * Rename /usr/bin/swift binary to not conflict with other package. Closes: #674504
+ * 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
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 c42d1d0..bd04e97 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -4,14 +4,14 @@ Priority: optional
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 %WEBKIT_DEPENDENCY%
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Git: git://swift.im/swift
Vcs-Browser: http://swift.im/git/swift
Homepage: http://swift.im
Package: libswiften%SWIFTEN_SOVERSION%
Architecture: any
-Section: net
+Section: libs
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: XMPP library
@@ -23,7 +23,7 @@ Package: libswiften-dev
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,
and performant C++ library for implementing XMPP applications. Swiften
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
@@ -1,3 +1,4 @@
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 e16465d..0d42744 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -23,6 +23,8 @@ install: build
dh_prep
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
binary-arch: 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-im.install b/Swift/Packaging/Debian/debian/swift-im.install
index 9e09ac7..ccced41 100644
--- a/Swift/Packaging/Debian/debian/swift-im.install
+++ b/Swift/Packaging/Debian/debian/swift-im.install
@@ -1,2 +1,3 @@
usr/bin/swift-im
usr/share
+usr/share/lintian/overrides/swift-im