summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-06-12 19:08:14 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-06-12 19:10:05 (GMT)
commitcacc0b6839f7894f51adfd119bf19846fa8bdb61 (patch)
tree11918b28bb569d3aeff6b7151e23a7fe96c86164
parent0745a0103e1f855c696b2f69ee2dea509b74bb01 (diff)
downloadswift-contrib-cacc0b6839f7894f51adfd119bf19846fa8bdb61.zip
swift-contrib-cacc0b6839f7894f51adfd119bf19846fa8bdb61.tar.bz2
Rename 'swift' binary to 'swift-im' on Linux.
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.1 (renamed from Swift/Packaging/Debian/debian/swift.1)4
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.install2
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.manpages2
-rw-r--r--Swift/Packaging/Debian/debian/swift.menu4
-rwxr-xr-xSwift/Packaging/Debian/package.sh2
-rw-r--r--Swift/QtUI/SConscript2
6 files changed, 8 insertions, 8 deletions
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
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
.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
Swift is an instant messaging client for the XMPP network.
diff --git a/Swift/Packaging/Debian/debian/swift-im.install b/Swift/Packaging/Debian/debian/swift-im.install
index 3144192..9e09ac7 100644
--- a/Swift/Packaging/Debian/debian/swift-im.install
+++ b/Swift/Packaging/Debian/debian/swift-im.install
@@ -1,2 +1,2 @@
-usr/bin/swift
+usr/bin/swift-im
usr/share
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.menu b/Swift/Packaging/Debian/debian/swift.menu
index f9c2f26..68b621d 100644
--- a/Swift/Packaging/Debian/debian/swift.menu
+++ b/Swift/Packaging/Debian/debian/swift.menu
@@ -1,3 +1,3 @@
-?package(swift):needs="X11" section="Applications/Network/Communication"\
- title="Swift IM" command="/usr/bin/swift"\
+?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 1edc4a0..76aee6f 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -86,7 +86,7 @@ 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
-cat ../../../COPYING | awk '/--- END OF OpenSSL/,EOF' | tail -n +3 >> $DIRNAME/debian/copyright
+cat ../../../COPYING.thirdparty | tail -n +3 >> $DIRNAME/debian/copyright
# Build
cd $DIRNAME
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 39f7464..ef05a12 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -182,7 +182,7 @@ if env["PLATFORM"] == "darwin" :
if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
swiftProgram = myenv.Program("Swift", sources)
else :
- swiftProgram = myenv.Program("swift", sources)
+ swiftProgram = myenv.Program("swift-im", sources)
if env["PLATFORM"] != "darwin" and env["PLATFORM"] != "win32" :
openURIProgram = myenv.Program("swift-open-uri", "swift-open-uri.cpp")