Packaging updates.

Author: kpeeters

README.rst

@@ -448,6 +448,11 @@ It should be possible to simply copy the C:\Cadabra folder to a
 different machine and run it there (that is essentially what the
 binary installer does).
 
+To create an installer, make sure you have Inno installer
+available. Then run, from the `cadabra2/config` directory::
+
+  "C:\Program Files (x86)\Inno Setup 6\ISCC" install_script.iss
+
 
 Building a Jupyter kernel
 -------------------------

cmake/packaging.cmake

@@ -44,6 +44,10 @@ if(EXISTS "/etc/redhat-release")
 			message("-- This is a Fedora 32 system")
 			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, pcre, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
 			set(CPACK_SYSTEM_NAME "fedora32")
+		 elseif(LINUX_ISSUE MATCHES "33")
+			message("-- This is a Fedora 33 system")
+			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, pcre, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
+			set(CPACK_SYSTEM_NAME "fedora33")
 		 elseif(LINUX_ISSUE MATCHES "24")
 			message("-- This is a Fedora 24 system")
 			set(CPACK_RPM_PACKAGE_REQUIRES   "python3-libs, pcre, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")

config/buildbot.sh

@@ -79,6 +79,7 @@ runbuild "Ubuntu_18.04"        ".deb" 7017 ubuntu1804
 runbuild "Fedora_28"           ".rpm" 7020 fedora28
 runbuild "Fedora_29"           ".rpm" 7025 fedora29               
 runbuild "Fedora_32"           ".rpm" 7027 fedora32
+runbuild "Fedora_33"           ".rpm" 7031 fedora33
 runbuild "Mint_19"             ".deb" 7022 mint19
 runbuild "OpenSUSE_15"         ".rpm" 7024 opensuse150
 runbuild "OpenSUSE_Tumbleweed" ".rpm" 7023 opensusetw

web2/cadabra2/source/changelog.html

@@ -25,6 +25,7 @@ <h3>github master (2.3.5)</h3>
   without path settings, and the Jupyter kernel will work nicely with
     the Jupyter package in Debian. </li>
   <li>Fix display of lists containing <tt>Ex</tt> objects.</li>
+  <li>Fix import of Jupyter notebooks.</li>
 </ul>
 
 <a name="2.3.4"></a>