From bfe5d2cacee0fa1738aa74b45dc3c2913f0f9f68 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 22 Oct 2017 22:33:19 +0200 Subject: [PATCH 1/2] Cherry-picking upstream release: 0.12.0. * Switched to experimental * Bumped Standards to 4.1.1 * Bumped liblxqt dependency to >= 0.12.0 --- AUTHORS | 2 +- CHANGELOG | 15 ++++++++- CMakeLists.txt | 8 ++++- aboutdialog/technicalinfo.cpp | 3 +- debian/changelog | 9 ++++++ debian/control | 8 ++--- debian/gbp.conf | 2 +- main.cpp | 13 ++++++++ translations/lxqt-about_lt.desktop | 4 +++ translations/lxqt-about_pl.desktop | 4 +++ translatorsinfo/translators_lt.info | 44 ++++++++++++++++++++++++++ translatorsinfo/translators_pl_PL.info | 4 +-- 12 files changed, 105 insertions(+), 11 deletions(-) create mode 100644 translations/lxqt-about_lt.desktop create mode 100644 translations/lxqt-about_pl.desktop create mode 100644 translatorsinfo/translators_lt.info diff --git a/AUTHORS b/AUTHORS index fc0d31d..10e349d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team Petr Vanek License: LGPL-2.1+ diff --git a/CHANGELOG b/CHANGELOG index 9874b7d..6c7854c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,20 @@ -lxqt-about-0.11.1 / 2017-01-01 +lxqt-about-0.12.0 / 2017-10-21 ============================== + * Set patch version 0 + * Don't export github templates + * Added Lithuanian translation + * added myself + * set Qt::AA_UseHighDpiPixmaps to true + * Added a very basic cli (#39) + * updated Polish translation + * Update AUTHORS + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * Removed da_DK (keep da) * Added *da.desktop, renamed da_DK to da * .gitignore: Fix typo diff --git a/CMakeLists.txt b/CMakeLists.txt index f324b94..e58ab79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ set(UI_FILES aboutdialog/lxqtaboutdialog.ui ) -find_package(lxqt REQUIRED QUIET) +find_package(lxqt REQUIRED) include(LXQtCompilerSettings NO_POLICY_SCOPE) @@ -29,6 +29,12 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +## Patch Version +set(LXQT_ABOUT_PATCH_VERSION 0) + +set(LXQT_ABOUT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_ABOUT_PATCH_VERSION}) +add_definitions("-DLXQT_ABOUT_VERSION=\"${LXQT_ABOUT_VERSION}\"") + # Translations ********************************** include(LXQtTranslate) diff --git a/aboutdialog/technicalinfo.cpp b/aboutdialog/technicalinfo.cpp index c775440..1ac8643 100644 --- a/aboutdialog/technicalinfo.cpp +++ b/aboutdialog/technicalinfo.cpp @@ -163,7 +163,8 @@ TechnicalInfo::TechnicalInfo() QString buildType("Release"); #endif - table->add("Version", LXQT_VERSION); + table->add("LXQt About Version", LXQT_ABOUT_VERSION); + table->add("LXQt Version", LXQT_VERSION); table->add("Qt", qVersion()); table->add("Build type", buildType); table->add("System Configuration", LXQT_ETC_XDG_DIR); diff --git a/debian/changelog b/debian/changelog index 614e3f2..eb7a02b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lxqt-about (0.12.0-1) experimental; urgency=medium + + * Cherry-picking upstream release: 0.12.0. + * Switched to experimental + * Bumped Standards to 4.1.1 + * Bumped liblxqt dependency to >= 0.12.0 + + -- Alf Gaida Sun, 22 Oct 2017 22:34:39 +0200 + lxqt-about (0.11.1-2) unstable; urgency=medium * Recommend lxqt-qtplugin (Closes: #866232) diff --git a/debian/control b/debian/control index f146c60..caca445 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,13 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.1), + liblxqt0-dev (>= 0.12.0), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-about.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-about.git -b debian/sid +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-about.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-about.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-about Package: lxqt-about diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/main.cpp b/main.cpp index d42c1a8..6231fc7 100644 --- a/main.cpp +++ b/main.cpp @@ -30,10 +30,23 @@ #include #include +#include int main(int argc, char *argv[]) { LXQt::Application app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt About")); + const QString VERINFO = QStringLiteral(LXQT_ABOUT_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); + AboutDialog dlg; return app.exec(); } diff --git a/translations/lxqt-about_lt.desktop b/translations/lxqt-about_lt.desktop new file mode 100644 index 0000000..33fac2b --- /dev/null +++ b/translations/lxqt-about_lt.desktop @@ -0,0 +1,4 @@ +# Translations +GenericName[lt]=Apie LXQt +Name[lt]=Apie LXQt +Comment[lt]=Sužinokite daugiau apie LXQt diff --git a/translations/lxqt-about_pl.desktop b/translations/lxqt-about_pl.desktop new file mode 100644 index 0000000..255d0e8 --- /dev/null +++ b/translations/lxqt-about_pl.desktop @@ -0,0 +1,4 @@ +# Translations +GenericName[pl]=Informacje o LXQt +Name[pl]=O LXQt +Comment[pl]=Dowiedz się więcej o środowisku LXQt \ No newline at end of file diff --git a/translatorsinfo/translators_lt.info b/translatorsinfo/translators_lt.info new file mode 100644 index 0000000..85f5ee8 --- /dev/null +++ b/translatorsinfo/translators_lt.info @@ -0,0 +1,44 @@ +_help = Don't translate this text, it is only help. \ + I want to thank you in the "About" dialog. So, please fill the following information about yourself. \ + The number does not matter, all the names will be displayed in alphabetical order. + + +translator_1_nameEnglish = Moo +translator_1_nameNative = Translator 1. Your name in the native language. +translator_1_contact = Translator 1. Contact information, email or web site address. + +translator_2_nameEnglish = Translator 2. Your name in English. +translator_2_nameNative = Translator 2. Your name in the native language. +translator_2_contact = Translator 2. Contact information, email or web site address. + +translator_3_nameEnglish = Translator 3. Your name in English. +translator_3_nameNative = Translator 3. Your name in the native language. +translator_3_contact = Translator 3. Contact information, email or web site address. + +translator_4_nameEnglish = Translator 4. Your name in English. +translator_4_nameNative = Translator 4. Your name in the native language. +translator_4_contact = Translator 4. Contact information, email or web site address. + +translator_5_nameEnglish = Translator 5. Your name in English. +translator_5_nameNative = Translator 5. Your name in the native language. +translator_5_contact = Translator 5. Contact information, email or web site address. + +translator_6_nameEnglish = Translator 6. Your name in English. +translator_6_nameNative = Translator 6. Your name in the native language. +translator_6_contact = Translator 6. Contact information, email or web site address. + +translator_7_nameEnglish = Translator 7. Your name in English. +translator_7_nameNative = Translator 7. Your name in the native language. +translator_7_contact = Translator 7. Contact information, email or web site address. + +translator_8_nameEnglish = Translator 8. Your name in English. +translator_8_nameNative = Translator 8. Your name in the native language. +translator_8_contact = Translator 8. Contact information, email or web site address. + +translator_9_nameEnglish = Translator 9. Your name in English. +translator_9_nameNative = Translator 9. Your name in the native language. +translator_9_contact = Translator 9. Contact information, email or web site address. + +translator_10_nameEnglish = Translator 10. Your name in English. +translator_10_nameNative = Translator 10. Your name in the native language. +translator_10_contact = Translator 10. Contact information, email or web site address. diff --git a/translatorsinfo/translators_pl_PL.info b/translatorsinfo/translators_pl_PL.info index 39fba67..3e4f215 100644 --- a/translatorsinfo/translators_pl_PL.info +++ b/translatorsinfo/translators_pl_PL.info @@ -5,9 +5,9 @@ translator_1_nameEnglish = Nuc!eoN # translator_1_nameNative = Translator 1. Your name in the native language. # translator_1_contact = Translator 1. Contact information, email or web site address. -# translator_2_nameEnglish = Translator 2. Your name in English. +translator_2_nameEnglish = Marcin Mikołajczak # translator_2_nameNative = Translator 2. Your name in the native language. -# translator_2_contact = Translator 2. Contact information, email or web site address. +translator_2_contact = https://m4sk.in/ # translator_3_nameEnglish = Translator 3. Your name in English. # translator_3_nameNative = Translator 3. Your name in the native language. From a28c221f5e0a3828d10a657eb5a7a45713c47c45 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 23 Oct 2017 18:21:50 +0200 Subject: [PATCH 2/2] Pick up the right versions (fixed liblxqt and lxqt-build-tools) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index eb7a02b..6d5d662 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-about (0.12.0-2) experimental; urgency=medium + + * Pick up the right versions (fixed liblxqt and lxqt-build-tools) + + -- Alf Gaida Mon, 23 Oct 2017 18:21:43 +0200 + lxqt-about (0.12.0-1) experimental; urgency=medium * Cherry-picking upstream release: 0.12.0.