Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:30 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:46 (GMT) |
| commit | 6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch) | |
| tree | 322d5c80e7be477758a8e97ecd8a64fbb09836de /Swift/Packaging | |
| parent | 864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff) | |
| parent | 2efefdc5ae847f5d187762e474d75c61560cba19 (diff) | |
| download | swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2 | |
Merge branch 'swift-3.x’
* swift-3.x:
- Fix building Swift on 32-bit Linux distributions
- Remove optional_fwd.hpp use; workaround for Boost Bug #12179
- Split COPYING.thirdparty in contributions/dependencies
- Fixes for building packages on Debian
Conflicts:
BuildTools/SCons/SConstruct
Sluift/Console.h
Sluift/ITunesInterface.h
Sluift/Terminal.h
Swift/Packaging/Debian/debian/control.in
Swift/QtUI/SConscript
Swiften/Elements/Stanza.h
Swiften/FileTransfer/FileTransferTransporter.h
Swiften/FileTransfer/IBBReceiveSession.h
Swiften/JID/JID.h
Swiften/Network/BoostConnectionServer.h
Swiften/Network/ConnectionServer.h
Swiften/Parser/AttributeMap.h
Test-Information:
Builds on macOS 10.12.1 with clang trunk.
Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swift/Packaging')
17 files changed, 33 insertions, 80 deletions
diff --git a/Swift/Packaging/Debian/build_for_debian.sh b/Swift/Packaging/Debian/build_for_debian.sh index 3d79177..0f0691f 100755 --- a/Swift/Packaging/Debian/build_for_debian.sh +++ b/Swift/Packaging/Debian/build_for_debian.sh @@ -6,6 +6,6 @@ export SWIFT_DEBUILD_FLAGS="-S" ./package.sh -for arch in i386 amd64; do +for arch in amd64; do pbuilder-dist sid $arch build *.dsc done diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable index a609535..ca9ffec 100644 --- a/Swift/Packaging/Debian/changelog.debian-unstable +++ b/Swift/Packaging/Debian/changelog.debian-unstable @@ -1,3 +1,14 @@ +swift-im (3.0.4-1) unstable; urgency=low + + * New upstream release + * Allow compiling with newer boosts. Closes: 810839, 822131 + * Switch to Qt5 instead of Qt4. Closes: 784532, 745807 + * Fix some platform detection in build system. Closes: 757554 + * Rewrite rules file with dh sequencer. + * Drop -dbg package. + + -- Kevin Smith <kevin@kismith.co.uk> Fri, 03 Jun 2016 15:56:20 +0100 + swift-im (2.0+dev6-1) unstable; urgency=low * Update from upstream. @@ -12,7 +23,7 @@ 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 + * 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 @@ -31,4 +42,3 @@ swift-im (2.0~beta1+dev26-1) unstable; urgency=low * Thanks to Olly Betts <olly@survex.com> -- Kevin Smith <kevin@kismith.co.uk> Wed, 25 Apr 2012 09:55:52 -0000 - diff --git a/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev b/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev deleted file mode 100644 index 93497a5..0000000 --- a/Swift/Packaging/Debian/debian/binary-overrides/libswiften-dev +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index ae16e89..0000000 --- a/Swift/Packaging/Debian/debian/binary-overrides/libswiften2 +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 11ca729..0000000 --- a/Swift/Packaging/Debian/debian/binary-overrides/swift-im +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index d993122..0000000 --- a/Swift/Packaging/Debian/debian/binary-overrides/swift-im-dbg +++ /dev/null @@ -1,2 +0,0 @@ -# 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/compat b/Swift/Packaging/Debian/debian/compat index 7f8f011..ec63514 100644 --- a/Swift/Packaging/Debian/debian/compat +++ b/Swift/Packaging/Debian/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in index 8d6afe5..68a52de 100644 --- a/Swift/Packaging/Debian/debian/control.in +++ b/Swift/Packaging/Debian/debian/control.in @@ -3,8 +3,8 @@ Section: net 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), qt5-default (>= 5.0.0), libqt5x11extras5-dev (>= 5.0.0), libqt5webkit5-dev (>= 5.0.0), qtmultimedia5-dev (>=5.0.0), qttools5-dev-tools (>=5.0.0), qt5-image-formats-plugins (>=5.0.0), libqt5svg5 (>=5.0.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, libnatpmp-dev, libminiupnpc-dev, libsqlite3-dev, libhunspell-dev -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), qtbase5-dev (>= 5.0.0), qtchooser, qtbase5-dev-tools (>= 5.0.0), libqt5x11extras5-dev (>= 5.0.0), libqt5webkit5-dev (>= 5.0.0), qtmultimedia5-dev (>=5.0.0), qttools5-dev-tools (>=5.0.0), qt5-image-formats-plugins (>=5.0.0), libqt5svg5 (>=5.0.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, libnatpmp-dev, libminiupnpc-dev, libsqlite3-dev, libhunspell-dev, zlib1g-dev +Standards-Version: 3.9.8 Vcs-Git: git://swift.im/swift Vcs-Browser: http://swift.im/git/swift Homepage: http://swift.im @@ -12,7 +12,6 @@ Homepage: http://swift.im Package: libswiften%SWIFTEN_SOVERSION% Architecture: any Section: libs -Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: XMPP library Swiften is a robust, high-quality, standards-compliant, cross-platform, @@ -22,7 +21,6 @@ Description: XMPP library Package: libswiften-dev Architecture: any Section: libdevel -Priority: optional 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, @@ -34,8 +32,6 @@ Description: XMPP library (development files) Package: swift-im Architecture: any -Section: net -Priority: optional Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: easy to use Jabber/XMPP chat client Swift is a free instant messaging client. It concentrates on making @@ -46,12 +42,3 @@ Description: easy to use Jabber/XMPP chat client Swift uses the XMPP protocol and so supports both the public Jabber network and closed XMPP services, such as those found in many organisations. - -Package: swift-im-dbg -Architecture: any -Section: debug -Priority: extra -Depends: swift-im (= ${binary:Version}), ${misc:Depends} -Description: XMPP client/library (debugging symbols) - This package contains the debugging symbols for debugging Swift - and Swiften applications. diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright index 63d3a88..a0c2c79 100644 --- a/Swift/Packaging/Debian/debian/copyright +++ b/Swift/Packaging/Debian/debian/copyright @@ -3,7 +3,7 @@ with help from Olly Betts <olly@survex.com>. The upstream sources were obtained from http://swift.im. -Copyright (C) 2010-2014 Isode Limited. +Copyright (C) 2010-2016 Isode Limited. Licensed under the GNU General Public License. See /usr/share/common-licenses/GPL-3 for the full license. diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.install b/Swift/Packaging/Debian/debian/libswiften-dev.install index 273c86b..545c6d9 100644 --- a/Swift/Packaging/Debian/debian/libswiften-dev.install +++ b/Swift/Packaging/Debian/debian/libswiften-dev.install @@ -1,4 +1,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 878fe4f..2603436 100644 --- a/Swift/Packaging/Debian/debian/libswiften.install +++ b/Swift/Packaging/Debian/debian/libswiften.install @@ -1,2 +1 @@ usr/lib/libSwiften.so.* -usr/share/lintian/overrides/libswiften2 diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules index 2bdfe3b..87c551b 100755 --- a/Swift/Packaging/Debian/debian/rules +++ b/Swift/Packaging/Debian/debian/rules @@ -2,52 +2,26 @@ #export DH_VERBOSE=1 export PYTHONDONTWRITEBYTECODE=1 +export QT_SELECT=qt5 SCONS_FLAGS=V=1 qt5=1 optimize=1 debug=1 allow_warnings=1 swiften_dll=1 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)" +SCONS_INSTALL_BASE=$(CURDIR)/debian/tmp +SCONS_INSTALL_FLAGS=SWIFT_INSTALLDIR=$(SCONS_INSTALL_BASE)/usr SWIFTEN_INSTALLDIR=$(SCONS_INSTALL_BASE)/usr +SWIFT_INSTALLDIR=$(SCONS_INSTALL_BASE)/usr SWIFTEN_INSTALLDIR=$(SCONS_INSTALL_BASE)/usr -clean: - dh_testdir +%: + dh $@ + +override_dh_clean: dh_clean - scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr -c + scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) $(SCONS_INSTALL_FLAGS) -c -rm -rf .scon* -rm -rf config.log -configure: +override_dh_configure: -build: configure - dh_testdir +override_dh_auto_build: scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) Swift Swiften -install: build - dh_testroot - 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 - dh_testdir - dh_testroot - dh_install --sourcedir=debian/tmp - dh_installchangelogs - dh_installdocs - dh_installmenu - dh_installman -a - dh_link - dh_strip --dbg-package=swift-im-dbg - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch - -build-arch: build -build-indep: build -.PHONY: build clean binary-indep binary-arch binary install configure build-arch build-indep +override_dh_auto_install: + scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) $(SCONS_INSTALL_FLAGS) $(SCONS_INSTALL_BASE) diff --git a/Swift/Packaging/Debian/debian/source/lintian-overrides b/Swift/Packaging/Debian/debian/source/lintian-overrides deleted file mode 100644 index b3f7bdd..0000000 --- a/Swift/Packaging/Debian/debian/source/lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index e2db5d9..0000000 --- a/Swift/Packaging/Debian/debian/swift-im-dbg.install +++ /dev/null @@ -1 +0,0 @@ -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 68e0f9e..82242ff 100644 --- a/Swift/Packaging/Debian/debian/swift-im.install +++ b/Swift/Packaging/Debian/debian/swift-im.install @@ -3,4 +3,3 @@ 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.menu b/Swift/Packaging/Debian/debian/swift-im.menu deleted file mode 100644 index 68b621d..0000000 --- a/Swift/Packaging/Debian/debian/swift-im.menu +++ /dev/null @@ -1,3 +0,0 @@ -?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/package.sh b/Swift/Packaging/Debian/package.sh index 8c7c89f..62dfff0 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -50,13 +50,15 @@ else rm -rf $DIRNAME/.git find $DIRNAME -name .gitignore | xargs rm -f if [ -z "$SWIFT_COPY_UUID" ]; then - find $DIRNAME/3rdParty -type f | grep -v SConscript | grep -v miniupnp | grep -v natpmp |xargs rm -f + find $DIRNAME/3rdParty -type f | grep -v SConscript | xargs rm -f else find $DIRNAME/3rdParty -type f | grep -v uuid | grep -v SConscript | grep -v miniupnp | grep -v natpmp || xargs rm -f fi find $DIRNAME/3rdParty -depth -empty -type d -exec rmdir {} \; rm -rf $DIRNAME/3rdParty/SCons rm -rf $DIRNAME/Swift/Packaging/Debian + rm -rf $DIRNAME/BuildTools/DocBook/Fonts + rm -rf $DIRNAME/BuildTools/Git/Hooks/commit-msg # Initialize the build version echo $VERSION > $DIRNAME/VERSION.swift |