From c6ec8578116208afdc9375dcb57ae5b830fc5f23 Mon Sep 17 00:00:00 2001
From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
Date: Tue, 17 Mar 2020 09:56:17 +0000
Subject: [PATCH] Update version numbers etc for v1.2.0

---
 .VERSION        |  2 +-
 CHANGELOG.md    |  9 +++++++++
 PackageInfo.g   | 19 +++++++++++++++----
 VERSIONS        |  1 +
 doc/z-chap0.xml |  1 +
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.VERSION b/.VERSION
index 45a1b3f44..26aaba0e8 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-1.1.2
+1.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 497922e5d..b3338df5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ Torpey, Wilf A. Wilson et al.
 
 Licensing information can be found in the `LICENSE` file.
 
+## Version 1.2.0 (released 27/03/2020)
+
+This is a minor release adding some new features to Digraphs, principally
+functionality relating to computing matchings by Reinis Ciprons, and an
+implementation of Dijkstra's algorithm for shortest paths by 
+[Markus Pfeiffer][] and [Maria Tsalakou][], and methods for producing a concise
+string representation of a digraph by Murray Whyte.
+
 ## Version 1.1.2 (released 16/03/2020)
 
 This is a minor release adding the new configuration flag
@@ -739,5 +747,6 @@ Pre-release version that was not made publicly available.
 [Julius Jonusas]: http://julius.jonusas.work
 [Jan De Beule]: http://homepages.vub.ac.be/~jdbeule
 [Markus Pfeiffer]: https://www.morphism.de/~markusp
+[Maria Tsalakou]: https://mariatsalakou.github.io
 [Chris Jefferson]: https://caj.host.cs.st-andrews.ac.uk
 [bliss]: http://www.tcs.hut.fi/Software/bliss/
diff --git a/PackageInfo.g b/PackageInfo.g
index eb6626ab2..fdd67c2af 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -9,12 +9,12 @@
 ##
 
 ##  <#GAPDoc Label="PKGVERSIONDATA">
-##  <!ENTITY VERSION        "1.1.2">
+##  <!ENTITY VERSION        "1.2.0">
 ##  <!ENTITY GAPVERS        "4.9.0">
 ##  <!ENTITY GRAPEVERS      "4.8.1">
 ##  <!ENTITY IOVERS         "4.5.1">
 ##  <!ENTITY ORBVERS        "4.8.2">
-##  <!ENTITY ARCHIVENAME    "digraphs-1.1.2">
+##  <!ENTITY ARCHIVENAME    "digraphs-1.2.0">
 ##  <!ENTITY COPYRIGHTYEARS "2014-20">
 ##  <#/GAPDoc>
 
@@ -26,8 +26,8 @@ _STANDREWSCS := Concatenation(["Jack Cole Building, North Haugh, ",
 SetPackageInfo(rec(
 PackageName := "Digraphs",
 Subtitle := "Graphs, digraphs, and multidigraphs in GAP",
-Version := "1.2.0dev",
-Date := "16/03/2020",  # dd/mm/yyyy format
+Version := "1.2.0",
+Date := "27/03/2020",  # dd/mm/yyyy format
 License := "GPL-3.0-or-later",
 ArchiveFormats := ".tar.gz",
 
@@ -177,6 +177,17 @@ Persons := [
     Place         := "St Andrews",
     Institution   := "University of St Andrews"),
 
+  rec(
+    LastName      := "Tsalakou",
+    FirstNames    := "Maria",
+    IsAuthor      := true,
+    IsMaintainer  := false,
+    Email         := "mt200@st-andrews.ac.uk",
+    WWWHome       := "https://mariatsalakou.github.io/",
+    PostalAddress := _STANDREWSMATHS,
+    Place         := "St Andrews",
+    Institution   := "University of St Andrews"),
+
   rec(
     LastName      := "Whyte",
     FirstNames    := "Murray",
diff --git a/VERSIONS b/VERSIONS
index 9a046d156..6126dc736 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -8,6 +8,7 @@
 #############################################################################
 ##
 
+release 1.2.0 - 27/03/2020
 release 1.1.2 - 16/03/2020
 release 1.1.1 - 29/01/2020
 release 1.1.0 - 25/01/2020
diff --git a/doc/z-chap0.xml b/doc/z-chap0.xml
index f7596a88d..4c7ba6f04 100644
--- a/doc/z-chap0.xml
+++ b/doc/z-chap0.xml
@@ -25,6 +25,7 @@
     <Item>Markus Pfeiffer,</Item>
     <Item>Chris Russell,</Item>
     <Item>Finn Smith, and</Item>
+    <Item>Maria Tsalakou,</Item>
     <Item>Murray Whyte.</Item>
   </List>