From 999a19c61e0a5a92e8868d4350efb2676c7fd2558d66f2d3d6fc37ee2307d667 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 27 Jul 2021 09:36:00 +0000 Subject: [PATCH 1/4] Gear 21.08 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kturtle?expand=0&rev=144 --- kturtle-21.04.3.tar.xz | 3 --- kturtle-21.04.3.tar.xz.sig | 16 ---------------- kturtle-21.07.80.tar.xz | 3 +++ kturtle-21.07.80.tar.xz.sig | 16 ++++++++++++++++ kturtle.changes | 11 +++++++++++ kturtle.spec | 10 ++++------ 6 files changed, 34 insertions(+), 25 deletions(-) delete mode 100644 kturtle-21.04.3.tar.xz delete mode 100644 kturtle-21.04.3.tar.xz.sig create mode 100644 kturtle-21.07.80.tar.xz create mode 100644 kturtle-21.07.80.tar.xz.sig diff --git a/kturtle-21.04.3.tar.xz b/kturtle-21.04.3.tar.xz deleted file mode 100644 index fe25bae..0000000 --- a/kturtle-21.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92 -size 1970952 diff --git a/kturtle-21.04.3.tar.xz.sig b/kturtle-21.04.3.tar.xz.sig deleted file mode 100644 index 865b0bb..0000000 --- a/kturtle-21.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj51IACgkQu0YzUNbv -Me8cTRAAh7MHErOcRzEJRRPQ7oZGeadUpDE3smHj2m3B9x1wNg4zS87tRmuvT1WG -LlWXiPiDVbTQxB2P/ezS6j2TlYhjmvjDugS1GbZL0fp0TkgxbaxJ+Uc1tgR/1Gyq -pERq6OaibxQpRhLX6FNvAdlIDts9VfSqIkPCV/L1+N8ht9u4yYlATuyd5qWfCYBB -RoBrooyM9RBRK29Hmu4z9f3qqwkJH4CsIQSo/ATwTEqVLiyzVKSL/gcRg3swAo2L -rZnNMBq6TnpFro5sWsswzJvQxcZLfpdPTd9wUD55aCqB5GM5gJzGmFZ9qXMIjU1w -JHtQB/EwLlxl4hmsRghExrS+IvnXNy7UP/kM/TNpc+VuHs4Wrsor1m6k0mgN5atC -G2aWUxYAgdREFT+Tw+d+tjhYyguhNuRzzuCVhgVSsszjRfjtIgWmrSbr5bAoEdpL -UJbAshYKFkQQRZg0HYzTcAaXOynQYKndI12l/Vh/04l82OPr3hWL6USkwokJsCMg -CT4e/MaQsrELncxaQMD35UxHoJwOq5C8Iqs8as15Q1lhEleDCqJFoi0ad1II5XEH -08jKpdaM3UK8/jQvbzUiLqTl0adb3L8obYAXjCHll35D3RbaXXV2xi631x6Y6tta -MYRoRHT6ju7TBs3O+MHaj/vGHTBbB5xZZpcUr4SKhT0OOdxKemk= -=wQJX ------END PGP SIGNATURE----- diff --git a/kturtle-21.07.80.tar.xz b/kturtle-21.07.80.tar.xz new file mode 100644 index 0000000..8770d93 --- /dev/null +++ b/kturtle-21.07.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7297872b7fd882ed5950a719582a29d235dafe4b340fca8020788094d8c9518 +size 1971732 diff --git a/kturtle-21.07.80.tar.xz.sig b/kturtle-21.07.80.tar.xz.sig new file mode 100644 index 0000000..5ec213d --- /dev/null +++ b/kturtle-21.07.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi5wACgkQOmpNuDnq +ptc3Ew//R9U7GXQpfHwQU9lUA/h+Y2O+uJqZwkKSDrJtZadaQfBBMsgGVVR3gShz +yT7JThtRAbCb223YjT6LEYT7whaPspoDT7xVOIvpoOYSIhcTCrjDHMnuW9FJLthi +GYgyan3WYgIV0Egz3rSEsZVTvi4NZP5bvLHJI6ZDqXy0iDg+zPf83opnXaNNoWHQ +vzvtzQ3TNlX/vCy+1Z7qzXb+KfrMnCzn+IYDvW6BNPaU9T3UHvLPUUQSvMSap8TI +W2xeKzn6hiV5f7p+Ju1TLdiRoUyhMZp0tLRqNx21LrcD4q7snBqp9infaoKZ9HAv +xjtgbR9QgfooVDs+aU0BAAN3Tc1zecTmZU5cynzzYBqmOkdXq6LVOIAf3aZ+Bjqn +7dgaFPSe2AFBuB+GRMzkY1pdYABSEPpdUecoQKWW+2y5Cko2gMaCmBpXsVEp2C7l +fF545ljlFtPOIt1hgoqejS0j2kmMeWm/pQywJQ52bsmVbOId5feSy5M5QuqhQ5SJ +xaS+i9AyrHeBNKEj3lAs/1YmHYtCl+DS4V5Tl7SUeltEjnFnKtBnPLsLGT0hBc4n +5pJOwVgSWWQs+2oGV2q8nImawicXBzZdup0Kxhz+aCWncT2Mnw/yS8oT424QDFS6 +QHNnWsYfstd8mb2aGOJqlByEMDZUjxR4snGnmlOej6n9TmoArEE= +=fmGr +-----END PGP SIGNATURE----- diff --git a/kturtle.changes b/kturtle.changes index 5695874..dcf6640 100644 --- a/kturtle.changes +++ b/kturtle.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jul 17 20:06:49 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Time to increase version + use qt_ macro + qt:: + * Ignore files + * Add cmake preset support +- Only install the license files once + ------------------------------------------------------------------- Wed Jul 7 08:58:42 UTC 2021 - Christophe Giboudeaux diff --git a/kturtle.spec b/kturtle.spec index 3b9ee8f..17003ca 100644 --- a/kturtle.spec +++ b/kturtle.spec @@ -21,15 +21,15 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kturtle -Version: 21.04.3 +Version: 21.07.80 Release: 0 Summary: Logo Programming Environment License: GPL-2.0-or-later Group: Amusements/Teaching/Mathematics URL: https://apps.kde.org/kturtle -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules @@ -45,7 +45,6 @@ BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -Recommends: %{name}-lang %description KTurtle is an educational Logo programming environment. @@ -68,7 +67,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %find_lang %{name} --with-man --all-name %{kf5_find_htmldocs} %endif - %suse_update_desktop_file org.kde.%{name} Education Math + %suse_update_desktop_file org.kde.%{name} Education Math %files %license COPYING* @@ -87,7 +86,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %if %{with lang} %files lang -f %{name}.lang -%license COPYING* %endif %changelog From 362c61e2faca43225c0b53daef36e492e28640160205e6c05ec95d8dcee6b199 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Aug 2021 20:00:42 +0000 Subject: [PATCH 2/4] KDE Gear 21.08 rc OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kturtle?expand=0&rev=145 --- kturtle-21.07.80.tar.xz | 3 --- kturtle-21.07.80.tar.xz.sig | 16 ---------------- kturtle-21.07.90.tar.xz | 3 +++ kturtle-21.07.90.tar.xz.sig | 16 ++++++++++++++++ kturtle.changes | 7 +++++++ kturtle.spec | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 kturtle-21.07.80.tar.xz delete mode 100644 kturtle-21.07.80.tar.xz.sig create mode 100644 kturtle-21.07.90.tar.xz create mode 100644 kturtle-21.07.90.tar.xz.sig diff --git a/kturtle-21.07.80.tar.xz b/kturtle-21.07.80.tar.xz deleted file mode 100644 index 8770d93..0000000 --- a/kturtle-21.07.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7297872b7fd882ed5950a719582a29d235dafe4b340fca8020788094d8c9518 -size 1971732 diff --git a/kturtle-21.07.80.tar.xz.sig b/kturtle-21.07.80.tar.xz.sig deleted file mode 100644 index 5ec213d..0000000 --- a/kturtle-21.07.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi5wACgkQOmpNuDnq -ptc3Ew//R9U7GXQpfHwQU9lUA/h+Y2O+uJqZwkKSDrJtZadaQfBBMsgGVVR3gShz -yT7JThtRAbCb223YjT6LEYT7whaPspoDT7xVOIvpoOYSIhcTCrjDHMnuW9FJLthi -GYgyan3WYgIV0Egz3rSEsZVTvi4NZP5bvLHJI6ZDqXy0iDg+zPf83opnXaNNoWHQ -vzvtzQ3TNlX/vCy+1Z7qzXb+KfrMnCzn+IYDvW6BNPaU9T3UHvLPUUQSvMSap8TI -W2xeKzn6hiV5f7p+Ju1TLdiRoUyhMZp0tLRqNx21LrcD4q7snBqp9infaoKZ9HAv -xjtgbR9QgfooVDs+aU0BAAN3Tc1zecTmZU5cynzzYBqmOkdXq6LVOIAf3aZ+Bjqn -7dgaFPSe2AFBuB+GRMzkY1pdYABSEPpdUecoQKWW+2y5Cko2gMaCmBpXsVEp2C7l -fF545ljlFtPOIt1hgoqejS0j2kmMeWm/pQywJQ52bsmVbOId5feSy5M5QuqhQ5SJ -xaS+i9AyrHeBNKEj3lAs/1YmHYtCl+DS4V5Tl7SUeltEjnFnKtBnPLsLGT0hBc4n -5pJOwVgSWWQs+2oGV2q8nImawicXBzZdup0Kxhz+aCWncT2Mnw/yS8oT424QDFS6 -QHNnWsYfstd8mb2aGOJqlByEMDZUjxR4snGnmlOej6n9TmoArEE= -=fmGr ------END PGP SIGNATURE----- diff --git a/kturtle-21.07.90.tar.xz b/kturtle-21.07.90.tar.xz new file mode 100644 index 0000000..5024e69 --- /dev/null +++ b/kturtle-21.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:607eb9da0c6dd9e032d5d9eb1b2e880718dd844a4da2bbc45b9ac949d2fe28ed +size 1971616 diff --git a/kturtle-21.07.90.tar.xz.sig b/kturtle-21.07.90.tar.xz.sig new file mode 100644 index 0000000..bd4ce69 --- /dev/null +++ b/kturtle-21.07.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDnX8ACgkQu0YzUNbv +Me+krg/+Nm0I4qnlz2Iz14JZfDPPstZoKXn0lLyjXbHyGUpjAcaeE/3okvocLQiD +uYd16aPYv1hHqIpyYNi63Mm3XsrvqYPy3uDPNtAeK0EpxmAY3Dw9kOm9wMzsIaQO +LlDxKQLHuhUVByXXmymb3lfF/ZL3FpQbN4KNY4jtCGwex6C9ZP8L7EIFHdA4alcN +KwD4eIaOAhrg3/8uK7hqeh0UsIJ1TLDNFUHdw+KiRTWOMAPFbFo5BjGjoMxr7V6Y +9kTg9w/wZNitumnmN1mfehqIxiodTH2E/6wgGUl/fXpfSwsD5WsytYYuX/Vlrccl +bzd/DVYH+rneO3U9p/C4vbJnXd5d+17IT0GgurXESFGnib3JemIWIZlV3yYwm4Wc +9LFv1XFPKPVnVmNrButNh+V8HabV1bvUHt5I6z3cNPIrCTpheCYllArQduOe+0t9 +sO1YUAbNzTeQSmoUzqWsiVvpzwiPqnOe4UslKY3E7AizfgwwzGJdW35Wd8wvz+wd +gO5xMV2g8R33FQO7QUOzxxJNwrqIhrahUZNkLtAYZB6zvJIxHDZsvyYa0cNgL5A0 +V0SitzODOpxD9ZfQotx7COT4ImfU0EIqvsyGwVdDdzIKHt+5PNXRo0YDz/WAIRVf +FPp/oF6ewSqBM+gA/g81cL05dGJxbxP18UbdI0IBr057KTb/qqs= +=GjU8 +-----END PGP SIGNATURE----- diff --git a/kturtle.changes b/kturtle.changes index dcf6640..efdee91 100644 --- a/kturtle.changes +++ b/kturtle.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 30 10:05:40 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + ------------------------------------------------------------------- Sat Jul 17 20:06:49 UTC 2021 - Christophe Giboudeaux diff --git a/kturtle.spec b/kturtle.spec index 17003ca..7830a5e 100644 --- a/kturtle.spec +++ b/kturtle.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kturtle -Version: 21.07.80 +Version: 21.07.90 Release: 0 Summary: Logo Programming Environment License: GPL-2.0-or-later From 5beb0db810c2938a50eda97478adc4d71d5770a50d8e03c228849b3023c0766b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 7 Aug 2021 11:17:29 +0000 Subject: [PATCH 3/4] KDE Gear 21.08 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kturtle?expand=0&rev=146 --- kturtle-21.07.90.tar.xz | 3 --- kturtle-21.07.90.tar.xz.sig | 16 ---------------- kturtle-21.08.0.tar.xz | 3 +++ kturtle-21.08.0.tar.xz.sig | 16 ++++++++++++++++ kturtle.changes | 9 +++++++++ kturtle.spec | 6 +++--- 6 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 kturtle-21.07.90.tar.xz delete mode 100644 kturtle-21.07.90.tar.xz.sig create mode 100644 kturtle-21.08.0.tar.xz create mode 100644 kturtle-21.08.0.tar.xz.sig diff --git a/kturtle-21.07.90.tar.xz b/kturtle-21.07.90.tar.xz deleted file mode 100644 index 5024e69..0000000 --- a/kturtle-21.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:607eb9da0c6dd9e032d5d9eb1b2e880718dd844a4da2bbc45b9ac949d2fe28ed -size 1971616 diff --git a/kturtle-21.07.90.tar.xz.sig b/kturtle-21.07.90.tar.xz.sig deleted file mode 100644 index bd4ce69..0000000 --- a/kturtle-21.07.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDnX8ACgkQu0YzUNbv -Me+krg/+Nm0I4qnlz2Iz14JZfDPPstZoKXn0lLyjXbHyGUpjAcaeE/3okvocLQiD -uYd16aPYv1hHqIpyYNi63Mm3XsrvqYPy3uDPNtAeK0EpxmAY3Dw9kOm9wMzsIaQO -LlDxKQLHuhUVByXXmymb3lfF/ZL3FpQbN4KNY4jtCGwex6C9ZP8L7EIFHdA4alcN -KwD4eIaOAhrg3/8uK7hqeh0UsIJ1TLDNFUHdw+KiRTWOMAPFbFo5BjGjoMxr7V6Y -9kTg9w/wZNitumnmN1mfehqIxiodTH2E/6wgGUl/fXpfSwsD5WsytYYuX/Vlrccl -bzd/DVYH+rneO3U9p/C4vbJnXd5d+17IT0GgurXESFGnib3JemIWIZlV3yYwm4Wc -9LFv1XFPKPVnVmNrButNh+V8HabV1bvUHt5I6z3cNPIrCTpheCYllArQduOe+0t9 -sO1YUAbNzTeQSmoUzqWsiVvpzwiPqnOe4UslKY3E7AizfgwwzGJdW35Wd8wvz+wd -gO5xMV2g8R33FQO7QUOzxxJNwrqIhrahUZNkLtAYZB6zvJIxHDZsvyYa0cNgL5A0 -V0SitzODOpxD9ZfQotx7COT4ImfU0EIqvsyGwVdDdzIKHt+5PNXRo0YDz/WAIRVf -FPp/oF6ewSqBM+gA/g81cL05dGJxbxP18UbdI0IBr057KTb/qqs= -=GjU8 ------END PGP SIGNATURE----- diff --git a/kturtle-21.08.0.tar.xz b/kturtle-21.08.0.tar.xz new file mode 100644 index 0000000..0020ab3 --- /dev/null +++ b/kturtle-21.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e +size 1971864 diff --git a/kturtle-21.08.0.tar.xz.sig b/kturtle-21.08.0.tar.xz.sig new file mode 100644 index 0000000..688612d --- /dev/null +++ b/kturtle-21.08.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEMfoUACgkQu0YzUNbv +Me/+Fw//fkEi1Ukrdknnr7P6NLmmVK95b4At6yWLtAnbOiCOvZO+DHWogJRsnE53 +8gAzz2OhQRROvfhHKM038hPWQd4BPRE6QYuxaUGYxllbMVOtW10eFL0JSZSv8oSg +UzEvDn0QErlU0oiLt6Zit9fbLeQeyts7mGQcwGQmRaLs6DT9u3DbCtUv7A4G5Q/u +SCLKjlFgOcQO18ufdTvcwHr+2Y+zbNxKiySzERPPBJdt65XcQB0fhxgSfZaXkN9m +kzCIGVjM760nIGEgCGyRTt6CXPlDdU0EvvADfWAHXahqS3mNODw7UWssqDIhshQK +OYBmu6eYe9Ls1bOXrrVCcJHzE9uaGkHsiUSb6plO4cW/9CU99iFVOcYbzAlwOzPQ +uQHcEJ1Zoj6vRYe1FyAXFyi2qQXopH7t/HyieKg+z0nnWATPQKoKFmhxnm5jh31L +Px5gXhq59z08eYNKah6NpU5QSVJD0ikvKe8JTvzy4WaQitQORU2RwnmvTdXsyR2H +CTV+CoagQHi1I6HB1RJqSuQp7meuyjgkAIFxEnk5Q91pa0b4F4t8incZBG2lUrFs +c9GynNVubtRHT5f/fhhG5lxcrNx+5Goi97OJdY7uSLU6o/UlZ8yopatsND3kznbu +MUtLvYgqMnJdJvs4ddrZ51KDrbtpn4y7caLZFU8lXTpbVHuqALk= +=11gJ +-----END PGP SIGNATURE----- diff --git a/kturtle.changes b/kturtle.changes index efdee91..6da91f6 100644 --- a/kturtle.changes +++ b/kturtle.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 6 09:41:27 UTC 2021 - Christophe Giboudeaux + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08/ +- No code change since 21.07.90 + ------------------------------------------------------------------- Fri Jul 30 10:05:40 UTC 2021 - Christophe Giboudeaux diff --git a/kturtle.spec b/kturtle.spec index 7830a5e..09703ca 100644 --- a/kturtle.spec +++ b/kturtle.spec @@ -21,15 +21,15 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kturtle -Version: 21.07.90 +Version: 21.08.0 Release: 0 Summary: Logo Programming Environment License: GPL-2.0-or-later Group: Amusements/Teaching/Mathematics URL: https://apps.kde.org/kturtle -Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif BuildRequires: extra-cmake-modules From 2edfce19bf10e21892a518b9171bdfe7bb33a0971ebab32ff6f76f3f1176423f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Aug 2021 11:51:30 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kturtle?expand=0&rev=147 --- kturtle.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kturtle.changes b/kturtle.changes index 6da91f6..ae65be4 100644 --- a/kturtle.changes +++ b/kturtle.changes @@ -4,7 +4,7 @@ Fri Aug 6 09:41:27 UTC 2021 - Christophe Giboudeaux - Update to 21.08.0 * New feature release * For more details please see: - * https://kde.org/announcements/gear/21.08/ + * https://kde.org/announcements/gear/21.08.0 - No code change since 21.07.90 -------------------------------------------------------------------