From f6a68a8e56a16f2feb95a79ac64465fafcef9d5400fd812f9fbb4028bf0ade2d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 27 Jul 2021 09:35:49 +0000 Subject: [PATCH 1/4] Gear 21.08 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kirigami-gallery?expand=0&rev=101 --- kirigami-gallery-21.04.3.tar.xz | 3 --- kirigami-gallery-21.04.3.tar.xz.sig | 16 ---------------- kirigami-gallery-21.07.80.tar.xz | 3 +++ kirigami-gallery-21.07.80.tar.xz.sig | 16 ++++++++++++++++ kirigami-gallery.changes | 15 +++++++++++++++ kirigami-gallery.spec | 7 +++---- 6 files changed, 37 insertions(+), 23 deletions(-) delete mode 100644 kirigami-gallery-21.04.3.tar.xz delete mode 100644 kirigami-gallery-21.04.3.tar.xz.sig create mode 100644 kirigami-gallery-21.07.80.tar.xz create mode 100644 kirigami-gallery-21.07.80.tar.xz.sig diff --git a/kirigami-gallery-21.04.3.tar.xz b/kirigami-gallery-21.04.3.tar.xz deleted file mode 100644 index 4a13f21..0000000 --- a/kirigami-gallery-21.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e4850b30b2a1e0562e5c89b66238651c498fb7001351c9b421b7d2631eab4ac -size 329484 diff --git a/kirigami-gallery-21.04.3.tar.xz.sig b/kirigami-gallery-21.04.3.tar.xz.sig deleted file mode 100644 index ddf56cb..0000000 --- a/kirigami-gallery-21.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj6kYACgkQu0YzUNbv -Me9wHg/9ELbBuplRxq9nVlDyRSHghM8bHerKG4yFyZ5p5W7TKbQEUa9kNhWIZM6e -ypMatF/Y/Fe90ccDEhZVtCejs87kubfsZDFfIqpJkzgkfII3/k/Pftc8vaNYKdBY -wcm2IYtgiWDPFqNcylyvY+Ezz6Wo9R6It/tgrSavqtKmWRt+EmkIisyCDOIBroep -zkfXUau7dG1jcFtoytuK4QUwApvUhviwjOAy+Xx4n6vPdshIZ4ALTJxuiNlpqZQb -y1qLh8kNAxh+XVSpU9mf9MNj1apL9Rx0iCk9f6mPxwV++FxhbHas6XA6QAbBssuF -k6Zjh2LrL+ZU/4Xnfvip+yy/HtG8BPl7YnJ17he+hYUTves57hTUxUOz8nIew1gx -+BoV4fGl1egtSfwPuLXUGj/BP4vtGUaElz0JtCOWO4vn4kO9JetUacURSU0wkBIU -7gQVI8ZnqvM6NgeJN94TP4LDvxwErCo6bOdWWMFTLnrGWd5Db5y2s1sQWh9K1YF1 -FUSs5bGODvmmFzb8oEbqc/3fYUOaWWYSa9woih1h6P95uCxXjt1xSlqcDPS2fc5D -jq0rjz0o+o9CzIH5SKSmG9R+0BL7XE4hM60bJrq256yIQPa+P9Se78fzvM/8AlkG -AeRAVCbXJJLwyJdN9WePZ9mx9szgn7bzQiRk7ytIh+mqyTMC29s= -=/PVj ------END PGP SIGNATURE----- diff --git a/kirigami-gallery-21.07.80.tar.xz b/kirigami-gallery-21.07.80.tar.xz new file mode 100644 index 0000000..9002bc7 --- /dev/null +++ b/kirigami-gallery-21.07.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbeca6b44d84dac9029644e378322c6b6e6e9e0a03079635f938a12731a90ae6 +size 329220 diff --git a/kirigami-gallery-21.07.80.tar.xz.sig b/kirigami-gallery-21.07.80.tar.xz.sig new file mode 100644 index 0000000..e29e077 --- /dev/null +++ b/kirigami-gallery-21.07.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi5EACgkQOmpNuDnq +ptfN5w//cO4567lJ2UzjUZPVnDdaKulLMfwlT76sd3ikncE3rNg05IlDYnk8K/Mt +aIzF8JcAfszSleAQTcw2Nei1+I9LiSMK8rKHY3q5MzFNWWIMqcUNrfFTJQLpnLw/ +1Lj/kjDYvsi8JJXbxFYEIm3EH/rcQWR879FMgcUAO9y6LrxKsIrXpiZpewIwoKWO +a9e0Y6AB/AdQuclUCQqLLL/AEsrYlVfqHLDkjDdo+zbcba9qp6kTrvN8AUa14Ulc +3aTJiUeso6/uSmZeBMeCKXTeue29EfVozxP3H/5QPIZ5MHZhczrxnt0EF1RijATt +kUkYkYked4rlf4IgatgrHHJnrn2QO1UIOOOxEHriauFyI6K9NRQ0EMuSybCpgg3p +7gE3zjaO/87cgL4mmwMWFW7zyycUli9Whj144Mynlt4Ar5w94+pgHFMeplpYguhL +t41gkeUDxLzM7TENJ8ocK28s/iotTT5XIpD8uKfMH3WqnCrYI/TLzHxIGZGKNueD +A+9ME/PoV6TLfq81F2qtROihnhWLElrukHusCAcyool6fMa/ytBSDikWapKN/Ery +j8covQBIR3g8faByrId1McUz3NfDmaDNjZ2BxuXiXXYo54nAbwR0kAUglVSRJp5H +yQ9tZu32+wpW5OAsq0yGnOi8sJVr1WN19Wlndie/331lQVRzQ3s= +=oLyY +-----END PGP SIGNATURE----- diff --git a/kirigami-gallery.changes b/kirigami-gallery.changes index d28c31a..b4eaf88 100644 --- a/kirigami-gallery.changes +++ b/kirigami-gallery.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Jul 17 20:06:10 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Remove unneeded check + * Use C++17 + * Make CMake code consistent + * Require CMake 3.16 + * Fix missing text in button + * Use qqc2-desktop-style by default + * Set nicer window title + * CMake cleanup + ------------------------------------------------------------------- Wed Jul 7 08:57:45 UTC 2021 - Christophe Giboudeaux diff --git a/kirigami-gallery.spec b/kirigami-gallery.spec index b6c437f..f2aa702 100644 --- a/kirigami-gallery.spec +++ b/kirigami-gallery.spec @@ -18,15 +18,15 @@ %bcond_without lang Name: kirigami-gallery -Version: 21.04.3 +Version: 21.07.80 Release: 0 Summary: Gallery application built using Kirigami License: LGPL-2.0-or-later Group: Development/Tools/Other URL: https://apps.kde.org/kirigami2.gallery -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 @@ Requires: kirigami2 Requires: kitemmodels-imports Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 -Recommends: %{name}-lang %description Example application which uses all features from kirigami, From bcb445ca7aa3db02a81464a4816aced1c957f2a93419a1f95f1577107317e8c6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Aug 2021 20:00:31 +0000 Subject: [PATCH 2/4] KDE Gear 21.08 rc OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kirigami-gallery?expand=0&rev=102 --- kirigami-gallery-21.07.80.tar.xz | 3 --- kirigami-gallery-21.07.80.tar.xz.sig | 16 ---------------- kirigami-gallery-21.07.90.tar.xz | 3 +++ kirigami-gallery-21.07.90.tar.xz.sig | 16 ++++++++++++++++ kirigami-gallery.changes | 7 +++++++ kirigami-gallery.spec | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 kirigami-gallery-21.07.80.tar.xz delete mode 100644 kirigami-gallery-21.07.80.tar.xz.sig create mode 100644 kirigami-gallery-21.07.90.tar.xz create mode 100644 kirigami-gallery-21.07.90.tar.xz.sig diff --git a/kirigami-gallery-21.07.80.tar.xz b/kirigami-gallery-21.07.80.tar.xz deleted file mode 100644 index 9002bc7..0000000 --- a/kirigami-gallery-21.07.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbeca6b44d84dac9029644e378322c6b6e6e9e0a03079635f938a12731a90ae6 -size 329220 diff --git a/kirigami-gallery-21.07.80.tar.xz.sig b/kirigami-gallery-21.07.80.tar.xz.sig deleted file mode 100644 index e29e077..0000000 --- a/kirigami-gallery-21.07.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi5EACgkQOmpNuDnq -ptfN5w//cO4567lJ2UzjUZPVnDdaKulLMfwlT76sd3ikncE3rNg05IlDYnk8K/Mt -aIzF8JcAfszSleAQTcw2Nei1+I9LiSMK8rKHY3q5MzFNWWIMqcUNrfFTJQLpnLw/ -1Lj/kjDYvsi8JJXbxFYEIm3EH/rcQWR879FMgcUAO9y6LrxKsIrXpiZpewIwoKWO -a9e0Y6AB/AdQuclUCQqLLL/AEsrYlVfqHLDkjDdo+zbcba9qp6kTrvN8AUa14Ulc -3aTJiUeso6/uSmZeBMeCKXTeue29EfVozxP3H/5QPIZ5MHZhczrxnt0EF1RijATt -kUkYkYked4rlf4IgatgrHHJnrn2QO1UIOOOxEHriauFyI6K9NRQ0EMuSybCpgg3p -7gE3zjaO/87cgL4mmwMWFW7zyycUli9Whj144Mynlt4Ar5w94+pgHFMeplpYguhL -t41gkeUDxLzM7TENJ8ocK28s/iotTT5XIpD8uKfMH3WqnCrYI/TLzHxIGZGKNueD -A+9ME/PoV6TLfq81F2qtROihnhWLElrukHusCAcyool6fMa/ytBSDikWapKN/Ery -j8covQBIR3g8faByrId1McUz3NfDmaDNjZ2BxuXiXXYo54nAbwR0kAUglVSRJp5H -yQ9tZu32+wpW5OAsq0yGnOi8sJVr1WN19Wlndie/331lQVRzQ3s= -=oLyY ------END PGP SIGNATURE----- diff --git a/kirigami-gallery-21.07.90.tar.xz b/kirigami-gallery-21.07.90.tar.xz new file mode 100644 index 0000000..e206ffe --- /dev/null +++ b/kirigami-gallery-21.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffbe3d28428bfb965e4b5d42230b96025b4b7a3511eaf4c5fc51231488531a46 +size 329200 diff --git a/kirigami-gallery-21.07.90.tar.xz.sig b/kirigami-gallery-21.07.90.tar.xz.sig new file mode 100644 index 0000000..f9aeca6 --- /dev/null +++ b/kirigami-gallery-21.07.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDoHwACgkQu0YzUNbv +Me8QmA//VgMZhFbBIfSiO2fTqYuXOb+S0Ihvka0RKSjg22ycelR4VJlh+n4ibvZ/ +yru2e+Z/9c+0a3k0qTwATK0XT0+ltqLzMcPGgMFINWsMxOht/NTgw3SVssp2nt7D +cSxOZ5/73E0hw0zgjpHRzMaNnVc4g/27SHzMEz+hepNKYg1JgY5ZU4ybyq9joyaI +Qgi4mD88Mc47g4kquq0815tfXp/5j4yuhTkn4l+VghOKv28yoKCkKgLMcmKBBoA8 +UCbdcrk1ivdauN17qtAPulXIn1VLCyMvxAGW9kqXSbavdAbeXb6jAetR6nIV2Yrt +dDZq29VMsBnl0w9j06O9jAZbq4RQOP16aZ7afmDR+41MHZmhPFfk1bWQ5atJgIvs +Hux8DFGpxUtnvQbrWCt/XFHpQCQ5zdnonMkDu7VKFYy4+6F7nag3WnVypVe3l+NV ++9l5NGiJZjGqTHepzYa8x5FaSgw1LBmt0nj20QFpdkOqxKSrItUGqVPN3tmAI86m +3q0PM5im01sezKNsvABNnRTrxi2qNpCuzoHv+r4yybnlcybVyG2ivzXGftHJhDjz +2AKBptAetf7V6jntWCM7RsdHKsequwf1ze0qRFZ+Ljw8PK4XZa7zk1CDqFyVfYpX +kO8iv/6wwx5Jr42nczeccxrUtexCTJaCw/f7DGGIQIe9CMwoW2s= +=Awt5 +-----END PGP SIGNATURE----- diff --git a/kirigami-gallery.changes b/kirigami-gallery.changes index b4eaf88..c7a4f07 100644 --- a/kirigami-gallery.changes +++ b/kirigami-gallery.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 30 10:05:04 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + ------------------------------------------------------------------- Sat Jul 17 20:06:10 UTC 2021 - Christophe Giboudeaux diff --git a/kirigami-gallery.spec b/kirigami-gallery.spec index f2aa702..a50e03a 100644 --- a/kirigami-gallery.spec +++ b/kirigami-gallery.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kirigami-gallery -Version: 21.07.80 +Version: 21.07.90 Release: 0 Summary: Gallery application built using Kirigami License: LGPL-2.0-or-later From 3d9fcf76667614ccec64b0d2c558c69acff57fab72a1539d2c8ad335ee27c0b0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 7 Aug 2021 11:17:20 +0000 Subject: [PATCH 3/4] KDE Gear 21.08 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kirigami-gallery?expand=0&rev=103 --- kirigami-gallery-21.07.90.tar.xz | 3 --- kirigami-gallery-21.07.90.tar.xz.sig | 16 ---------------- kirigami-gallery-21.08.0.tar.xz | 3 +++ kirigami-gallery-21.08.0.tar.xz.sig | 16 ++++++++++++++++ kirigami-gallery.changes | 9 +++++++++ kirigami-gallery.spec | 6 +++--- 6 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 kirigami-gallery-21.07.90.tar.xz delete mode 100644 kirigami-gallery-21.07.90.tar.xz.sig create mode 100644 kirigami-gallery-21.08.0.tar.xz create mode 100644 kirigami-gallery-21.08.0.tar.xz.sig diff --git a/kirigami-gallery-21.07.90.tar.xz b/kirigami-gallery-21.07.90.tar.xz deleted file mode 100644 index e206ffe..0000000 --- a/kirigami-gallery-21.07.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffbe3d28428bfb965e4b5d42230b96025b4b7a3511eaf4c5fc51231488531a46 -size 329200 diff --git a/kirigami-gallery-21.07.90.tar.xz.sig b/kirigami-gallery-21.07.90.tar.xz.sig deleted file mode 100644 index f9aeca6..0000000 --- a/kirigami-gallery-21.07.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEDoHwACgkQu0YzUNbv -Me8QmA//VgMZhFbBIfSiO2fTqYuXOb+S0Ihvka0RKSjg22ycelR4VJlh+n4ibvZ/ -yru2e+Z/9c+0a3k0qTwATK0XT0+ltqLzMcPGgMFINWsMxOht/NTgw3SVssp2nt7D -cSxOZ5/73E0hw0zgjpHRzMaNnVc4g/27SHzMEz+hepNKYg1JgY5ZU4ybyq9joyaI -Qgi4mD88Mc47g4kquq0815tfXp/5j4yuhTkn4l+VghOKv28yoKCkKgLMcmKBBoA8 -UCbdcrk1ivdauN17qtAPulXIn1VLCyMvxAGW9kqXSbavdAbeXb6jAetR6nIV2Yrt -dDZq29VMsBnl0w9j06O9jAZbq4RQOP16aZ7afmDR+41MHZmhPFfk1bWQ5atJgIvs -Hux8DFGpxUtnvQbrWCt/XFHpQCQ5zdnonMkDu7VKFYy4+6F7nag3WnVypVe3l+NV -+9l5NGiJZjGqTHepzYa8x5FaSgw1LBmt0nj20QFpdkOqxKSrItUGqVPN3tmAI86m -3q0PM5im01sezKNsvABNnRTrxi2qNpCuzoHv+r4yybnlcybVyG2ivzXGftHJhDjz -2AKBptAetf7V6jntWCM7RsdHKsequwf1ze0qRFZ+Ljw8PK4XZa7zk1CDqFyVfYpX -kO8iv/6wwx5Jr42nczeccxrUtexCTJaCw/f7DGGIQIe9CMwoW2s= -=Awt5 ------END PGP SIGNATURE----- diff --git a/kirigami-gallery-21.08.0.tar.xz b/kirigami-gallery-21.08.0.tar.xz new file mode 100644 index 0000000..d9573df --- /dev/null +++ b/kirigami-gallery-21.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:487753e629565953799050f4bfaa8bbbc53f7c352127c82ebf02d595155dc4e0 +size 329200 diff --git a/kirigami-gallery-21.08.0.tar.xz.sig b/kirigami-gallery-21.08.0.tar.xz.sig new file mode 100644 index 0000000..279bf19 --- /dev/null +++ b/kirigami-gallery-21.08.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEMgXsACgkQu0YzUNbv +Me81OxAAjff12RuKhyreGzcaOcOB69GhUm3WSksculPkznwndGHk5xug/BI7Xllj +H+p1JiMVd1NKOBch9i08gLdIYism+QwI31w/DCL9OOF1TpfVy/SGUgnxDaaFeMff +i7x/ajToHJR9SkGGZt7TDaiDkK1KijvYqHWZHd1XSg0hwNSaJWFFQmIH+hAYY975 +jw1rlIbW/7B1YBDQSW/YF8YoOKwm/druuOb9uedMHWIls0noWCn0KmOqZBTN3x5M +aHnHs6PDduNd3xecqtpBP8fTtETtuaCCPGq64Kmq5mi6aDuWF03uieBjRB5Yj7my +78n52AyKaySJEEnNL/SQlesOd1oQ1b3lwXl8MImNsEL6h0fo14i1/nPQNL6mQU3n +i1X5UPhOyD1cwZWgj9N4eo/zksYCNeZl7aaISeV8xTR1h0lqRjYcWLhMXYFk/TVk +2tdBtYgWJwZYav9E+XBT0zidcOgSPOcExQyajxnnjtURT4Hxol9HG3qpPoFYcAgD +As+3A0kmSJQsc5koPegn7CRa5SAQtffc1uUlVyd7F95DYIC0Vs4EfPFhzAZfTuza +EQFb0RW897Fel2wH4tuORWUe+8RcRHbaFyA9NzrPTEsWLvraLcLpt0drpb/ZBkqZ +oCKMTN7oer/GWnFS3MwNLDYsnHa1ovAnpOsOT2CJ6Edk9TskWzM= +=cn6P +-----END PGP SIGNATURE----- diff --git a/kirigami-gallery.changes b/kirigami-gallery.changes index c7a4f07..65984c6 100644 --- a/kirigami-gallery.changes +++ b/kirigami-gallery.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 6 09:38:56 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:04 UTC 2021 - Christophe Giboudeaux diff --git a/kirigami-gallery.spec b/kirigami-gallery.spec index a50e03a..00f4364 100644 --- a/kirigami-gallery.spec +++ b/kirigami-gallery.spec @@ -18,15 +18,15 @@ %bcond_without lang Name: kirigami-gallery -Version: 21.07.90 +Version: 21.08.0 Release: 0 Summary: Gallery application built using Kirigami License: LGPL-2.0-or-later Group: Development/Tools/Other URL: https://apps.kde.org/kirigami2.gallery -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 4cb9c9a64509678f34d3e77e5bbcb6907f4ca92255c4956d2bedaedfe620f0ba Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Aug 2021 11:53:17 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kirigami-gallery?expand=0&rev=104 --- kirigami-gallery.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kirigami-gallery.changes b/kirigami-gallery.changes index 65984c6..ae1f26b 100644 --- a/kirigami-gallery.changes +++ b/kirigami-gallery.changes @@ -4,7 +4,7 @@ Fri Aug 6 09:38:56 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 -------------------------------------------------------------------