diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-12 23:25:31 -0400 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-12 23:25:31 -0400 |
commit | c6b838a9c8dd8b911637cacbace03419f89001fa (patch) | |
tree | d623ba107f87296c3b7101d5d798e767125ba2f4 | |
parent | fca1fdbf19a60e04eb1909d7b6af5130b3319c9f (diff) | |
download | scons-c6b838a9c8dd8b911637cacbace03419f89001fa.tar.gz |
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.
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/postinst | 2 | ||||
-rw-r--r-- | debian/rules | 4 |
4 files changed, 11 insertions, 4 deletions
@@ -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 441f5729..af58281d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (2.2.0) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner <garyo@oberbrunner.com> 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 ed8ed5c1..6a7d3355 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 1eaf4de5..1effa02e 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 |