Make bootstrap.py work again and work on Ubuntu Xenial.

Added *cxx.py files to Manifest.in, removed VCS modules that were
deleted, and updated debian package build information.

6 files changed, 20 insertions, 13 deletions

diff --git a/SConstruct b/SConstruct
index 5e84d98..08f7da5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -443,7 +443,6 @@ env = Environment(
                    MONTH_YEAR          = month_year,
                    REVISION            = revision,
                    VERSION             = version,
-                   DH_COMPAT           = 2,
 
                    TAR_HFLAG           = tar_hflag,
 
@@ -503,7 +502,8 @@ python_scons = {
 
         'debian_deps'   : [
                             'debian/changelog',
-                            'debian/control',
+                            'debian/compat',
+                            'debian/control',	    
                             'debian/copyright',
                             'debian/dirs',
                             'debian/docs',
@@ -625,6 +625,7 @@ scons_script = {
 
         'debian_deps'   : [
                             'debian/changelog',
+                            'debian/compat',
                             'debian/control',
                             'debian/copyright',
                             'debian/dirs',
@@ -669,6 +670,7 @@ scons = {
 
         'debian_deps'   : [
                             'debian/changelog',
+                            'debian/compat',
                             'debian/control',
                             'debian/copyright',
                             'debian/dirs',
diff --git a/debian/changelog b/debian/changelog
index e3ab00c..0808546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scons (2.5.1) unstable; urgency=low
+
+  * Maintenance Release
+
+ -- William Deegan <bill@baddogconsulting.com>  Mon, 03 Nov 2016 13:37:42 -0700
+
 scons (2.5.0) unstable; urgency=low
 
   * Feature Release
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index c8ebf4c..afba6f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: scons
 Section: devel
 Priority: optional
 Maintainer: Moshe Zadka <moshez@debian.org>
-Build-Depends-Indep: debhelper (>> 2.0.0), python-dev (>> 2.4)
+Build-Depends-Indep: debhelper (>> 5.0.0), python-dev (>> 2.4)
 Standards-Version: 3.5.6
 
 Package: scons
diff --git a/debian/rules b/debian/rules
index 1effa02..9d83723 100644
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,6 @@ PYTHON=$(PYTHON_PATH)$(PYTHON_VERSION)
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -41,7 +39,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/scons.
@@ -106,7 +104,7 @@ binary-indep: build install
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	DH_COMPAT=$(DH_COMPAT) dh_builddeb $(BUILDDEB_OPTIONS)
+	dh_builddeb $(BUILDDEB_OPTIONS)
 
 # Build architecture-dependent files here.
 binary-arch: build install
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index f7d5aa7..af91b7c 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -53,6 +53,7 @@ SCons/Taskmaster.py
 SCons/Tool/__init__.py
 SCons/Tool/386asm.py
 SCons/Tool/aixc++.py
+SCons/Tool/aixcxx.py
 SCons/Tool/aixcc.py
 SCons/Tool/aixf77.py
 SCons/Tool/aixlink.py
@@ -60,12 +61,11 @@ SCons/Tool/applelink.py
 SCons/Tool/ar.py
 SCons/Tool/as.py
 SCons/Tool/bcc32.py
-SCons/Tool/BitKeeper.py
 SCons/Tool/c++.py
+SCons/Tool/cxx.py
 SCons/Tool/cc.py
 SCons/Tool/cyglink.py
 SCons/Tool/cvf.py
-SCons/Tool/CVS.py
 SCons/Tool/DCommon.py
 SCons/Tool/default.py
 SCons/Tool/dmd.py
@@ -81,6 +81,7 @@ SCons/Tool/filesystem.py
 SCons/Tool/fortran.py
 SCons/Tool/FortranCommon.py
 SCons/Tool/g++.py
+SCons/Tool/gxx.py
 SCons/Tool/g77.py
 SCons/Tool/gas.py
 SCons/Tool/gcc.py
@@ -89,6 +90,7 @@ SCons/Tool/gfortran.py
 SCons/Tool/gnulink.py
 SCons/Tool/gs.py
 SCons/Tool/hpc++.py
+SCons/Tool/hpcxx.py
 SCons/Tool/hpcc.py
 SCons/Tool/hplink.py
 SCons/Tool/icc.py
@@ -132,22 +134,20 @@ SCons/Tool/packaging/*.py
 SCons/Tool/pdf.py
 SCons/Tool/pdflatex.py
 SCons/Tool/pdftex.py
-SCons/Tool/Perforce.py
 SCons/Tool/PharLapCommon.py
 SCons/Tool/qt.py
-SCons/Tool/RCS.py
 SCons/Tool/rmic.py
 SCons/Tool/rpcgen.py
 SCons/Tool/rpm.py
 SCons/Tool/rpmutils.py
-SCons/Tool/SCCS.py
 SCons/Tool/sgiar.py
 SCons/Tool/sgic++.py
+SCons/Tool/sgicxx.py
 SCons/Tool/sgicc.py
 SCons/Tool/sgilink.py
-SCons/Tool/Subversion.py
 SCons/Tool/sunar.py
 SCons/Tool/sunc++.py
+SCons/Tool/suncxx.py
 SCons/Tool/suncc.py
 SCons/Tool/sunf77.py
 SCons/Tool/sunf90.py