summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING1
-rw-r--r--Swift/Packaging/Debian/changelog.debian-unstable1
-rw-r--r--Swift/Packaging/Debian/debian/README.Debian2
-rw-r--r--Swift/Packaging/Debian/debian/control.in15
-rw-r--r--Swift/Packaging/Debian/debian/copyright27
-rwxr-xr-xSwift/Packaging/Debian/debian/rules1
-rw-r--r--Swift/Packaging/Debian/debian/source/format2
-rwxr-xr-xSwift/Packaging/Debian/package.sh11
8 files changed, 35 insertions, 25 deletions
diff --git a/COPYING b/COPYING
index dfc2bc6..0463240 100644
--- a/COPYING
+++ b/COPYING
@@ -819,18 +819,19 @@ under the terms of the OpenSSL license below.
[including the GNU Public Licence.]
--- END OF OpenSSL LICENSE ---
Swift contains some code contributed under the BSD License, under the following terms:
--- START OF BSD LICENSE
Copyright (c) 2011, Arnt Gulbrandsen
Copyright (c) 2011, Thilo Cestonaro
+Copyright (c) 2011, Jan Kaluza
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of their organizations nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- END OF BSD LICENSE
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index f722dce..3e6cd89 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,5 +1,6 @@
swift-im (1.1-1) unstable; urgency=low
* Initial release. Closes: #631002
+ * Thanks to Olly Betts <olly@survex.com>
-- Swift Package Maintainer <packages@swift.im> Mon, 20 Jun 2011 16:24:48 -0000
diff --git a/Swift/Packaging/Debian/debian/README.Debian b/Swift/Packaging/Debian/debian/README.Debian
deleted file mode 100644
index 20fdf61..0000000
--- a/Swift/Packaging/Debian/debian/README.Debian
+++ /dev/null
@@ -1,2 +0,0 @@
-Swift for Debian
-----------------
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 82f5710..2dcd10d 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -1,56 +1,57 @@
Source: swift-im
Section: net
Priority: optional
Maintainer: Swift Package Maintainer <packages@swift.im>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libxml2-dev (>= 2.7.6), lintian (>= 2.2.5), 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.1
+Uploaders: Remko Tronçon <dev@el-tramo.be>, Kevin Smith <debian@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.2
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
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The Swiften XMPP Library.
+Description: Swiften XMPP Library
Swiften is a robust, high-quality, standards-compliant, cross-platform,
and performant C++ library for implementing XMPP applications. Swiften
is used as the back-end library for the Swift Instant Messaging client.
-Package: libswiften%SWIFTEN_SOVERSION%-dev
+Package: libswiften-dev
Architecture: any
Section: libdevel
Priority: optional
Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: The Swiften XMPP Library.
+Description: Swiften XMPP Library
Swiften is a robust, high-quality, standards-compliant, cross-platform,
and performant C++ library for implementing XMPP applications. Swiften
is used as the back-end library for the Swift Instant Messaging client.
.
This package contains the header development files and programs for
developing with Swiften.
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.
+Description: Easy to use Jabber/XMPP chat client
Swift is a free instant messaging client. It concentrates on making
the most-used features easily accessible, supporting
internationalisation, private and group chats, together with features
for security-conscious organisations including Security Labelling.
.
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: Debugging symbols for swift-im.
+Description: Debugging symbols for swift-im
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 1cea005..f54be9b 100644
--- a/Swift/Packaging/Debian/debian/copyright
+++ b/Swift/Packaging/Debian/debian/copyright
@@ -1,12 +1,21 @@
-This package was debianized by the Swift Package Maintainer <packages@swift.im>
+This package was debianized by the Swift project <packages@swift.im>,
+with help from Olly Betts <olly@survex.com>.
-License:
+The upstream sources were obtained from http://swift.im.
+
+Copyright (C) 2010-2011 Kevin Smith and Remko Tronçon
+Licensed under the GNU General Public License.
+See /usr/share/common-licenses/GPL-3 for the full license.
+
+
+This software is subject to the OpenSSL license exception.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or combining
+it with the OpenSSL library (or a modified version of that library),
+containing parts covered by the terms of the OpenSSL License, the
+licensors of this Program grant you additional permission to convey
+the resulting work.
- Copyright (C) 2010 Kevin Smith and Remko Tronçon
-
- You are free to distribute this software under the terms of
- the GNU General Public License version 3.
- The complete text of the GNU General Public License can be
- found in /usr/share/common-licenses/GPL-3 file.
- This software is subject to the OpenSSL license exception.
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index ddafbdb..5a7248e 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -1,12 +1,13 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
+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
clean:
dh_testdir
dh_clean
scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr -c
-rm -rf .scon*
-rm -rf config.log
diff --git a/Swift/Packaging/Debian/debian/source/format b/Swift/Packaging/Debian/debian/source/format
index 89ae9db..163aaf8 100644
--- a/Swift/Packaging/Debian/debian/source/format
+++ b/Swift/Packaging/Debian/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index 5740022..5bc9fbc 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -22,46 +22,45 @@ echo "Checking out a fresh copy ..."
rm -rf $DIRNAME
git clone ../../../.git $DIRNAME
# Remove development files & 3rdParty files
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
find $DIRNAME/3rdParty -depth -empty -type d -exec rmdir {} \;
rm -rf $DIRNAME/3rdParty/SCons
+rm -rf $DIRNAME/Swift/Packaging/Debian
# Initialize the build version
echo $VERSION > $DIRNAME/VERSION.swift
# Fork local Boost UUID copy
# FIXME: This shouldn't be necessary, but SCons isn't picking up the generated headers for compilation
mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost
cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost
-# Create orig tarball for debuild
+# Create orig tarball
tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz $DIRNAME
# Detect dependencies
WEBKIT_DEPENDENCY=", libqtwebkit-dev (>= 2.0.0)"
DISTRIBUTION=`lsb_release -s -i`-`lsb_release -s -c`
if [ "$DISTRIBUTION" = "Debian-squeeze" -o "$DISTRIBUTION" = "Ubuntu-lucid" ]; then
WEBKIT_DEPENDENCY=""
fi
# Initialize debian files
-ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
+cp -r debian $DIRNAME/debian
if [ -z "$CHANGELOG" ]; then
../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
else
cp $CHANGELOG $DIRNAME/debian/changelog
fi
cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" | sed -e "s/%WEBKIT_DEPENDENCY%/$WEBKIT_DEPENDENCY/g" > $DIRNAME/debian/control
+rm $DIRNAME/debian/control.in
mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install
-mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install
-mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.manpages
+cat ../../../COPYING | awk '/--- END OF OpenSSL/,EOF' | tail -n +3 >> $DIRNAME/debian/copyright
# Build
cd $DIRNAME
set +e
debuild -i -I --lintian-opts --pedantic
-#dpkg-buildpackage -S -rfakeroot -i -I
-#dpkg-buildpackage -b -rfakeroot -i -I