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
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')
-rw-r--r--Swift/Packaging/Debian/changelog.debian-unstable24
-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.install6
12 files changed, 48 insertions, 6 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
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 dd7be88..fa734f6 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, libhunspell-dev, libnatpmp-dev, libminiupnpc-dev, libsqlite3-dev %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..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-im
-usr/share
+usr/share/icons
+usr/share/pixmaps
+usr/share/swift
+usr/share/applications
+usr/share/lintian/overrides/swift-im