From 207077d7d4f2f87aa03df84843c2d277032963f6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 31 Dec 2020 14:52:25 +0200 Subject: [PATCH] version bump Signed-off-by: Ivailo Monev --- CMakeLists.txt | 4 ++-- appveyor.yml | 2 +- package/archlinux/PKGBUILD | 4 ++-- package/debian/changelog | 6 ++++++ package/debian/control | 2 +- package/fedora/katie.spec | 8 ++++++-- package/freebsd/Makefile | 2 +- package/freebsd/pkg-plist | 28 ++++++++++++++-------------- package/netbsd/Makefile | 2 +- package/netbsd/PLIST.common | 28 ++++++++++++++-------------- package/netbsd/buildlink3.mk | 2 +- package/openbsd/Makefile | 2 +- scripts/genman.py | 2 +- scripts/tarball.sh | 2 +- src/tools/moc/moc.1 | 4 ++-- src/tools/qdbus/qdbus.1 | 4 ++-- src/tools/qdbus/qdbuscpp2xml.1 | 4 ++-- src/tools/qdbus/qdbusxml2cpp.1 | 4 ++-- src/tools/qscript/qscript.1 | 4 ++-- src/tools/rcc/rcc.1 | 4 ++-- src/tools/uic/uic.1 | 4 ++-- 21 files changed, 66 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af425670d..9514bb7a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,8 @@ include(mkspecs/mkspecs.cmake) # mostly relevant to the build process, also stored in the version file for CMake and in qconfig.h.cmake set(KATIE_MAJOR "4") set(KATIE_MINOR "9") -set(KATIE_MICRO "1") -set(KATIE_HEX "0x040901") +set(KATIE_MICRO "2") +set(KATIE_HEX "0x040902") set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}") # only for the build process diff --git a/appveyor.yml b/appveyor.yml index f0d9c7a87..1b927ded4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 4.9.1-{branch}-{build} +version: 4.9.2-{branch}-{build} image: Ubuntu2004 clone_depth: 1 services: diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index d5dc33fab..53464c172 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -4,7 +4,7 @@ # https://wiki.archlinux.org/index.php/Arch_package_guidelines pkgname=katie-git -pkgver=4.9.1.r4681.8f22ea5f +pkgver=4.9.2.r4681.8f22ea5f pkgrel=1 pkgdesc='C++ toolkit derived from the Qt 4.8 framework' arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') @@ -22,7 +22,7 @@ conflicts=('katie') pkgver() { cd katie - printf "4.9.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "4.9.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { diff --git a/package/debian/changelog b/package/debian/changelog index 4abb50b9d..ec9122443 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +katie (4.9.2) unstable; urgency=medium + + * Third package update + + -- Ivailo Monev Thu, 31 Dec 2020 14:44:00 +0200 + katie (4.9.1) unstable; urgency=medium * Second package update diff --git a/package/debian/control b/package/debian/control index a937805e8..a2628198f 100644 --- a/package/debian/control +++ b/package/debian/control @@ -4,7 +4,7 @@ Maintainer: Ivailo Monev Homepage: https://github.com/fluxer/katie Vcs-Git: git://github.com/fluxer/katie.git Vcs-browser: https://github.com/fluxer/katie -Standards-Version: 4.9.1 +Standards-Version: 4.9.2 Build-Depends: debhelper (>= 9~), libssl-dev, zlib1g-dev, libzstd-dev, libc6-dev, libpng-dev, libjpeg-dev, libtiff5-dev, libcups2-dev, libfreetype6-dev, libfontconfig1-dev, libpcre3-dev, libdbus-1-dev, diff --git a/package/fedora/katie.spec b/package/fedora/katie.spec index 11942830b..9134e8065 100644 --- a/package/fedora/katie.spec +++ b/package/fedora/katie.spec @@ -1,8 +1,8 @@ # https://docs.fedoraproject.org/en-US/packaging-guidelines/ Name: katie -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.9.2 +Release: 1%{?dist} Summary: C++ toolkit derived from the Qt 4.8 framework License: BSD and LGPLv2+ URL: https://github.com/fluxer/katie @@ -54,6 +54,10 @@ This package includes headers, pkg-config and CMake files. %{_libdir}/pkgconfig/* %{_libdir}/cmake/Katie/* +%changelog +* Mon Dec 21 2020 Ivailo Monev - 4.9.2-1 +- package update + %changelog * Mon Dec 21 2020 Ivailo Monev - 4.9.1-2 - split package diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile index 3dc9b7057..49e7f22b7 100644 --- a/package/freebsd/Makefile +++ b/package/freebsd/Makefile @@ -3,7 +3,7 @@ # https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ PORTNAME = katie -DISTVERSION = 4.9.1.d20201217 +DISTVERSION = 4.9.2.d20201231 CATEGORIES = devel x11 ftp net www MAINTAINER = xakepa10@gmail.com COMMENT = C++ toolkit derived from the Qt 4.8 framework diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index 4d9bd79f1..05008829e 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -1486,46 +1486,46 @@ lib/katie/plugins/sqldrivers/libqsqlodbc.so %%PGSQL%%lib/katie/plugins/sqldrivers/libqsqlpsql.so lib/libKtCore.so lib/libKtCore.so.4.9 -lib/libKtCore.so.4.9.1 +lib/libKtCore.so.4.9.2 lib/libKtDBus.so lib/libKtDBus.so.4.9 -lib/libKtDBus.so.4.9.1 +lib/libKtDBus.so.4.9.2 lib/libKtDeclarative.so lib/libKtDeclarative.so.4.9 -lib/libKtDeclarative.so.4.9.1 +lib/libKtDeclarative.so.4.9.2 lib/libKtDesigner.so lib/libKtDesigner.so.4.9 -lib/libKtDesigner.so.4.9.1 +lib/libKtDesigner.so.4.9.2 lib/libKtDesignerComponents.so lib/libKtDesignerComponents.so.4.9 -lib/libKtDesignerComponents.so.4.9.1 +lib/libKtDesignerComponents.so.4.9.2 lib/libKtGui.so lib/libKtGui.so.4.9 -lib/libKtGui.so.4.9.1 +lib/libKtGui.so.4.9.2 lib/libKtNetwork.so lib/libKtNetwork.so.4.9 -lib/libKtNetwork.so.4.9.1 +lib/libKtNetwork.so.4.9.2 lib/libKtScript.so lib/libKtScript.so.4.9 -lib/libKtScript.so.4.9.1 +lib/libKtScript.so.4.9.2 lib/libKtScriptTools.so lib/libKtScriptTools.so.4.9 -lib/libKtScriptTools.so.4.9.1 +lib/libKtScriptTools.so.4.9.2 lib/libKtSql.so lib/libKtSql.so.4.9 -lib/libKtSql.so.4.9.1 +lib/libKtSql.so.4.9.2 lib/libKtSvg.so lib/libKtSvg.so.4.9 -lib/libKtSvg.so.4.9.1 +lib/libKtSvg.so.4.9.2 lib/libKtTest.so lib/libKtTest.so.4.9 -lib/libKtTest.so.4.9.1 +lib/libKtTest.so.4.9.2 lib/libKtUiTools.so lib/libKtUiTools.so.4.9 -lib/libKtUiTools.so.4.9.1 +lib/libKtUiTools.so.4.9.2 lib/libKtXml.so lib/libKtXml.so.4.9 -lib/libKtXml.so.4.9.1 +lib/libKtXml.so.4.9.2 libdata/pkgconfig/KtCore.pc libdata/pkgconfig/KtDBus.pc libdata/pkgconfig/KtDeclarative.pc diff --git a/package/netbsd/Makefile b/package/netbsd/Makefile index 323f9c3f1..eed779718 100644 --- a/package/netbsd/Makefile +++ b/package/netbsd/Makefile @@ -4,7 +4,7 @@ # https://www.netbsd.org/docs/pkgsrc/ DISTNAME = master -PKGNAME = katie-4.9.1.d20201217 +PKGNAME = katie-4.9.2.d20201231 CATEGORIES = devel x11 net www MAINTAINER = xakepa10@gmail.com COMMENT = C++ toolkit deived from the Qt 4.8 framework diff --git a/package/netbsd/PLIST.common b/package/netbsd/PLIST.common index ff23d6a7e..73523f4c5 100644 --- a/package/netbsd/PLIST.common +++ b/package/netbsd/PLIST.common @@ -1487,46 +1487,46 @@ lib/katie/plugins/script/libqtscriptdbus.so lib/katie/plugins/sqldrivers/libqsqlodbc.so lib/libKtCore.so lib/libKtCore.so.4.9 -lib/libKtCore.so.4.9.1 +lib/libKtCore.so.4.9.2 lib/libKtDBus.so lib/libKtDBus.so.4.9 -lib/libKtDBus.so.4.9.1 +lib/libKtDBus.so.4.9.2 lib/libKtDeclarative.so lib/libKtDeclarative.so.4.9 -lib/libKtDeclarative.so.4.9.1 +lib/libKtDeclarative.so.4.9.2 lib/libKtDesigner.so lib/libKtDesigner.so.4.9 -lib/libKtDesigner.so.4.9.1 +lib/libKtDesigner.so.4.9.2 lib/libKtDesignerComponents.so lib/libKtDesignerComponents.so.4.9 -lib/libKtDesignerComponents.so.4.9.1 +lib/libKtDesignerComponents.so.4.9.2 lib/libKtGui.so lib/libKtGui.so.4.9 -lib/libKtGui.so.4.9.1 +lib/libKtGui.so.4.9.2 lib/libKtNetwork.so lib/libKtNetwork.so.4.9 -lib/libKtNetwork.so.4.9.1 +lib/libKtNetwork.so.4.9.2 lib/libKtScript.so lib/libKtScript.so.4.9 -lib/libKtScript.so.4.9.1 +lib/libKtScript.so.4.9.2 lib/libKtScriptTools.so lib/libKtScriptTools.so.4.9 -lib/libKtScriptTools.so.4.9.1 +lib/libKtScriptTools.so.4.9.2 lib/libKtSql.so lib/libKtSql.so.4.9 -lib/libKtSql.so.4.9.1 +lib/libKtSql.so.4.9.2 lib/libKtSvg.so lib/libKtSvg.so.4.9 -lib/libKtSvg.so.4.9.1 +lib/libKtSvg.so.4.9.2 lib/libKtTest.so lib/libKtTest.so.4.9 -lib/libKtTest.so.4.9.1 +lib/libKtTest.so.4.9.2 lib/libKtUiTools.so lib/libKtUiTools.so.4.9 -lib/libKtUiTools.so.4.9.1 +lib/libKtUiTools.so.4.9.2 lib/libKtXml.so lib/libKtXml.so.4.9 -lib/libKtXml.so.4.9.1 +lib/libKtXml.so.4.9.2 lib/pkgconfig/KtCore.pc lib/pkgconfig/KtDBus.pc lib/pkgconfig/KtDeclarative.pc diff --git a/package/netbsd/buildlink3.mk b/package/netbsd/buildlink3.mk index e3f6666e4..1c08c9b84 100644 --- a/package/netbsd/buildlink3.mk +++ b/package/netbsd/buildlink3.mk @@ -5,7 +5,7 @@ BUILDLINK_TREE+= katie .if !defined(KATIE_BUILDLINK3_MK) KATIE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.katie+= katie>=4.9.1.d20201217 +BUILDLINK_API_DEPENDS.katie+= katie>=4.9.2.d20201231 BUILDLINK_PKGSRCDIR.katie?= ../../devel/katie .endif # KATIE_BUILDLINK3_MK diff --git a/package/openbsd/Makefile b/package/openbsd/Makefile index cdf053dea..7115e7b35 100644 --- a/package/openbsd/Makefile +++ b/package/openbsd/Makefile @@ -3,7 +3,7 @@ # https://www.openbsd.org/faq/ports/ DISTNAME = katie -PKGNAME = katie-4.9.1.d20201217 +PKGNAME = katie-4.9.2.d20201231 CATEGORIES = devel x11 net www MAINTAINER = Ivailo Monev COMMENT = C++ toolkit derived from the Qt 4.8 framework diff --git a/scripts/genman.py b/scripts/genman.py index f095d1bc2..01f695105 100755 --- a/scripts/genman.py +++ b/scripts/genman.py @@ -23,7 +23,7 @@ for root, sdir, lfiles in os.walk('%s/../src/tools' % cwd): ofile = ifile.replace('.pod', '.1') subprocess.check_call( (pod2man, - '--release=Katie 4.9.1', + '--release=Katie 4.9.2', '--center=Katie Manual', '--section=1', '--utf8', diff --git a/scripts/tarball.sh b/scripts/tarball.sh index b2eb62881..695624a8c 100755 --- a/scripts/tarball.sh +++ b/scripts/tarball.sh @@ -4,6 +4,6 @@ set -e cwd="$(readlink -f $(dirname $0))" -tarball="Katie-4.9.1-Source" +tarball="Katie-4.9.2-Source" git archive HEAD --format=tar --prefix="$tarball/" | xz > "$cwd/../$tarball.tar.xz" diff --git a/src/tools/moc/moc.1 b/src/tools/moc/moc.1 index 6e18eb0c0..aadba042b 100644 --- a/src/tools/moc/moc.1 +++ b/src/tools/moc/moc.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "MOC 1" -.TH MOC 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH MOC 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbus.1 b/src/tools/qdbus/qdbus.1 index c3823a5e8..6aacec221 100644 --- a/src/tools/qdbus/qdbus.1 +++ b/src/tools/qdbus/qdbus.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUS 1" -.TH QDBUS 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH QDBUS 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbuscpp2xml.1 b/src/tools/qdbus/qdbuscpp2xml.1 index 4c7f3118f..90d583aac 100644 --- a/src/tools/qdbus/qdbuscpp2xml.1 +++ b/src/tools/qdbus/qdbuscpp2xml.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSCPP2XML 1" -.TH QDBUSCPP2XML 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH QDBUSCPP2XML 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qdbus/qdbusxml2cpp.1 b/src/tools/qdbus/qdbusxml2cpp.1 index 549ce2e8d..79308d620 100644 --- a/src/tools/qdbus/qdbusxml2cpp.1 +++ b/src/tools/qdbus/qdbusxml2cpp.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QDBUSXML2CPP 1" -.TH QDBUSXML2CPP 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH QDBUSXML2CPP 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/qscript/qscript.1 b/src/tools/qscript/qscript.1 index d8047599e..730a02cf5 100644 --- a/src/tools/qscript/qscript.1 +++ b/src/tools/qscript/qscript.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "QSCRIPT 1" -.TH QSCRIPT 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH QSCRIPT 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/rcc/rcc.1 b/src/tools/rcc/rcc.1 index 64b8b6216..3b58a0faa 100644 --- a/src/tools/rcc/rcc.1 +++ b/src/tools/rcc/rcc.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "RCC 1" -.TH RCC 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH RCC 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/src/tools/uic/uic.1 b/src/tools/uic/uic.1 index feb1c2878..49a5a9feb 100644 --- a/src/tools/uic/uic.1 +++ b/src/tools/uic/uic.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "UIC 1" -.TH UIC 1 "2020-12-15" "Katie 4.9.1" "Katie Manual" +.TH UIC 1 "2020-12-30" "Katie 4.9.2" "Katie Manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l