Skip to content

Commit

Permalink
Merge master into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
jendrikseipp committed Sep 16, 2024
2 parents 3cb641f + 4469d7c commit b0826d3
Show file tree
Hide file tree
Showing 27 changed files with 2,233 additions and 909 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
- name: Build page
run: ./web/build.sh
- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3.0.1
with:
# Upload entire repository
path: 'web'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4.0.5
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.34 (2024-09-16)
* Copy/paste text into the correct text field (#677, @jendrikseipp).

# 2.33 (2024-05-05)
* Ignore image filenames and web links in word clouds (#537, #696, @laraconda).
* Add more pre-commit checks (#705, @laraconda).
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
rednotebook (2.34-1) UNRELEASED; urgency=low

* New upstream release
* Copy/paste text into the correct text field (#677, @jendrikseipp).

-- Jendrik Seipp <jendrikseipp@web.de> Mon, 16 Sep 2024 08:58:39 +0200

rednotebook (2.33-1) UNRELEASED; urgency=low

* New upstream release
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: rednotebook
Maintainer: Jendrik Seipp <jendrikseipp@gmail.com>
Section: text
Priority: optional
Standards-Version: 4.6.2.0
Standards-Version: 4.7.0
Rules-Requires-Root: no
Homepage: https://rednotebook.app
Vcs-Git: https://github.com/jendrikseipp/rednotebook.git
Expand Down
28 changes: 28 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ Copyright: Copyright (C) 2012 Maximilian Köhl <linuxmaxi@googlemail.com>
Copyright (C) 2012 Carlos Jenkins <carlos@jenkins.co.cr>
License: GPL-3+

Files: rednotebook/files/rednotebook-highlight-style.xml
Copyright: Copyright (C) 2006-2007 GtkSourceView team
Copyright (C) 2018 RedNotebook team
License: LGPL-2.1+

Files: rednotebook/files/t2t.lang
Copyright: Copyright (C) 2008 Yevgen Muntyan <muntyan@tamu.edu>
Copyright (C) 2018 RedNotebook team
License: LGPL-2.1+

License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -100,3 +110,21 @@ License: GPL-2+
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.

License: LGPL-2.1+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1, or (at your option)
any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU Lesser General Public
License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
Loading

0 comments on commit b0826d3

Please sign in to comment.