From 63d78a1cb3e9b22d10870f60e1f80f640e68bb9d Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Thu, 25 May 2023 17:08:38 -0700
Subject: [PATCH 1/2] Update project urls

---
 .gitlab-ci.yml                                       | 3 ++-
 CONTRIBUTING.md                                      | 2 +-
 CONTRIBUTORS.md                                      | 1 +
 README.md                                            | 6 +++---
 data/io.gitlab.mtmiller.octave-pythonic.metainfo.xml | 5 +++--
 inst/pythonic.m                                      | 6 ++++--
 src/oct-py-util.cc                                   | 4 ++--
 src/pyexec.cc                                        | 4 ++--
 tests/types.tst                                      | 3 ++-
 9 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d279f1..b279072 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 ## SPDX-License-Identifier: BSD-3-Clause
-## Copyright (C) 2019 Mike Miller
+## Copyright (C) 2019-2021 Mike Miller
+## Copyright (C) 2019, 2023 Colin B. Macdonald
 ##
 ## .gitlab-ci.yml - GitLab CI configuration for octave-pythonic
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d0205e4..a959f13 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ and interact within this project.
 ## Community
 
 All project interaction takes place primarily on the GitLab project
-[mtmiller/octave-pythonic](https://gitlab.com/mtmiller/octave-pythonic).
+[gnu-octave/octave-pythonic](https://gitlab.com/gnu-octave/octave-pythonic).
 
 There is also a
 [Python interface wiki page](https://wiki.octave.org/Python_interface) on the
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e8ccdd0..b2ec81c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -7,6 +7,7 @@
 - Colin Macdonald
 - Mike Miller
 - Kai Torben Ohlhus
+- Vishnu Parammal
 - Abhinav Tripathi
 
 ---
diff --git a/README.md b/README.md
index d0b3247..d90ee7a 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ The goals of this package include
 This package also supports building, using, and testing directly from the code
 repository.
 
-    git clone https://gitlab.com/mtmiller/octave-pythonic.git
+    git clone https://gitlab.com/gnu-octave/octave-pythonic.git
     cd octave-pythonic
     make
     make check
@@ -101,7 +101,7 @@ example to build with two different versions of Python
 ## Get Involved
 
 This Octave package is maintained at
-[mtmiller/octave-pythonic on GitLab][pythonic].
+[gnu-octave/octave-pythonic on GitLab][pythonic].
 
 If you want to contribute in any way and help make this package better, please
 read the [contribution guidelines](CONTRIBUTING.md).
@@ -118,4 +118,4 @@ option) any later version. See [COPYING](COPYING) for the full license text.
 [fsf]: https://www.fsf.org/
 [gpl]: https://www.gnu.org/licenses/gpl-3.0.html
 [python-dev]: https://packages.debian.org/search?keywords=python-dev
-[pythonic]: https://gitlab.com/mtmiller/octave-pythonic
+[pythonic]: https://gitlab.com/gnu-octave/octave-pythonic
diff --git a/data/io.gitlab.mtmiller.octave-pythonic.metainfo.xml b/data/io.gitlab.mtmiller.octave-pythonic.metainfo.xml
index f647584..bc70e0a 100644
--- a/data/io.gitlab.mtmiller.octave-pythonic.metainfo.xml
+++ b/data/io.gitlab.mtmiller.octave-pythonic.metainfo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- SPDX-License-Identifier: FSFAP -->
 <!-- Copyright (C) 2019 Mike Miller -->
+<!-- Copyright (C) 2023 Colin B. Macdonald -->
 <!--
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -30,7 +31,7 @@ without any warranty.
     </p>
   </description>
 
-  <url type="bugtracker">https://gitlab.com/mtmiller/octave-pythonic/issues</url>
-  <url type="homepage">https://gitlab.com/mtmiller/octave-pythonic</url>
+  <url type="bugtracker">https://gitlab.com/gnu-octave/octave-pythonic/issues</url>
+  <url type="homepage">https://gitlab.com/gnu-octave/octave-pythonic</url>
   <update_contact>mtmiller@octave.org</update_contact>
 </component>
diff --git a/inst/pythonic.m b/inst/pythonic.m
index 35da471..8f00cd8 100644
--- a/inst/pythonic.m
+++ b/inst/pythonic.m
@@ -1,4 +1,6 @@
 ## Copyright (C) 2019 Mike Miller
+## Copyright (C) 2020 Vishnu Parammal
+## Copyright (C) 2023 Colin B. Macdonald
 ## SPDX-License-Identifier: GPL-3.0-or-later
 ##
 ## This file is part of Octave Pythonic.
@@ -118,7 +120,7 @@ function help ()
 endfunction
 
 function gitlab ()
-  pythonic_web ("https://gitlab.com/mtmiller/octave-pythonic");
+  pythonic_web ("https://gitlab.com/gnu-octave/octave-pythonic");
 endfunction
 
 function wiki ()
@@ -126,7 +128,7 @@ function wiki ()
 endfunction
 
 function issue ()
-  pythonic_web ("https://gitlab.com/mtmiller/octave-pythonic/issues/new");
+  pythonic_web ("https://gitlab.com/gnu-octave/octave-pythonic/issues/new");
 endfunction
 
 function update ()
diff --git a/src/oct-py-util.cc b/src/oct-py-util.cc
index e371c22..71a8311 100644
--- a/src/oct-py-util.cc
+++ b/src/oct-py-util.cc
@@ -3,7 +3,7 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 
 Copyright (C) 2016-2019 Mike Miller
-Copyright (C) 2019 Colin B. Macdonald
+Copyright (C) 2019, 2023 Colin B. Macdonald
 
 This file is part of Octave Pythonic.
 
@@ -231,7 +231,7 @@ namespace pythonic
 
         std::string s;
         if (false)
-          // FIXME: http://gitlab.com/mtmiller/octave-pythonic/issues/51
+          // FIXME: http://gitlab.com/gnu-octave/octave-pythonic/issues/51
           s = "<large object>";
         else
           {
diff --git a/src/pyexec.cc b/src/pyexec.cc
index 865b02c..65f99ae 100644
--- a/src/pyexec.cc
+++ b/src/pyexec.cc
@@ -2,7 +2,7 @@
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-Copyright (C) 2016 Colin B. Macdonald
+Copyright (C) 2016, 2023 Colin B. Macdonald
 Copyright (C) 2016-2019 Mike Miller
 
 This file is part of Octave Pythonic.
@@ -47,7 +47,7 @@ side effects of the expression.
 Examples:
 @example
 @group
-@c FIXME: Python stdout not same as Octave's https://gitlab.com/mtmiller/octave-pythonic/issues/7
+@c FIXME: Python stdout not same as Octave's https://gitlab.com/gnu-octave/octave-pythonic/issues/7
 @c doctest: +XFAIL
 pyexec ("print(42)")
   @print{} 42
diff --git a/tests/types.tst b/tests/types.tst
index 222d345..b5166f4 100644
--- a/tests/types.tst
+++ b/tests/types.tst
@@ -1,4 +1,5 @@
 ## Copyright (C) 2019 Mike Miller
+## Copyright (C) 2023 Colin B. Macdonald
 ## SPDX-License-Identifier: GPL-3.0-or-later
 ##
 ## This file is part of Octave Pythonic.
@@ -17,7 +18,7 @@
 ## along with Octave Pythonic; see the file COPYING.  If not, see
 ## <https://www.gnu.org/licenses/>.
 
-%!test <*https://gitlab.com/mtmiller/octave-pythonic/issues/14>
+%!test <*https://gitlab.com/gnu-octave/octave-pythonic/issues/14>
 %! x = py.list ({0, 1, 2, 3});
 %! assert (py.math.sqrt (2), sqrt (2))
 %! assert (! isa (x, "py.no.such.object"))
-- 
GitLab


From c0be3d5b1e4fe098c8ba94ad05cd4d09e977130f Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Thu, 25 May 2023 17:22:12 -0700
Subject: [PATCH 2/2] Octave mailing list moved to Discourse

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a959f13..f5b788d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,8 +31,8 @@ ideas about this package.
 
 Since this package is intended to be used by the Octave community, questions
 and discussions may be sent to the
-[Octave maintainers mailing list](https://lists.gnu.org/mailman/listinfo/octave-maintainers).
+[Octave Discourse discussion forum](https://octave.discourse.group).
 
-If you are not familiar or comfortable with mailing lists, you can also
+If you are not familiar or comfortable with such a forum, you can also
 contact the maintainer directly at
 [mtmiller@octave.org](mailto:mtmiller@octave.org).
-- 
GitLab