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/Debian/package.sh | |
| 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/Debian/package.sh')
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |