From a9230f481df1323c6a0b13d82a30f5554f19c0cb Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Tue, 6 Oct 2020 19:33:40 -0700
Subject: [PATCH 1/5] Merge ns-3.32-release branch

---
 RELEASE_NOTES | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 5e6566a25..ba4fe6a77 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -14,7 +14,8 @@ Release 3.32
 
 Availability
 ------------
-This release is not yet published.
+This release is available from:
+https://www.nsnam.org/release/ns-allinone-3.32.tar.bz2
 
 Supported platforms
 -------------------

From 23bb16aef19d3dc55d59d01f1dfc2d9a53abbb2c Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Tue, 6 Oct 2020 19:39:08 -0700
Subject: [PATCH 2/5] Update CHANGES.html and RELEASE_NOTES

---
 CHANGES.html  | 19 +++++++++++++++++++
 RELEASE_NOTES | 10 ++++++++++
 2 files changed, 29 insertions(+)

diff --git a/CHANGES.html b/CHANGES.html
index e7fe4ad86..78c534a6d 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -50,6 +50,25 @@ the cracks, unfortunately.  If you, as a user, can suggest improvements
 to this file based on your experience, please contribute a patch or drop
 us a note on ns-developers mailing list.</p>
 
+<hr>
+<h1>Changes from ns-3.32 to ns-3.33</h1>
+<h2>New API:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changes to existing API:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changes to build system:</h2>
+<ul>
+<li></li>
+</ul>
+<h2>Changed behavior:</h2>
+<ul>
+<li></li>
+</ul>
+
 <hr>
 <h1>Changes from ns-3.31 to ns-3.32</h1>
 <h2>New API:</h2>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ba4fe6a77..b7a32ab38 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -9,6 +9,16 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3-dev
+=============
+
+New user-visible features
+-------------------------
+
+Bugs fixed
+----------
+
+
 Release 3.32
 ============
 

From f7871790c3d8ec858846fd78fbc827d11cc49506 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 8 Oct 2020 10:37:29 -0700
Subject: [PATCH 3/5] bindings: Update pybindgen version

---
 bindings/python/wscript | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bindings/python/wscript b/bindings/python/wscript
index 94ab85f98..1cc170a91 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -14,7 +14,13 @@ from waflib.Errors import WafError
 # after = TaskGen.after
 
 # https://github.com/gjcarneiro/pybindgen
-REQUIRED_PYBINDGEN_VERSION = '0.21.0'
+# If specifying a released pybindgen version, specify the required PYBINDGEN
+# version as, e.g. '0.21.0'
+# If specifying a commit on the development tree, specify it like this based
+# on 'git describe --tags' command.  Example, if the latest release was 0.21.0,
+# and 'git decribe --tags' reports "0.21.0-6-g8e7c0a9", then write the
+# PYBINDGEN version string below as '0.21.0.post6+ng8e7c0a9'
+REQUIRED_PYBINDGEN_VERSION = '0.21.0.post6+ng8e7c0a9'
 REQUIRED_PYGCCXML_VERSION = (1, 9, 1)
 REQUIRED_CASTXML_VERSION = '0.2'
 

From 7a76d5fb8cfd3f249cb157ea99ca471fd174356e Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 8 Oct 2020 11:58:48 -0700
Subject: [PATCH 4/5] bindings: Print out more helpful error message

---
 bindings/python/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bindings/python/wscript b/bindings/python/wscript
index 1cc170a91..a55a1757d 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -206,7 +206,7 @@ def configure(conf):
             Logs.warn("pybindgen (found %r), (need %r)" %
                       (pybindgen_version, REQUIRED_PYBINDGEN_VERSION))
             conf.report_optional_feature("python", "Python Bindings", False,
-                                         "PyBindGen version not correct and newer version could not be retrieved")
+                                         "PyBindGen found but version %s is not the required version %s" % (pybindgen_version, REQUIRED_PYBINDGEN_VERSION))
             return
 
 

From 81a173927c97d9070cb0f278709dbf0063565a9c Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 8 Oct 2020 13:32:06 -0700
Subject: [PATCH 5/5] bindings: Update required pygccxml version

---
 bindings/python/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bindings/python/wscript b/bindings/python/wscript
index a55a1757d..61ce973d4 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -21,7 +21,7 @@ from waflib.Errors import WafError
 # and 'git decribe --tags' reports "0.21.0-6-g8e7c0a9", then write the
 # PYBINDGEN version string below as '0.21.0.post6+ng8e7c0a9'
 REQUIRED_PYBINDGEN_VERSION = '0.21.0.post6+ng8e7c0a9'
-REQUIRED_PYGCCXML_VERSION = (1, 9, 1)
+REQUIRED_PYGCCXML_VERSION = (2, 0, 1)
 REQUIRED_CASTXML_VERSION = '0.2'
 
 RUN_ME=-3