Prepare 3.4.7 release

Code7R · Mar 25, 2024 · dc1e68f · dc1e68f
1 parent a69deee
commit dc1e68f
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 156 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,4 +1,4 @@
-icewm -- authors file.  2024-03-07
+icewm -- authors file.  2024-03-25
 
 Author: Bert Gijsbers <[email protected]>
 Author: Sophie Leroy <[email protected]>

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,108 @@
 # created with git log --stat=76 -M -C -500|fmt -sct -w80
 
+commit a69deee625d18deecc7091a111117e55c8bb7023
+Merge: 4064096b 803f8224
+Author: Bert Gijsbers <[email protected]>
+Date:   Mon Mar 25 20:00:33 2024 +0100
+
+    Merge branch 'icewm-1-4-BRANCH'
+
+commit 803f82247fe4a9f762c575535ae747e1fbed6d3c
+Merge: 85f70037 5bd70713
+Author: Bert Gijsbers <[email protected]>
+Date:   Mon Mar 25 19:59:11 2024 +0100
+
+    Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
+    icewm-1-4-BRANCH
+
+commit 5bd7071318ad731d5e151a73b1eeb9e2130ddeb3
+Author: Bert Gijsbers <[email protected]>
+Date:   Sun Mar 17 10:05:41 2024 +0100
+
+    detail
+
+ src/keysyms.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit e534b92a3bd4e1c7188f25e90085933b6bbc4f3b
+Author: Bert Gijsbers <[email protected]>
+Date:   Sat Mar 16 22:04:30 2024 +0100
+
+    Support more international keyboard layouts for issue #768.
+
+ src/CMakeLists.txt |   2 +-
+ src/Makefile.am    |   2 +
+ src/keysyms.cc     | 782 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/keysyms.h      |   6 +
+ src/wmapp.cc       |  17 +-
+ src/wmapp.h        |   1 +
+ src/yconfig.cc     |  26 +-
+ 7 files changed, 827 insertions(+), 9 deletions(-)
+
+commit 4064096b73962b16f1eecec232f848bf998d354b
+Author: Bert Gijsbers <[email protected]>
+Date:   Thu Mar 7 19:38:03 2024 +0100
+
+    Prepare 3.4.6 release
+
+ AUTHORS            |  17 +-
+ ChangeLog          | 761 +++++++++++++++++++++----------------------------
+ INSTALL.cmakebuild |   7 +-
+ NEWS               | 100 ++++---
+ README.md          |  38 +--
+ RELEASE.md         |   2 +-
+ VERSION            |   2 +-
+ configure.ac       |  10 +-
+ po/ar.po           |  22 +-
+ po/ast.po          |  22 +-
+ po/be.po           |  22 +-
+ po/bg.po           |  22 +-
+ po/ca.po           |  22 +-
+ po/cs.po           |  22 +-
+ po/da.po           |  22 +-
+ po/de.po           |  26 +-
+ po/el.po           |  22 +-
+ po/en.po           |  22 +-
+ po/eo.po           |  22 +-
+ po/es.po           |  26 +-
+ po/fa.po           |  22 +-
+ po/fi.po           |  22 +-
+ po/fr.po           |  26 +-
+ po/he.po           |  22 +-
+ po/hi.po           |  22 +-
+ po/hr.po           |  22 +-
+ po/hu.po           |  22 +-
+ po/icewm.pot       |  24 +-
+ po/id.po           |  22 +-
+ po/ie.po           |  22 +-
+ po/it.po           |  26 +-
+ po/ja.po           |  22 +-
+ po/ka.po           |  22 +-
+ po/kk.po           |  22 +-
+ po/ko.po           |  22 +-
+ po/lt.po           |  22 +-
+ po/lv.po           |  22 +-
+ po/mk.po           |  22 +-
+ po/nb.po           |  22 +-
+ po/nl.po           |  22 +-
+ po/nn.po           |  22 +-
+ po/no.po           |  22 +-
+ po/pl.po           |  22 +-
+ po/pt.po           |  22 +-
+ po/pt_BR.po        |  22 +-
+ po/ro.po           |  22 +-
+ po/ru.po           |  26 +-
+ po/si.po           |  22 +-
+ po/sk.po           |  22 +-
+ po/sl.po           |  26 +-
+ po/sv.po           |  22 +-
+ po/tr.po           |  22 +-
+ po/uk.po           |  22 +-
+ po/vi.po           |  22 +-
+ po/zh_CN.po        |  22 +-
+ po/zh_TW.po        |  22 +-
+ 56 files changed, 966 insertions(+), 1053 deletions(-)
+
 commit 44031657751c5a620fb1cfeffd221f60a1846741
 Merge: abb22149 85f70037
 Author: Bert Gijsbers <[email protected]>
@@ -6063,92 +6166,3 @@ Date:   Mon Oct 3 16:26:38 2022 +0200
 
     Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
     icewm-1-4-BRANCH
-
-commit 0992e08389dc2b74f834ed6c07c0c311eeb7da5b
-Author: Freek de Kruijf <[email protected]>
-Date:   Mon Oct 3 09:28:26 2022 +0000
-
-    Translated using Weblate (Dutch)
-
-    Currently translated at 100.0% (519 of 519 strings)
-
- po/nl.po | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-commit 2b616712d8583eec47eec1dc4f44083e9976ebf6
-Author: David Medina <[email protected]>
-Date:   Mon Oct 3 09:07:11 2022 +0000
-
-    Translated using Weblate (Catalan)
-
-    Currently translated at 100.0% (519 of 519 strings)
-
- po/ca.po | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-commit e32c3ca4dbc944e54214772ad465bb1ac243abe9
-Author: Yasuhiko Kamata <[email protected]>
-Date:   Mon Oct 3 04:07:29 2022 +0000
-
-    Translated using Weblate (Japanese)
-
-    Currently translated at 100.0% (519 of 519 strings)
-
- po/ja.po | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-commit 480638581fafdbf68b87d2c78beb10774139db2e
-Author: Bert Gijsbers <[email protected]>
-Date:   Mon Oct 3 05:55:39 2022 +0200
-
-    Only generate manual if source is newer than output.
-
- doc/Makefile.am | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-commit 8fc585ddd8db367fdbb69f9dc3b268ffd2a298a0
-Author: Bert Gijsbers <[email protected]>
-Date:   Mon Oct 3 05:53:53 2022 +0200
-
-    Update pot files.
-
- po/ar.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/be.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/bg.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/ca.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/cs.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/da.po     | 418 ++++++++++++++++++++++++++--------------------------
- po/de.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/el.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/en.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/es.po     | 418 ++++++++++++++++++++++++++--------------------------
- po/fi.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/fr.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/he.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/hr.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/hu.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/icewm.pot | 412 ++++++++++++++++++++++++++-------------------------
- po/id.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/it.po     | 442 ++++++++++++++++++++++++++++---------------------------
- po/ja.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/ko.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/lt.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/lv.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/mk.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/nb.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/nl.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/no.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/pl.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/pt.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/pt_BR.po  | 430 +++++++++++++++++++++++++++--------------------------
- po/ro.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/ru.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/sk.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/sl.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/sv.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/tr.po     | 414 ++++++++++++++++++++++++++-------------------------
- po/uk.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/vi.po     | 410 ++++++++++++++++++++++++++-------------------------
- po/zh_CN.po  | 410 ++++++++++++++++++++++++++-------------------------
- po/zh_TW.po  | 410 ++++++++++++++++++++++++++-------------------------
- 39 files changed, 8200 insertions(+), 7888 deletions(-)
diff --git a/NEWS b/NEWS
@@ -1,11 +1,24 @@
-icewm -- history of user-visible changes.  2024-03-07
+icewm -- history of user-visible changes.  2024-03-25
+
+Release icewm-3.4.7 released 2024-03-25
+---------------------------------------
+
+git shortlog -e -n -w80,6,8 3.4.6...3.4.7
+
+Bert Gijsbers <[email protected]> (4):
+      Support more international keyboard layouts for issue #768.
+      detail
+      Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
+        icewm-1-4-BRANCH
+      Merge branch 'icewm-1-4-BRANCH'
+
 
 Release icewm-3.4.6 released 2024-03-07
 ---------------------------------------
 
 git shortlog -e -n -w80,6,8 3.4.5...3.4.6
 
-Bert Gijsbers <[email protected]> (21):
+Bert Gijsbers <[email protected]> (22):
       Add shutdown command for BSD and closes #761.
       In DEBUG mode, guard against nullptr focus.
       Fix icewmbg centering when the XRender extension is used.
@@ -30,6 +43,7 @@ Bert Gijsbers <[email protected]> (21):
       Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
         icewm-1-4-BRANCH
       Merge branch 'icewm-1-4-BRANCH'
+      Prepare 3.4.6 release
 
 Grace Yu <[email protected]> (2):
       Translated using Weblate (Chinese (China) (zh_CN))
@@ -255,41 +269,3 @@ ItzSelenux <[email protected]> (1):
 Yasuhiko Kamata <[email protected]> (1):
       Translated using Weblate (Japanese)
 
-
-Release icewm-3.4.0 released 2023-06-05
----------------------------------------
-
-git shortlog -e -n -w80,6,8 3.3.5...3.4.0
-
-Bert Gijsbers <[email protected]> (19):
-      Support a literal character as the last letter in a "keys" definition if
-        it is from the Latin-1 character set for issue ice-wm/icewm#134.
-      Support bindings to shifted keys in a "keys" definition in issue
-        ice-wm/icewm#134.
-      Support UTF-8 key in "keys" and fix unshift for issue ice-wm/icewm#134.
-      Update manpage for "keys" for issue ice-wm/icewm#134.
-      On a MappingNotify event, reparse the key bindings for ice-wm/icewm#134.
-      Fix for a map request from an unmanaged client for issue #734.
-      Use xconfigurerequest.
-      Support all UTF8 code points in keybindings.
-      Include AltGr in the list of modifiers.
-      Don't complain about empty key definitions.
-      Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
-        icewm-1-4-BRANCH
-      Merge branch 'icewm-1-4-BRANCH'
-      Prepare 3.4.0 release
-      Update potfiles.
-      Include ast, eo, fa, hi, ie, ka, kk, nn, si in LINGUAS
-      Include more source files in POTFILES.in.
-      Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into
-        icewm-1-4-BRANCH
-      Merge branch 'icewm-1-4-BRANCH'
-      Prepare 3.4.0 release
-
-Temuri Doghonadze <[email protected]> (2):
-      Added translation using Weblate (Georgian)
-      Translated using Weblate (Georgian)
-
-Kukuh Syafaat <[email protected]> (1):
-      Translated using Weblate (Indonesian)
-
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ list, and various other GitHub forks.
 Release
 -------
 
-This is the `icewm-3.4.6` package, released 2024-03-07.  This release, and
+This is the `icewm-3.4.7` package, released 2024-03-25.  This release, and
 the latest version, can be obtained from [GitHub][1], using a command such as:
 
     $> git clone https://github.com/bbidulock/icewm.git
@@ -167,30 +167,30 @@ translations.  If you have difficulties using the tools, just send me the update
 
 [1]: https://github.com/bbidulock/icewm
 [2]: https://github.com/bbidulock/icewm/issues
-[3]: https://github.com/ice-wm/icewm/blob/3.4.6/NEWS
-[4]: https://github.com/ice-wm/icewm/blob/3.4.6/ChangeLog
-[5]: https://github.com/ice-wm/icewm/blob/3.4.6/TODO
-[6]: https://github.com/ice-wm/icewm/blob/3.4.6/COMPLIANCE
-[7]: https://github.com/ice-wm/icewm/blob/3.4.6/INSTALL
-[8]: https://github.com/ice-wm/icewm/blob/3.4.6/BUGS
-[9]: https://github.com/ice-wm/icewm/blob/3.4.6/COPYING
+[3]: https://github.com/ice-wm/icewm/blob/3.4.7/NEWS
+[4]: https://github.com/ice-wm/icewm/blob/3.4.7/ChangeLog
+[5]: https://github.com/ice-wm/icewm/blob/3.4.7/TODO
+[6]: https://github.com/ice-wm/icewm/blob/3.4.7/COMPLIANCE
+[7]: https://github.com/ice-wm/icewm/blob/3.4.7/INSTALL
+[8]: https://github.com/ice-wm/icewm/blob/3.4.7/BUGS
+[9]: https://github.com/ice-wm/icewm/blob/3.4.7/COPYING
 [10]: https://github.com/
 [11]: https://l10n.opensuse.org/projects/icewm/icewm-1-4-branch/
 [12]: https://sourceforge.net/projects/icewm/
 [13]: https://ice-wm.org/
 [14]: https://ice-wm.org/FAQ/
-[15]: https://github.com/ice-wm/icewm/blob/3.4.6/doc/icewm.adoc
+[15]: https://github.com/ice-wm/icewm/blob/3.4.7/doc/icewm.adoc
 [16]: https://github.com/bbidulock/bbkeys/
-[17]: https://github.com/ice-wm/icewm/blob/3.4.6/lib/icewm.desktop
-[18]: https://github.com/ice-wm/icewm/blob/3.4.6/lib/icewm-session.desktop
-[19]: https://github.com/ice-wm/icewm/blob/3.4.6/INSTALL-cmakebuild.md
+[17]: https://github.com/ice-wm/icewm/blob/3.4.7/lib/icewm.desktop
+[18]: https://github.com/ice-wm/icewm/blob/3.4.7/lib/icewm-session.desktop
+[19]: https://github.com/ice-wm/icewm/blob/3.4.7/INSTALL-cmakebuild.md
 [20]: https://github.com/bbidulock/xde-menu/
-[21]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icesound.pod
-[22]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icewmbg.pod
-[23]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icewmhint.pod
-[24]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icewm-menu-fdo.pod
-[25]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icesh.pod
-[26]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icewm.pod
-[27]: https://github.com/ice-wm/icewm/blob/3.4.6/man/icewm-session.pod
+[21]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icesound.pod
+[22]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icewmbg.pod
+[23]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icewmhint.pod
+[24]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icewm-menu-fdo.pod
+[25]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icesh.pod
+[26]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icewm.pod
+[27]: https://github.com/ice-wm/icewm/blob/3.4.7/man/icewm-session.pod
 
 [ vim: set ft=markdown sw=4 tw=80 nocin nosi fo+=tcqlorn spell: ]: #
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,6 +1,6 @@
 [icewm -- release notes.  2021-07-08]: #
 
-Release 3.4.6
+Release 3.4.7
 =============
 
 Included in the release is an autoconf tarball for building the package

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
 PACKAGE=icewm
-VERSION=3.4.6
+VERSION=3.4.7
diff --git a/configure.ac b/configure.ac
@@ -2,10 +2,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([icewm],[3.4.6],
+AC_INIT([icewm],[3.4.7],
         [https://github.com/bbidulock/icewm/issues],
         [icewm],[https://ice-wm.org])
-AC_REVISION([3.4.6])
+AC_REVISION([3.4.7])
 
 # set better defaults
 AC_PREFIX_DEFAULT([/usr])
@@ -22,13 +22,13 @@ AC_CONFIG_AUX_DIR([scripts])
 AC_USE_SYSTEM_EXTENSIONS
 AC_CANONICAL_TARGET
 
-DATE='2024-03-07'
+DATE='2024-03-25'
 AC_SUBST([DATE])
 
-MDOCDATE='March 7, 2024'
+MDOCDATE='March 25, 2024'
 AC_SUBST([MDOCDATE])
 
-BRANCH='3.4.6'
+BRANCH='3.4.7'
 AC_SUBST([BRANCH])
 
 APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icehelp'