Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-25 19:51:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-25 20:06:47 (GMT) |
| commit | 0143468ab872e401b20894a680eea3b7c0dfb021 (patch) | |
| tree | 8d9612f8bff7246ef1538f0b2c090deffdb31b82 | |
| parent | 3d5f95c825814f6452dc0f3ddba883418ce9575a (diff) | |
| download | swift-0143468ab872e401b20894a680eea3b7c0dfb021.zip swift-0143468ab872e401b20894a680eea3b7c0dfb021.tar.bz2 | |
Fixed debian sections, priorities & distributions.
| -rwxr-xr-x | BuildTools/UpdateDebianChangelog.py | 9 | ||||
| -rw-r--r-- | Swift/Packaging/Debian/debian/control | 5 | ||||
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/BuildTools/UpdateDebianChangelog.py b/BuildTools/UpdateDebianChangelog.py index c98863d..d8f8d62 100755 --- a/BuildTools/UpdateDebianChangelog.py +++ b/BuildTools/UpdateDebianChangelog.py @@ -17,12 +17,19 @@ if m : project = m.group(1) last_version = m.group(2) +if "dev" in version : + distribution = "development" +elif "beta" in version : + distribution = "beta development" +else : + distribution = "release beta development" + if last_version != version : changelog = open(sys.argv[1]) changelog_data = changelog.read() changelog.close() changelog = open(sys.argv[1], "w") - changelog.write(project + " (" + version + "-1)" + " unstable; urgency=low\n\n") + changelog.write(project + " (" + version + "-1)" + " " + distribution + "; urgency=low\n\n") changelog.write(" * Upstream development snapshot\n\n") changelog.write(" -- Swift Package Maintainer <packages@swift.im> " + email.utils.formatdate() + "\n") changelog.write("\n") diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control index 8df3e39..ec4bb29 100644 --- a/Swift/Packaging/Debian/debian/control +++ b/Swift/Packaging/Debian/debian/control @@ -1,5 +1,5 @@ Source: swift-im -Section: x11 +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), libexpat1-dev (>= 2.0.1), 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 @@ -8,6 +8,8 @@ Homepage: http://swift.im Package: swift-im Architecture: any +Section: net +Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: XMPP Client. The Swift IM client. @@ -15,6 +17,7 @@ Description: XMPP Client. Package: swift-im-dbg Architecture: any Section: debug +Priority: optional 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/package.sh b/Swift/Packaging/Debian/package.sh index b1de896..b296476 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -x +set -e -x export PYTHONPATH=../../../BuildTools/SCons VERSION=`../../../BuildTools/GetBuildVersion.py swift` @@ -13,7 +13,7 @@ if [ -z "$DEBIAN_VERSION" ]; then fi echo "Cleaning up old packages ..." -rm swift-im_* +rm -f swift-im_* rm -rf swift-im-* echo "Checking out a fresh copy ..." |