From 943a26a8758fa8b680debbe72309aaf9951d91c6 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Fri, 18 Nov 2016 15:02:09 +0000 Subject: [PATCH] Import ksyntax-highlighting_5.28.0-1.debian.tar.xz [dgit import tarball ksyntax-highlighting 5.28.0-1 ksyntax-highlighting_5.28.0-1.debian.tar.xz] --- changelog | 14 + compat | 1 + control | 60 +++++ copyright | 355 +++++++++++++++++++++++++ libkf5syntaxhighlighting-dev.acc.in | 22 ++ libkf5syntaxhighlighting-dev.install | 5 + libkf5syntaxhighlighting-tools.install | 2 + libkf5syntaxhighlighting5.install | 2 + rules | 11 + source/format | 1 + tests/acc | 18 ++ tests/control | 9 + tests/testsuite | 8 + tests/testsuite.xsession | 10 + upstream/metadata | 7 + watch | 2 + 16 files changed, 527 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 libkf5syntaxhighlighting-dev.acc.in create mode 100644 libkf5syntaxhighlighting-dev.install create mode 100644 libkf5syntaxhighlighting-tools.install create mode 100644 libkf5syntaxhighlighting5.install create mode 100755 rules create mode 100644 source/format create mode 100755 tests/acc create mode 100644 tests/control create mode 100644 tests/testsuite create mode 100755 tests/testsuite.xsession create mode 100644 upstream/metadata create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..da75724 --- /dev/null +++ b/changelog @@ -0,0 +1,14 @@ +ksyntax-highlighting (5.28.0-1) unstable; urgency=medium + + * Initial Debian upload + * New upstream release (5.28). + * Update install files + + -- Maximiliano Curia Fri, 18 Nov 2016 16:02:09 +0100 + +syntax-highlighting (5.26.0-0neon) xenial; urgency=medium + + * Initial release + + -- Neon CI Mon, 12 Sep 2016 08:32:19 +0000 + diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..a5036a4 --- /dev/null +++ b/control @@ -0,0 +1,60 @@ +Source: ksyntax-highlighting +Section: libs +Priority: optional +Maintainer: Debian/Kubuntu Qt/KDE Maintainers +Uploaders: Maximiliano Curia +Build-Depends: cmake (>= 2.8.12), + debhelper (>= 9), + extra-cmake-modules (>= 5.26.0~), + libqt5xmlpatterns5-dev (>= 5.6.0~), + perl, + pkg-kde-tools (>= 0.15.15ubuntu1~), + qtbase5-dev (>= 5.6.0~) +Standards-Version: 3.9.8 +Homepage: https://projects.kde.org/projects/frameworks/syntax-highlighting +Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/ksyntax-highlighting.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/ksyntax-highlighting.git + +Package: libkf5syntaxhighlighting-dev +Section: libdevel +Architecture: any +Depends: libkf5syntaxhighlighting5 (= ${binary:Version}), + libqt5xmlpatterns5-dev (>= 5.6.0~), + qtbase5-dev (>= 5.6.0~), + ${misc:Depends} +Description: Syntax highlighting Engine + This is a stand-alone implementation of the Kate syntax + highlighting engine. It's meant as a building block for + text editors as well as for simple highlighted text + rendering (e.g. as HTML), supporting both integration + with a custom editor as well as a ready-to-use + QSyntaxHighlighter sub-class. + . + Contains development files for libkf5syntaxhighlighting5. + +Package: libkf5syntaxhighlighting5 +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Syntax highlighting Engine + This is a stand-alone implementation of the Kate syntax + highlighting engine. It's meant as a building block for + text editors as well as for simple highlighted text + rendering (e.g. as HTML), supporting both integration + with a custom editor as well as a ready-to-use + QSyntaxHighlighter sub-class. + . + +Package: libkf5syntaxhighlighting-tools +Architecture: any +Depends: libkf5syntaxhighlighting5 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Syntax highlighting Engine + This is a stand-alone implementation of the Kate syntax + highlighting engine. It's meant as a building block for + text editors as well as for simple highlighted text + rendering (e.g. as HTML), supporting both integration + with a custom editor as well as a ready-to-use + QSyntaxHighlighter sub-class. + . + Provides additional tools for libkf5syntaxhighlighting5 diff --git a/copyright b/copyright new file mode 100644 index 0000000..4ec9794 --- /dev/null +++ b/copyright @@ -0,0 +1,355 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: syntax-highlighting +Source: https://projects.kde.org/projects/frameworks/syntax-highlighting + +Files: * +Copyright: 2009-2013, Alex Turbov + 2013-2015, Alex Turbov + 2004, Alexander Neundorf + 2002, Anders Lund + 2012, Antoni Boucher + 2005, Chris Martin + 2014, Christoph Cullmann + 2008, Chusslove Illich + 2008, Diggory Hardy + 2004-2005, Dominik Haumann + 2016, Dominik Haumann + 2004-2005, Dominik Haumann + 2016, Fernand Veilleux + 2004, Goffart Olivier + 2004, Irv Mullins + 2001, Joseph Wenninger + 2007-2014, Matthew Woehlke + 2014, Michal Humpula + 2011, Miquel Sabaté + 2006, Richard Dale + 2008, Robin Pedersen + 2007, Sebastian Pipping + 2004, Sebastian Vuorinen + 2003, Simon Huerlimann + 2004, Stefan Lang + 2012, Torsten Eichstädt + 2016, Volker Krause + 2008, Wilbert Berendsen + 2006, Wilbert Berendsen + ; As LGPL + 2012-2014, Alex Turbov + 2007, Aziz Köksal + 2004, Jan Villat + 2007, Jari-Matti Mäkelä + 2011, Jonathan Kolberg + 2008, Joseph Wenninger + 2006-2010, Matthew Woehlke + 2004, Simon J Mackenzie + 2004, Wilbert Berendsen + 2012, alexander Kabakov. http://kabakov.wordpress.com + ; No explicit license + Share and enjoy! + 2011-2013, Alex Turbov + 2013, Alex Turbov + 2002, Anders Lund + 2000-2010, Authors and OPENCORES.ORG + 2005, Dominik Haumann + 2012, Johannes Schwenk, johannes.schwenk@adition.com + 2012, Jose A. Ruiz + 2001, Joseph Wenninger + 2010, Matt Williams + 2008-2014, Matthew Woehlke + 2003, Simon Huerlimann + 2008, Wilbert Berendsen + 1998, ©RES® * FREEWARE + 2007, Красимир Беров +License: LGPL-2+ + +Files: autotests/folding/highlight.prg.fold + autotests/html/highlight.prg.html + autotests/input/highlight.prg + autotests/reference/highlight.prg.ref + data/syntax/abap.xml + data/syntax/asn1.xml + data/syntax/asterisk.xml + data/syntax/bitbake.xml + data/syntax/clipper.xml + data/syntax/context.xml + data/syntax/email.xml + data/syntax/fasm.xml + data/syntax/fastq.xml + data/syntax/freebasic.xml + data/syntax/gap.xml + data/syntax/gitolite.xml + data/syntax/inform.xml + data/syntax/j.xml + data/syntax/json.xml + data/syntax/mandoc.xml + data/syntax/markdown.xml + data/syntax/monobasic.xml + data/syntax/nagios.xml + data/syntax/octave.xml + data/syntax/progress.xml + data/syntax/rmarkdown.xml + data/syntax/roff.xml + data/syntax/sed.xml + data/syntax/wml.xml + data/syntax/xharbour.xml +Copyright: 2005, Carl A Joslin + 2008, Darrin Yeager. http://www.dyeager.org + 2014, Dirk Sarpe + 2004, Roland Nagy +License: GPL + license="GPL" + . + The complete text of the GNU General Public License can be found in + `/usr/share/common-licenses/GPL'. + +Files: COPYING.LIB + autotests/folding/light52_muldiv.vhdl.fold + autotests/folding/light52_tb.vhdl.fold + autotests/folding/or1200_dc_fsm.v.fold + autotests/folding/or1200_du.v.fold + autotests/input/light52_muldiv.vhdl + autotests/input/light52_tb.vhdl + autotests/input/or1200_dc_fsm.v + autotests/input/or1200_du.v + data/syntax/ansforth94.xml + data/syntax/maxima.xml +Copyright: 2008, Alexey V. Beshenov + 2000-2010, Authors and OPENCORES.ORG + 1991-1999, Free Software Foundation, Inc + 2012, Jose A. Ruiz + 2011, Mark Corbin +License: LGPL-2.1+ + +Files: data/syntax/asm-avr.xml + data/syntax/gnuassembler.xml + data/syntax/go.xml + data/syntax/ilerpg.xml + data/syntax/mel.xml + data/syntax/nasm.xml + data/syntax/replicode.xml +Copyright: 2002, John Zaitseff + 2014, Martin Sandsmark + 2010, Miquel Sabaté + 2003, Nick Roux + 2004, Roland Nagy +License: GPL-2+ + +Files: data/syntax/varnish.xml + data/syntax/varnish4.xml + data/syntax/varnishcc.xml + data/syntax/varnishcc4.xml + data/syntax/varnishtest.xml + data/syntax/varnishtest4.xml +Copyright: Xavier Guerrin +License: WTFPL + license="WTFPL" + +Files: autotests/folding/test.bb.fold + autotests/input/test.bb + data/syntax/nesc.xml + data/syntax/r.xml + data/syntax/taskjuggler.xml +Copyright: 2009, Chris Schlaeger + 2006, Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team +License: GPL-2 + LICENSE = "GPLv2" + . + The complete text of the GNU General Public License version 2 can be found in + "/usr/share/common-licenses/GPL-2". + +Files: data/syntax/erlang.xml + data/syntax/modelica.xml + data/syntax/perl.xml + data/syntax/praat.xml +Copyright: 2001-2004, Anders Lund + 2007, Bill Ross + 2016, José Joaquín Atria +License: LGPL-2 + +Files: data/syntax/jam.xml + data/syntax/rust.xml +Copyright: 2006, Mildred + 2015, The Rust Project Developers +License: Expat + +Files: data/syntax/systemverilog.xml + data/syntax/vera.xml +Copyright: Sean O'Boyle +License: GPL-3+ + +Files: data/syntax/kdesrc-buildrc.xml + data/syntax/lsl.xml +Copyright: Michael Pyne + Rafał Rzepeck +License: LGPL-3 + license = "LGPLv3" + . + The complete text of the GNU Lesser General Public License version 3 can be + found in `/usr/share/common-licenses/LGPL-3'. + +Files: data/syntax/elixir.xml +Copyright: 2016, Boris Egorov + 2014, Rubén Caro +License: GPL_LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + This library 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 + Library General Public License for more details. + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + . + license="GPL" + . + The complete text of the GNU Library General Public License version 2 can be + found in `/usr/share/common-licenses/LGPL-2', likewise, the complete text of + the GNU General Public License can be found in + `/usr/share/common-licenses/GPL'. +Comment: The xml attribution and the licensing information in the comments + don't match, probably a typo in the attribution. + +Files: data/syntax/m4.xml +Copyright: 2011, Cybernetica AS ( http://www.cyber.ee/ ) +License: BSD-3-clause + +Files: data/syntax/kconfig.xml +Copyright: Martin Walch +License: GPL-3 + license="GPLv3" + . + The complete text of the GNU General Public License version 3 can be found in + `/usr/share/common-licenses/GPL-3'. + +Files: debian/* +Copyright: 2014, Scarlett Clark + 2016, Maximiliano Curia +License: LGPL-2+ + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +License: GPL-2+ + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, 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 General Public License for more details. + . + The complete text of the GNU General Public License version 3 can be found in + `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + . + This library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. 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 Library General + Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. 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 Library General + Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". + +License: LGPL-2.1+ + This library 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 of the License, or (at your option) any later version. + . + This library 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. + . + 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'. diff --git a/libkf5syntaxhighlighting-dev.acc.in b/libkf5syntaxhighlighting-dev.acc.in new file mode 100644 index 0000000..4ce77b2 --- /dev/null +++ b/libkf5syntaxhighlighting-dev.acc.in @@ -0,0 +1,22 @@ + + + + + 5.6.0 + + + + /usr/include/KF5/KSyntaxHighlighting/ + + + + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5SyntaxHighlighting.so + + + + -fPIC + -std=c++11 + -I/usr/lib/@@DEB_HOST_MULTIARCH@@/qt5/mkspecs/linux-lsb-g++ + + + diff --git a/libkf5syntaxhighlighting-dev.install b/libkf5syntaxhighlighting-dev.install new file mode 100644 index 0000000..f47ce58 --- /dev/null +++ b/libkf5syntaxhighlighting-dev.install @@ -0,0 +1,5 @@ +usr/include/KF5/KSyntaxHighlighting +usr/include/KF5/ksyntaxhighlighting_version.h +usr/lib/*/cmake/KF5SyntaxHighlighting +usr/lib/*/libKF5SyntaxHighlighting.so +usr/lib/*/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri diff --git a/libkf5syntaxhighlighting-tools.install b/libkf5syntaxhighlighting-tools.install new file mode 100644 index 0000000..049b369 --- /dev/null +++ b/libkf5syntaxhighlighting-tools.install @@ -0,0 +1,2 @@ +etc/xdg/org_kde_ksyntaxhighlighting.categories +usr/bin/kate-syntax-highlighter diff --git a/libkf5syntaxhighlighting5.install b/libkf5syntaxhighlighting5.install new file mode 100644 index 0000000..75a007b --- /dev/null +++ b/libkf5syntaxhighlighting5.install @@ -0,0 +1,2 @@ +usr/lib/*/libKF5SyntaxHighlighting.so.5.* +usr/lib/*/libKF5SyntaxHighlighting.so.5 diff --git a/rules b/rules new file mode 100755 index 0000000..0ac3ee6 --- /dev/null +++ b/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk + +override_dh_strip: + $(overridden_command) --dbgsym-migration='syntax-highlighting-dbg (<= 5.19.0-1~~)' + +override_dh_auto_test: + # Disable dh_auto_test at build time + : diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/acc b/tests/acc new file mode 100755 index 0000000..28b8d41 --- /dev/null +++ b/tests/acc @@ -0,0 +1,18 @@ +#!/bin/sh + +DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH) + +for in_file in debian/*.acc.in; do + out_file=${in_file%.in} + sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \ + "${in_file}" > "${out_file}" +done + +DH_VERBOSE=1 + +dh_acc +ret=$? +if [ 0 -ne $ret ]; then + cp -r logs "${ADT_ARTIFACTS}"/acc.logs +fi +exit $ret diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..ed63380 --- /dev/null +++ b/tests/control @@ -0,0 +1,9 @@ +Tests: testsuite +Depends: @, @builddeps@, build-essential, + xvfb, xauth, dbus (>= 1.8), openbox, + libkf5service-bin, kded5, kinit, libkf5parts5, libkf5dbusaddons-bin +Restrictions: build-needed + +Tests: acc +Depends: @, dh-acc, exuberant-ctags +Restrictions: allow-stderr diff --git a/tests/testsuite b/tests/testsuite new file mode 100644 index 0000000..823bf7d --- /dev/null +++ b/tests/testsuite @@ -0,0 +1,8 @@ +#!/bin/sh + +[ -e debian/tests.home ] || mkdir debian/tests.home +trap "rm -rf debian/tests.home" EXIT +export HOME="$(pwd)/debian/tests.home" + +xvfb-run -a --server-args="-screen 0 1024x768x24+32" \ + dbus-run-session -- debian/tests/testsuite.xsession diff --git a/tests/testsuite.xsession b/tests/testsuite.xsession new file mode 100755 index 0000000..684ec20 --- /dev/null +++ b/tests/testsuite.xsession @@ -0,0 +1,10 @@ +#!/bin/sh +export LANG=C.UTF-8 +export LC_ALL=C.UTF-8 +openbox & +sleep 5 +kdeinit5 +trap "kdeinit5_shutdown" EXIT +sleep 1 + +dh_auto_test diff --git a/upstream/metadata b/upstream/metadata new file mode 100644 index 0000000..17fef0f --- /dev/null +++ b/upstream/metadata @@ -0,0 +1,7 @@ +Name: ksyntax-highlighting +Changelog: https://quickgit.kde.org/?p=syntax-highlighting.git&a=log +Contact: kde-frameworks-devel@kde.org +Donation: https://www.kde.org/community/donations/index.php +Repository: https://anongit.kde.org/syntax-highlighting.git +Repository-Browse: https://quickgit.kde.org/?p=syntax-highlighting.git +Security-Contact: security@kde.org diff --git a/watch b/watch new file mode 100644 index 0000000..668aaa2 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=3 +http://download.kde.org/stable/frameworks/([\d.]+)/syntax-highlighting-([\d.]+)\.tar\.xz -- 2.30.2