Swiftdiff options
Diffstat (limited to 'Swift/Packaging')
20 files changed, 92 insertions, 25 deletions
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable index c8b4861..a609535 100644 --- a/Swift/Packaging/Debian/changelog.debian-unstable +++ b/Swift/Packaging/Debian/changelog.debian-unstable @@ -1,3 +1,30 @@ -swift-im (2.0~alpha+dev629-1) unstable; urgency=low +swift-im (2.0+dev6-1) unstable; urgency=low + + * Update from upstream. + * 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 + +swift-im (2.0~beta1+dev26-1) unstable; urgency=low * Initial release. Closes: #631002 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" diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh index 1edc4a0..8c7c89f 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -50,5 +50,9 @@ else rm -rf $DIRNAME/.git find $DIRNAME -name .gitignore | xargs rm -f - find $DIRNAME/3rdParty -type f | grep -v uuid | grep -v SConscript | 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 + 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 @@ -60,6 +64,8 @@ else # Fork local Boost UUID copy # FIXME: This shouldn't be necessary, but SCons isn't picking up the generated headers for compilation + if [ ! -z "$SWIFT_COPY_UUID" ]; then mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost + fi # Create orig tarball @@ -87,5 +93,5 @@ cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSIO rm $DIRNAME/debian/control.in mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install -cat ../../../COPYING | awk '/--- END OF OpenSSL/,EOF' | tail -n +3 >> $DIRNAME/debian/copyright +cat ../../../COPYING.thirdparty | tail -n +3 >> $DIRNAME/debian/copyright # Build diff --git a/Swift/Packaging/MacOSX/Swift.dmg.gz b/Swift/Packaging/MacOSX/Swift.dmg.gz Binary files differindex 3aef6b1..0451101 100644 --- a/Swift/Packaging/MacOSX/Swift.dmg.gz +++ b/Swift/Packaging/MacOSX/Swift.dmg.gz diff --git a/Swift/Packaging/MacOSX/package.sh b/Swift/Packaging/MacOSX/package.sh index 884403b..d7a31d2 100755 --- a/Swift/Packaging/MacOSX/package.sh +++ b/Swift/Packaging/MacOSX/package.sh @@ -21,5 +21,5 @@ mkdir -p $WC_DIR hdiutil attach "$WC_DMG" -noautoopen -quiet -mountpoint "$WC_DIR" ditto -rsrc "$APP" "$WC_DIR"/`basename $APP` -$QTDIR/bin/macdeployqt "$WC_DIR"/`basename $APP` +$QTDIR/bin/macdeployqt "$WC_DIR"/`basename $APP` -no-strip hdiutil detach "$WC_DIR" -quiet -force rm -f $TARGET diff --git a/Swift/Packaging/WiX/Swift.wxs b/Swift/Packaging/WiX/Swift.wxs index 782f425..c14f23d 100644 --- a/Swift/Packaging/WiX/Swift.wxs +++ b/Swift/Packaging/WiX/Swift.wxs @@ -8,5 +8,5 @@ <Product Name='Swift' Id='*' UpgradeCode='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Swift.im'> - <Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'/> + <Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' InstallScope="perMachine"/> <Media Id='1' Cabinet='Swift.cab' EmbedCab='yes'/> @@ -14,7 +14,10 @@ <Directory Id='TARGETDIR' Name='SourceDir'> + <!-- Disabling CRT merge module, because it's not working + <Merge Id="CRT" DiskId="1" Language="0" SourceFile="$(var.VCCRTFile)"/> + --> + <Directory Id='ProgramFilesFolder' Name='PFiles'> <!--<Directory Id='INSTALLDIR' Name='Swift'> - </Directory>--> </Directory> @@ -31,13 +34,9 @@ <Directory Id="DesktopFolder" Name="Desktop" /> - - <Merge Id="CRT" DiskId="1" Language="1033" SourceFile="$(var.VCCRTFile)"/> </Directory> <Feature Id='Core' Level='1' Title='Swift' Description='All necessary Swift files' Display='expand' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no' Absent='disallow'> <ComponentGroupRef Id='Files' /> - <!--<ComponentRef Id='Manual' />--> - <MergeRef Id="CRT"/> </Feature> @@ -53,4 +52,17 @@ <Icon Id="Swift.exe" SourceFile="Swift.exe" /> <Property Id="ARPPRODUCTICON" Value="Swift.exe"/> <!-- The icon in the "Programs" dialog --> + + <!-- + VC Redistributable + --> + + <Binary Id="CRTBinary" SourceFile="$(var.VCCRTFile)"/> + + <CustomAction Id="CRTAction" Impersonate="no" Return="asyncNoWait" Execute="deferred" BinaryKey="CRTBinary" ExeCommand="/passive"/> + + <InstallExecuteSequence> + <Custom Action='CRTAction' After='InstallInitialize'/> + </InstallExecuteSequence> + </Product> </Wix> |