Git commit 8635817fbc8d1bee05954eecaa4d2bab81d8b74a by Gilles Caulier. Committed on 09/08/2020 at 05:54. Pushed by cgilles into branch 'master'.
fix (c) and version M +1 -1 CMakeLists.txt M +2 -2 bootstrap.sh M +1 -1 digikam/CMakeLists.txt M +2 -2 digikam/annexes-credits.docbook M +4 -4 digikam/index.docbook M +1 -1 project/makess.sh M +1 -1 project/optpng.sh M +1 -1 showfoto/CMakeLists.txt M +3 -3 showfoto/index.docbook https://invent.kde.org/documentation/digikam-doc/commit/8635817fbc8d1bee05954eecaa4d2bab81d8b74a diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a6969a..249f6f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2018, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/bootstrap.sh b/bootstrap.sh index 2cb0417..fd15f43 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright (c) 2008-2019, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2008-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt index 3be3ebd..dc70c40 100644 --- a/digikam/CMakeLists.txt +++ b/digikam/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2018, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/digikam/annexes-credits.docbook b/digikam/annexes-credits.docbook index a5a1246..4eb3602 100644 --- a/digikam/annexes-credits.docbook +++ b/digikam/annexes-credits.docbook @@ -10,7 +10,7 @@ </para> <para> - Program copyright 2001-2017, <ulink url="http://www.digikam.org";>digiKam</ulink> developers team + Program copyright 2001-2020, <ulink url="http://www.digikam.org";>digiKam</ulink> developers team </para> <para> @@ -20,7 +20,7 @@ <listitem> <para> - 2001-2018 + 2001-2020 <itemizedlist> <listitem><para>Gilles Caulier <email>caulier_dot_gilles_at_gmail_dot_com</email></para></listitem> </itemizedlist> diff --git a/digikam/index.docbook b/digikam/index.docbook index 12575d4..d978f5c 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -55,7 +55,7 @@ <!ENTITY doc-using-dam-copyright SYSTEM "using-dam-copyright.docbook"> <!ENTITY doc-using-dam-corruption SYSTEM "using-dam-corruption.docbook"> <!ENTITY doc-using-dam-workflow SYSTEM "using-dam-workflow.docbook"> - + <!ENTITY doc-using-facetagging SYSTEM "using-facetagging.docbook"> <!ENTITY doc-using-camera SYSTEM "using-camera.docbook"> @@ -208,7 +208,7 @@ <title>The &digikam; Handbook</title> <copyright> <year>2001</year> - <year>2018</year> + <year>2020</year> <holder>The <ulink url="http://www.digikam.org";>digiKam</ulink> developers team</holder> </copyright> @@ -217,8 +217,8 @@ and in the FDL itself on how to use it. --> <legalnotice>&FDLNotice;</legalnotice> - <date>April 2018</date> - <releaseinfo>5.9</releaseinfo> + <date>July 2020</date> + <releaseinfo>7.0</releaseinfo> <abstract> diff --git a/project/makess.sh b/project/makess.sh index 462bc0b..5e9b079 100755 --- a/project/makess.sh +++ b/project/makess.sh @@ -8,7 +8,7 @@ # Date : 2016-08-27 # Description : Make PNG screenshot for handbook # - # Copyright (C) 2016-2017 by Gilles Caulier <caulier dot gilles at gmail dot com> + # Copyright (C) 2016-2020 by Gilles Caulier <caulier dot gilles at gmail dot com> # # This program is free software; you can redistribute it # and/or modify it under the terms of the GNU General diff --git a/project/optpng.sh b/project/optpng.sh index 020fdd6..e38ca10 100755 --- a/project/optpng.sh +++ b/project/optpng.sh @@ -8,7 +8,7 @@ # Date : 2016-08-27 # Description : PNG optimizations for handbook # - # Copyright (C) 2016-2017 by Gilles Caulier <caulier dot gilles at gmail dot com> + # Copyright (C) 2016-2020 by Gilles Caulier <caulier dot gilles at gmail dot com> # # This program is free software; you can redistribute it # and/or modify it under the terms of the GNU General diff --git a/showfoto/CMakeLists.txt b/showfoto/CMakeLists.txt index 836faf4..d39758e 100644 --- a/showfoto/CMakeLists.txt +++ b/showfoto/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010-2018, Gilles Caulier, <caulier dot gilles at gmail dot com> +# Copyright (c) 2010-2020, Gilles Caulier, <caulier dot gilles at gmail dot com> # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. diff --git a/showfoto/index.docbook b/showfoto/index.docbook index ee4560c..cc5f467 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -118,7 +118,7 @@ <title>The &digikam; Handbook</title> <copyright> <year>2001</year> - <year>2018</year> + <year>2020</year> <holder>The <ulink url="http://www.digikam.org";>digiKam</ulink> developers team</holder> </copyright> @@ -127,8 +127,8 @@ and in the FDL itself on how to use it. --> <legalnotice>&FDLNotice;</legalnotice> - <date>April 2018</date> - <releaseinfo>5.9</releaseinfo> + <date>July 2020</date> + <releaseinfo>7.0</releaseinfo> <keywordset> <keyword>digikam</keyword>
