Improvements to Debian packaging.

Allows packaging of just source, and script for using pbuilder. Adding build-arch and build-indep targets to satisfy lintian Fix caps on Olly's surname in Debian packaging Add script to build with non-generated changelog
author: Kevin Smith <git@kismith.co.uk> 2012-04-07 22:30:31 (GMT)
committer: Kevin Smith <git@kismith.co.uk> 2012-04-25 12:41:07 (GMT)
commit: b997b3cdc0ebd32e8be97e5c6265c6c15de7706a (patch)
tree: 3d8123cc93163d763511a996c4f5921efdbb176b
parent: c47d084c27bb92ad861a75538f9eafa8a232b88c (diff)
download: swift-contrib-b997b3cdc0ebd32e8be97e5c6265c6c15de7706a.zip
swift-contrib-b997b3cdc0ebd32e8be97e5c6265c6c15de7706a.tar.bz2
8 files changed, 52 insertions, 8 deletions
diff --git a/BuildTools/UpdateDebianChangelog.py b/BuildTools/UpdateDebianChangelog.py
index 20e72da..f7d9e65 100755
--- a/BuildTools/UpdateDebianChangelog.py
+++ b/BuildTools/UpdateDebianChangelog.py
@@ -34,7 +34,7 @@ if last_version != version :
   changelog = open(sys.argv[1], "w")
   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(" -- Swift Package Maintainers <packages@swift.im>  " + email.utils.formatdate() + "\n")
   changelog.write("\n")
   changelog.write(changelog_data)
   changelog.close()
diff --git a/Swift/Packaging/Debian/build_for_debian.sh b/Swift/Packaging/Debian/build_for_debian.sh
new file mode 100755
index 0000000..3d79177
--- /dev/null
+++ b/Swift/Packaging/Debian/build_for_debian.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "** CHECK YOU'VE UPDATED THE CHANGELOG **"
+export CHANGELOG=changelog.debian-unstable
+export SWIFT_DEBUILD_FLAGS="-S"
+
+./package.sh
+
+for arch in i386 amd64; do
+	pbuilder-dist sid $arch build *.dsc
+done
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index 3e6cd89..c8b4861 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,6 +1,7 @@
-swift-im (1.1-1) unstable; urgency=low
+swift-im (2.0~alpha+dev629-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
+ -- Kevin Smith <kevin@kismith.co.uk>  Wed, 25 Apr 2012 09:55:52 -0000
+
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 93ea764..51a3cf3 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -1,8 +1,8 @@
 Source: swift-im
 Section: net
 Priority: optional
-Maintainer: Swift Package Maintainer <packages@swift.im>
-Uploaders: Remko Tronçon <dev@el-tramo.be>, Kevin Smith <debian@kismith.co.uk>, Olly betts <olly@survex.com>
+Maintainer: Swift Package Maintainers <packages@swift.im>
+Uploaders: Remko Tronçon <dev@el-tramo.be>, Kevin Smith <kevin@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.3
 Vcs-Git: git://swift.im/swift
diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright
index f54be9b..99eb7cc 100644
--- a/Swift/Packaging/Debian/debian/copyright
+++ b/Swift/Packaging/Debian/debian/copyright
@@ -3,7 +3,7 @@ with help from Olly Betts <olly@survex.com>.
 
 The upstream sources were obtained from http://swift.im.
 
-Copyright (C) 2010-2011 Kevin Smith and Remko Tronçon
+Copyright (C) 2010-2012 Kevin Smith and Remko Tronçon
 Licensed under the GNU General Public License.
 See /usr/share/common-licenses/GPL-3 for the full license.
 
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index 5a7248e..d05e34a 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -45,4 +45,7 @@ binary-arch: install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+build-arch: build
+build-indep: build
+.PHONY: build clean binary-indep binary-arch binary install configure build-arch build-indep
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index b825d2f..1edc4a0 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -72,7 +72,7 @@ fi
 # 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
+if [ "$DISTRIBUTION" = "Debian-squeeze" -o "$DISTRIBUTION" = "Ubuntu-lucid" -o ! -z "$SWIFT_FORCE_LUCID" ]; then
 	WEBKIT_DEPENDENCY=""
 fi
 
diff --git a/Swift/Packaging/Debian/package_all_platforms.sh b/Swift/Packaging/Debian/package_all_platforms.sh
new file mode 100755
index 0000000..47c6b82
--- /dev/null
+++ b/Swift/Packaging/Debian/package_all_platforms.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+## To get to this stage you need to already have the pbuilder-dist stuff installed, and have already run:
+# for distro in squeeze sid lucid maverick; do
+#  for arch in i386 amd64; do
+#   pbuilder-dist $distro $arch create
+#  done
+# done
+
+export SWIFT_DEBUILD_FLAGS="-S"
+export SWIFT_FORCE_LUCID="yep"
+
+./package.sh
+
+for distro in lucid squeeze; do
+	for arch in i386 amd64; do
+		pbuilder-dist $distro $arch build *.dsc
+	done
+done
+
+unset SWIFT_FORCE_LUCID
+./package.sh
+
+for distro in maverick sid; do
+	for arch in i386 amd64; do
+		pbuilder-dist $distro $arch build *.dsc
+	done
+done
+
author	Kevin Smith <git@kismith.co.uk>	2012-04-07 22:30:31 (GMT)
committer	Kevin Smith <git@kismith.co.uk>	2012-04-25 12:41:07 (GMT)
commit	b997b3cdc0ebd32e8be97e5c6265c6c15de7706a (patch)
tree	3d8123cc93163d763511a996c4f5921efdbb176b
parent	c47d084c27bb92ad861a75538f9eafa8a232b88c (diff)
download	swift-contrib-b997b3cdc0ebd32e8be97e5c6265c6c15de7706a.zip swift-contrib-b997b3cdc0ebd32e8be97e5c6265c6c15de7706a.tar.bz2