From fa19ee19b1048e25a8915c6e9c0c7bef11d28481 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 12 Aug 2012 23:25:31 -0400 Subject: Fix Debian build process. Each release needs to update debian/changelog, and it needs to be in a particular format since the deb build process reads and parses it to get the version number in the .deb. Also fixed a few other deb-build-related errors. --- SConstruct | 2 +- debian/changelog | 7 +++++++ debian/postinst | 2 +- debian/rules | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index fd51396..46a7daf 100644 --- a/SConstruct +++ b/SConstruct @@ -1026,7 +1026,7 @@ for p in [ scons ]: if dh_builddeb and fakeroot: # Our Debian packaging builds directly into build/dist, # so we don't need to Install() the .debs. - deb = os.path.join(build_dir, 'dist', "%s_%s-1_all.deb" % (pkg, version)) + deb = os.path.join(build_dir, 'dist', "%s_%s_all.deb" % (pkg, version)) for d in p['debian_deps']: b = env.SCons_revision(os.path.join(build, d), d) env.Depends(deb, b) diff --git a/debian/changelog b/debian/changelog index 441f572..af58281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (2.2.0) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner Sun, 12 Aug 2012 09:00:00 -0500 + + scons (0.97) unstable; urgency=low * Eighth beta release. diff --git a/debian/postinst b/debian/postinst index ed8ed5c..6a7d335 100644 --- a/debian/postinst +++ b/debian/postinst @@ -7,7 +7,7 @@ if [ "$1" = "configure" ]; then fi NAME=scons -PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f0-2` +PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f1-2` PYTHON_EXE_NAME=`which python$PYTHON_VERSION` case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index 1eaf4de..1effa02 100644 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ # Overridable variables added to support building test .deb files # as part of routine SCons builds. --SK BUILDDEB_OPTIONS= -PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f0-2` +PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f1-2` PYTHON_PATH=/usr/bin/python PYTHON=$(PYTHON_PATH)$(PYTHON_VERSION) ####### @@ -55,7 +55,7 @@ install: build @######## mkdir -p debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ rm -rf debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/SCons - cp -r build/lib/SCons debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ + cp -r build/lib*/SCons debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ mkdir -p debian/scons/usr/bin/ rm -f debian/scons/usr/bin/scons -- cgit v0.12