From b1245e5ecc0f1eb4e2b76edac0004005e8c9a514 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 26 Nov 2023 23:59:09 +0100
Subject: [PATCH] Post-release cleanups

---
 CMakeLists.txt                 |  2 +-
 COPYING                        |  9 +--------
 ChangeLog                      |  5 +++++
 NEWS                           |  9 +++++++++
 doc/doxygen/inside_release.doc | 15 +++++++--------
 docs/source/conf.py            |  2 +-
 setup.py                       |  2 +-
 sonar-project.properties       |  2 +-
 8 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa272ace4a..6889a1299a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "35")
-set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
diff --git a/COPYING b/COPYING
index c178bb31af..e57fce0e62 100644
--- a/COPYING
+++ b/COPYING
@@ -11,13 +11,6 @@ Copyright: 1999, Mark Martinec <mark.martinec@ijs.si.
 License: Artistic
 Comment: Heavily adapted by the SimGrid team but remains under the original license
 
-Files: src/xbt/mmalloc/*
-Copyright:
-  Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-  Copyright (C) 2003-2023. The SimGrid team.
-License: LGPL-2.1-only
-Comment: these files used to be part of gdb, but were removed there
-
 Files:
  teshsuite/smpi/mpich3-test/*
 Copyright:
@@ -175,7 +168,7 @@ License: other-reduce-rab
 
 Files: src/3rd-party/catch.hpp
 Copyright:
-  Copyright (c) 2022 Two Blue Cubes Ltd.
+ Copyright (c) 2022 Two Blue Cubes Ltd.
 License: BSL-1.0
 
 Files: teshsuite/smpi/MBI/*
diff --git a/ChangeLog b/ChangeLog
index 26a1e077c4..d41a80e34a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+SimGrid (3.35.1) not released (target: Feb 24)
+
+
+----------------------------------------------------------------------------
+
 SimGrid (3.35) November 23. 2023
 
 The "Thanks Giving up stateful model-checking" release. Stateless model checking remains.
diff --git a/NEWS b/NEWS
index 92b6e770fc..bbe6e5f6ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+
+                    _               _____  _____  __
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ / / /_
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \| '_ \
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | ___) | (_) |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/ \___/
+               (not released yet)
+
+
                     _               _____  _________
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ / ___|
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \___ \
diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc
index 43dbbdb2c9..d7e84f0e91 100644
--- a/doc/doxygen/inside_release.doc
+++ b/doc/doxygen/inside_release.doc
@@ -52,7 +52,7 @@ Please apply the following checklist before releasing.
 - Document the tag on framagit and ghub
   - Upload the files simgrid-3.XX.tar.gz and simgrid-doc-3_XX.zip
   - Add a link to the version of the ChangeLog that comes with this tag.
-    https://framagit.org/simgrid/simgrid/-/blob/v3.29/ChangeLog
+    https://framagit.org/simgrid/simgrid/-/blob/v3.35/ChangeLog
 - Update the website
   - emacs org/org-templates/level-0.org to change the release version and the tgz link.
   - jed .gitlab-ci.yml
@@ -67,7 +67,7 @@ Please apply the following checklist before releasing.
     rm -rf /tmp/pysimgrid && mkdir /tmp/pysimgrid && cp dist/simgrid-*.tar.gz /tmp/pysimgrid
     (cd /tmp/pysimgrid && tar xfz simgrid*.tar.gz && cd simgrid-*/ && python3 setup.py build)
   - Upload it to pypi (WARNING: you cannot modify uploaded files, ever)
-    twine upload dist/simgrid-*.tar.gz
+    twine upload dist/simgrid-*.tar.gz # User and password should be located in ~/.pypirc
 
 @subsection inside_release_c_publishing Publishing the release if it's a stable one (3.XX not 3.XX.Y)
 
@@ -79,18 +79,17 @@ Please apply the following checklist before releasing.
     - Link to the ChangeLog on framagit (the version of that tag)
  - Also mail some other lists (G5K users)
 - Release the debian package
-  - rm -f ../simgrid_3.*+dfsg.orig.tar.xz
+  - rm -f ../simgrid_3.*.orig.tar.xz
   - uscan # download the new version
-  - gbp import-orig ../simgrid_3.*+dfsg.orig.tar.xz
+  - gbp import-orig ../simgrid_3.*.orig.tar.xz
   - dch -i "New upstream release" # + copy the NEWS into debian/changelog
   - git mv debian/libsimgrid3.XX.install debian/libsimgrid3.XY.install
   - edit debian/control: s/simgrid3.XX/simgrid3.XY/
 - Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo
 - Push the stable branch to github to rebuild and push the stable Docker images
-  - It downloads the latest tag on framagit
-  - If it was done automatically at some point, make sure that it's really the latest stable, 
-    as things get sometimes out of synch to the point that the github action re-build the previous release. 
-    If this happens, just rerun the docker-stable action. Nothing should have been broken.
+  - It downloads the latest tag on framagit, but sometimes gets out of synch.
+    Make sure that it's really the latest stable, as it sometimes rebuilds the previous release.
+    If this happens, just rerun the docker-stable action. Nothing should get hurt by the rebuild.
   - Doing the same manually: cd tools/docker && make stable && make tuto-s4u tuto-smpi
     (tuto-mc is not based on simgrid/stable but rebuilds from the git)
   - Once the new images are built, trigger a rebuild of the simgrid-template-{s4u,smpi} repositories on framagit
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c3d76300de..96b64bf36f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,7 +34,7 @@ copyright = u'2002-2023, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version
-version = u'3.35'
+version = u'3.35.1'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/setup.py b/setup.py
index 122b1c8d22..241dd33b05 100755
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name='simgrid',
-    version='3.35',
+    version='3.35.1',
     author='Da SimGrid Team',
     author_email='simgrid-community@inria.fr',
     description='Toolkit for scalable simulation of distributed applications',
diff --git a/sonar-project.properties b/sonar-project.properties
index 69ebaa1b69..a9d571e93a 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -4,7 +4,7 @@
 sonar.organization=simgrid
 sonar.projectKey=simgrid_simgrid
 sonar.projectName=SimGrid
-sonar.projectVersion=3.35
+sonar.projectVersion=3.35.1
 
 sonar.links.homepage=https://simgrid.org
 sonar.links.issue=https://framagit.org/simgrid/simgrid/issues
-- 
2.20.1