summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-30 19:00:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-30 20:08:41 (GMT)
commit544cbf6443a8f6c075b1dd5f064c818e7505dcc1 (patch)
tree720c35a8d859a5eb772d46a94c79df4870a46fac
parent4804022049cb53ac28902639274826b68a803c18 (diff)
downloadswift-544cbf6443a8f6c075b1dd5f064c818e7505dcc1.zip
swift-544cbf6443a8f6c075b1dd5f064c818e7505dcc1.tar.bz2
Rename swift Debian package to swift-im.
-rwxr-xr-xBuildTools/UpdateDebianChangelog.py2
-rw-r--r--Swift/Packaging/Debian/debian/changelog4
-rw-r--r--Swift/Packaging/Debian/debian/control10
-rwxr-xr-xSwift/Packaging/Debian/debian/rules9
-rw-r--r--Swift/Packaging/Debian/debian/swift.menu2
-rwxr-xr-xSwift/Packaging/Debian/package.sh8
6 files changed, 21 insertions, 14 deletions
diff --git a/BuildTools/UpdateDebianChangelog.py b/BuildTools/UpdateDebianChangelog.py
index c4e32b7..31f7a80 100755
--- a/BuildTools/UpdateDebianChangelog.py
+++ b/BuildTools/UpdateDebianChangelog.py
@@ -12,7 +12,7 @@ changelog.close()
project = ""
last_version = ""
-m = re.match("(\w+) \((.*)-\d+\)", last_version_line)
+m = re.match("([\w-]+) \((.*)-\d+\)", last_version_line)
if m :
project = m.group(1)
last_version = m.group(2)
diff --git a/Swift/Packaging/Debian/debian/changelog b/Swift/Packaging/Debian/debian/changelog
index ef172f0..a5338f8 100644
--- a/Swift/Packaging/Debian/debian/changelog
+++ b/Swift/Packaging/Debian/debian/changelog
@@ -1,10 +1,10 @@
-swift (1.0~beta2-1) unstable; urgency=low
+swift-im (1.0~beta2-1) unstable; urgency=low
* Upstream release
-- Remko Tronçon <dev@el-tramo.be> Sat, 26 Sep 2009 11:08:32 +0200
-swift (1.0~beta1-1) unstable; urgency=low
+swift-im (1.0~beta1-1) unstable; urgency=low
* Upstream release
diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control
index 006b6b4..da88b28 100644
--- a/Swift/Packaging/Debian/debian/control
+++ b/Swift/Packaging/Debian/debian/control
@@ -1,4 +1,4 @@
-Source: swift
+Source: swift-im
Section: x11
Priority: optional
Maintainer: Remko Tronçon <dev@el-tramo.be>
@@ -6,15 +6,15 @@ Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt
Standards-Version: 3.8.4
Homepage: http://swift.im
-Package: swift
+Package: swift-im
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: XMPP Client.
The Swift IM client.
-Package: swift-dbg
+Package: swift-im-dbg
Architecture: any
Section: debug
-Depends: swift (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Debugging symbols for swift.
+Depends: swift-im (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Debugging symbols for swift-im.
The Swift IM client.
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index 346efb5..e519d94 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -13,7 +13,12 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- scons qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift/usr $(CURDIR)
+ scons qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift-im/usr $(CURDIR)/debian/swift-im
+ #mv $(CURDIR)/debian/swift-im/usr/bin/swift $(CURDIR)/debian/swift-im/usr/bin/swift-im
+ #mv $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift.xpm $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift-im.xpm
+ #mv $(CURDIR)/debian/swift-im/usr/share/swift $(CURDIR)/debian/swift-im/usr/share/swift-im
+ #mv $(CURDIR)/debian/swift-im/usr/share/applications/swift.desktop $(CURDIR)/debian/swift-im/usr/share/applications/swift-im.desktop
+
binary-indep: install
binary-arch: install
@@ -23,7 +28,7 @@ binary-arch: install
dh_installdocs
dh_installmenu
dh_link
- dh_strip --dbg-package=swift-dbg
+ dh_strip --dbg-package=swift-im-dbg
dh_compress
dh_fixperms
dh_installdeb
diff --git a/Swift/Packaging/Debian/debian/swift.menu b/Swift/Packaging/Debian/debian/swift.menu
index 34aba2e..f9c2f26 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" command="/usr/bin/swift"\
+ 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 f1704f4..e74245f 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -1,9 +1,11 @@
#!/bin/sh
+set -x
+
export PYTHONPATH=../../../BuildTools/SCons
VERSION=`../../../BuildTools/GetBuildVersion.py swift`
DEBIAN_VERSION=`../../../BuildTools/DebianizeVersion.py $VERSION`
-DIRNAME=swift-$DEBIAN_VERSION
+DIRNAME=swift-im-$DEBIAN_VERSION
if [ -z "$DEBIAN_VERSION" ]; then
echo "Unable to determine version"
@@ -11,8 +13,8 @@ if [ -z "$DEBIAN_VERSION" ]; then
fi
echo "Cleaning up old packages ..."
-rm swift_*
-rm -rf swift-*
+rm swift-im_*
+rm -rf swift-im-*
echo "Checking out a fresh copy ..."
rm -rf $DIRNAME