Gary Oberbrunner avatar Gary Oberbrunner committed 7b014a5

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.

Comments (0)

Files changed (4)

     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)
+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.
 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)
 # 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)
 #######
 	@########
 	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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.