Merge branch 'swift-1.x'

* swift-1.x: Prioritize version files over git version. Improve the description in the Debian control file. Use a custom debian changelog.
author: Remko Tronçon <git@el-tramo.be> 2011-06-20 18:32:23 (GMT)
committer: Remko Tronçon <git@el-tramo.be> 2011-06-20 18:32:23 (GMT)
commit: 4e72d079d8aa012185e445f334146f1e91db6a2d (patch)
tree: 40a1595bd30f93bbd628fbf52d92a523163b8206
parent: d0f5efabfe61347df011c3dab5e47a45b53e8b22 (diff)
parent: d35f132d31241e7c2f09b4b2588a02c8a6ae249c (diff)
download: swift-contrib-4e72d079d8aa012185e445f334146f1e91db6a2d.zip
swift-contrib-4e72d079d8aa012185e445f334146f1e91db6a2d.tar.bz2
4 files changed, 50 insertions, 22 deletions
diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py
index 993536a..57ef96d 100644
--- a/BuildTools/SCons/Version.py
+++ b/BuildTools/SCons/Version.py
@@ -18,16 +18,15 @@ def git(cmd) :
   return gitVersion if p.wait() == 0 else None
 
 def getBuildVersion(root, project) :
+  versionFilename = os.path.join(root, "VERSION." + project)
+  if os.path.isfile(versionFilename) :
+    f = open(versionFilename)
+    version = f.read().strip()
+    f.close()
+    return version
+
   gitVersion = getGitBuildVersion(project) 
   if gitVersion :
     return gitVersion
-  else :
-    versionFilename = os.path.join(root, "VERSION." + project)
-    if os.path.isfile(versionFilename) :
-      f = open(versionFilename)
-      version = f.read().strip()
-      f.close()
-      return version
-    else :
-      # TODO: Add the current branch
-      return datetime.date.today().strftime("%Y%m%d")
+
+  return datetime.date.today().strftime("%Y%m%d")
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
new file mode 100644
index 0000000..f722dce
--- /dev/null
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -0,0 +1,5 @@
+swift-im (1.1-1) unstable; urgency=low
+
+  * Initial release. Closes: #631002
+
+ -- Swift Package Maintainer <packages@swift.im>  Mon, 20 Jun 2011 16:24:48 -0000
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 6373a00..2ae7281 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -13,24 +13,38 @@ Architecture: any
 Section: net
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: XMPP Library.
-	The Swiften XMPP library.
+Description: The Swiften XMPP Library.
+ Swiften is a robust, high-quality, standards-compliant, cross-platform,
+ and performant C++ library for implementing XMPP applications. Swiften
+ is used as the back-end library for the Swift Instant Messaging client.
 
 Package: libswiften%SWIFTEN_SOVERSION%-dev
 Architecture: any
 Section: libdevel
 Priority: optional
 Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: XMPP Library.
-	The Swiften XMPP library.
+Description: The Swiften XMPP Library.
+ Swiften is a robust, high-quality, standards-compliant, cross-platform,
+ and performant C++ library for implementing XMPP applications. Swiften
+ is used as the back-end library for the Swift Instant Messaging client.
+ .
+ This package contains the header development files and programs for 
+ developing with Swiften.
 
 Package: swift-im
 Architecture: any
 Section: net
 Priority: optional
 Depends: libswiften%SWIFTEN_SOVERSION% (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: XMPP Client.
-	The Swift IM client.
+Description: The Swift Instant Messaging client.
+ Swift is a free instant messaging client. It concentrates on making
+ the most-used features easily accessible, supporting
+ internationalisation, private and group chats, together with features
+ for security-conscious organisations including Security Labelling.
+ .
+ Swift uses the XMPP protocol and so supports both the public Jabber
+ network and closed XMPP services, such as those found in many
+ organisations.
 
 Package: swift-im-dbg
 Architecture: any
@@ -38,4 +52,5 @@ Section: debug
 Priority: extra
 Depends: swift-im (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for swift-im.
-	The Swift IM client.
+ This package contains the debugging symbols for debugging Swift
+ and Swiften applications.
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index 5f7d911..5740022 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -3,7 +3,7 @@
 set -e -x
 
 export PYTHONPATH=../../../BuildTools/SCons
-VERSION=`../../../BuildTools/GetBuildVersion.py swift`
+VERSION=${VERSION:=`../../../BuildTools/GetBuildVersion.py swift`}
 DEBIAN_VERSION=`../../../BuildTools/DebianizeVersion.py $VERSION`
 DIRNAME=swift-im-$DEBIAN_VERSION
 SWIFTEN_SOVERSION=`../../../BuildTools/GetBuildVersion.py swift --major`
@@ -22,18 +22,23 @@ echo "Checking out a fresh copy ..."
 rm -rf $DIRNAME
 git clone ../../../.git $DIRNAME
 
-# Clean out 3rdParty
+# Remove development files & 3rdParty files
+rm -rf $DIRNAME/.git
+find $DIRNAME -name .gitignore | xargs rm -f
 find $DIRNAME/3rdParty -type f | grep -v uuid | grep -v SConscript | xargs rm -f
 find $DIRNAME/3rdParty -depth -empty -type d -exec rmdir {} \;
 rm -rf $DIRNAME/3rdParty/SCons
 
+# Initialize the build version
+echo $VERSION > $DIRNAME/VERSION.swift
+
 # Fork local Boost UUID copy
 # FIXME: This shouldn't be necessary, but SCons isn't picking up the generated headers for compilation
 mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost
 cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost
 
 # Create orig tarball for debuild
-tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz --exclude=$DIRNAME/.git $DIRNAME
+tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz $DIRNAME
 
 # Detect dependencies
 WEBKIT_DEPENDENCY=", libqtwebkit-dev (>= 2.0.0)"
@@ -44,7 +49,11 @@ fi
 
 # Initialize debian files
 ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
-../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
+if [ -z "$CHANGELOG" ]; then
+	../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
+else
+	cp $CHANGELOG $DIRNAME/debian/changelog
+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
 mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install
 mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install
@@ -53,6 +62,6 @@ mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SO
 # Build
 cd $DIRNAME
 set +e
-debuild -i -I
+debuild -i -I --lintian-opts --pedantic
 #dpkg-buildpackage -S -rfakeroot -i -I
 #dpkg-buildpackage -b -rfakeroot -i -I
author	Remko Tronçon <git@el-tramo.be>	2011-06-20 18:32:23 (GMT)
committer	Remko Tronçon <git@el-tramo.be>	2011-06-20 18:32:23 (GMT)
commit	4e72d079d8aa012185e445f334146f1e91db6a2d (patch)
tree	40a1595bd30f93bbd628fbf52d92a523163b8206
parent	d0f5efabfe61347df011c3dab5e47a45b53e8b22 (diff)
parent	d35f132d31241e7c2f09b4b2588a02c8a6ae249c (diff)
download	swift-contrib-4e72d079d8aa012185e445f334146f1e91db6a2d.zip swift-contrib-4e72d079d8aa012185e445f334146f1e91db6a2d.tar.bz2