summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-22 06:42:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-22 06:42:13 (GMT)
commitfead5b2c5492a076294aceb0b0cb3e35f5a76b56 (patch)
tree7eccbf0740ce9b0f70f981397f560156747c0614 /Swift/Packaging/Debian/debian/copyright
parentcb20f254b21f770dda4cc9a361ea75d2b7f2d877 (diff)
parentffb711c02f9ab6b32c6fd7c21d21f35f4552a5fd (diff)
downloadswift-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.zip
swift-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Some more Debian fixes. Conflicts: COPYING
Diffstat (limited to 'Swift/Packaging/Debian/debian/copyright')
-rw-r--r--Swift/Packaging/Debian/debian/copyright27
1 files changed, 18 insertions, 9 deletions
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.