From 5d9f679a4d5e6172325ed6c26527b18fd9195e14 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 24 Sep 2017 11:53:16 +0200 Subject: [PATCH 1/3] prepare upcoming release --- debian/changelog | 6 ++++++ debian/control | 6 +++--- debian/gbp.conf | 2 +- debian/get-snapshot | 30 ++++++++++++++++++++++++++++++ debian/source/format | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100755 debian/get-snapshot diff --git a/debian/changelog b/debian/changelog index 8734a79..41e3a24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +obconf-qt (0.11.1-3) UNRELEASED; urgency=medium + + * New snapshot: 0.11.1-10-gcb20e7a + + -- Alf Gaida Wed, 26 Jul 2017 00:13:47 +0200 + obconf-qt (0.11.1-2) unstable; urgency=medium * Removed build dependency liblxqt0-dev - only translations diff --git a/debian/control b/debian/control index d931e62..150225a 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, libqt5svg5-dev, libqt5x11extras5-dev, - lxqt-build-tools (>= 0.3.0), + lxqt-build-tools (>= 0.3.96), openbox-dev Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git -b debian/sid +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git -b debian/experimental Homepage: https://github.com/lxde/obconf-qt Package: obconf-qt 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/debian/get-snapshot b/debian/get-snapshot new file mode 100755 index 0000000..1400f5b --- /dev/null +++ b/debian/get-snapshot @@ -0,0 +1,30 @@ +#!/bin/bash + +repository="git@github.com:lxde/obconf-qt" +target_dir="snapshot" + +ls | grep -v "debian" | xargs rm -r +rm -rf .pc + +if [ -f debian/commit ]; then + source debian/commit + [ ! -z "${branch}" ] && echo "branch: ${branch}" + [ ! -z "${commit}" ] && echo "commit: ${commit}" + [ ! -z "${target_dir}" ] && echo "target_dir: ${target_dir}" +fi + +snapdir=$(mktemp -d) +echo "$snapdir" +pushd "$snapdir" + echo "git clone ${branch} ${repository} ${target_dir}" + git clone ${branch} ${repository} ${target_dir} + pushd snapshot + [ ! -z "${commit}" ] && git reset --hard "${commit}" + description=$(git describe --tags) + rm -rf .git* + popd + tar cfvJ snapshot.orig.tar.xz snapshot +popd +tar xf "$snapdir/snapshot.orig.tar.xz" --strip-components 1 +dch "New snapshot: $description" +rm -rfv "$snapdir" diff --git a/debian/source/format b/debian/source/format index 163aaf8..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 From b9e9fc249295dbe853adf2954c5734e29424c50a Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 24 Sep 2017 12:41:39 +0200 Subject: [PATCH 2/3] prepare upstream release --- debian/changelog | 8 ++++++-- debian/control | 4 ++-- debian/copyright | 4 ++-- debian/get-snapshot | 30 ------------------------------ debian/source/format | 2 +- 5 files changed, 11 insertions(+), 37 deletions(-) delete mode 100755 debian/get-snapshot diff --git a/debian/changelog b/debian/changelog index 41e3a24..755a284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -obconf-qt (0.11.1-3) UNRELEASED; urgency=medium +obconf-qt (0.12.0-1) experimental; urgency=medium - * New snapshot: 0.11.1-10-gcb20e7a + * Ne + * Switched to experimental + * Bumped minimum version of lxqt-build-tools to >= 0.4.0 + * Bumped Standards to 4.1.0, no changes needed + -- Alf Gaida Wed, 26 Jul 2017 00:13:47 +0200 diff --git a/debian/control b/debian/control index 150225a..6a1853b 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, libqt5svg5-dev, libqt5x11extras5-dev, - lxqt-build-tools (>= 0.3.96), + lxqt-build-tools (>= 0.4.0), openbox-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/experimental Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git -b debian/experimental Homepage: https://github.com/lxde/obconf-qt diff --git a/debian/copyright b/debian/copyright index 0c8d89d..476caa1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: obconf-qt Source: https://github.com/lxde/obconf-qt Files: * -Copyright: 2012-2016 LXQt team +Copyright: 2012-2017 LXQt team License: GPL-2.0+ Files: debian/* -Copyright: 2013-2016 Alf Gaida +Copyright: 2013-2017 Alf Gaida 2015 Andrew Lee (李健秋) License: GPL-2.0+ diff --git a/debian/get-snapshot b/debian/get-snapshot deleted file mode 100755 index 1400f5b..0000000 --- a/debian/get-snapshot +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -repository="git@github.com:lxde/obconf-qt" -target_dir="snapshot" - -ls | grep -v "debian" | xargs rm -r -rm -rf .pc - -if [ -f debian/commit ]; then - source debian/commit - [ ! -z "${branch}" ] && echo "branch: ${branch}" - [ ! -z "${commit}" ] && echo "commit: ${commit}" - [ ! -z "${target_dir}" ] && echo "target_dir: ${target_dir}" -fi - -snapdir=$(mktemp -d) -echo "$snapdir" -pushd "$snapdir" - echo "git clone ${branch} ${repository} ${target_dir}" - git clone ${branch} ${repository} ${target_dir} - pushd snapshot - [ ! -z "${commit}" ] && git reset --hard "${commit}" - description=$(git describe --tags) - rm -rf .git* - popd - tar cfvJ snapshot.orig.tar.xz snapshot -popd -tar xf "$snapdir/snapshot.orig.tar.xz" --strip-components 1 -dch "New snapshot: $description" -rm -rfv "$snapdir" diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) From 9fa38b8e4e9202c1f564789cfb437a1cb1f41298 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 24 Sep 2017 12:56:34 +0200 Subject: [PATCH 3/3] Cherry-picking upstream release 0.12.0. * Switched to experimental * Bumped minimum version of lxqt-build-tools to >= 0.4.0 * Bumped Standards to 4.1.0, no changes needed --- AUTHORS | 2 +- CHANGELOG | 19 ++++++++++++++++++- CMakeLists.txt | 12 +++++++++++- debian/changelog | 5 ++--- src/obconf-qt.cpp | 12 ++++++++---- src/translations/obconf-qt_ca.desktop | 3 +++ src/translations/obconf-qt_da.desktop | 3 +++ src/translations/obconf-qt_lt.desktop | 3 +++ src/translations/obconf-qt_pl.desktop | 3 +++ 9 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 src/translations/obconf-qt_ca.desktop create mode 100644 src/translations/obconf-qt_da.desktop create mode 100644 src/translations/obconf-qt_lt.desktop create mode 100644 src/translations/obconf-qt_pl.desktop diff --git a/AUTHORS b/AUTHORS index cd8da8f..5f603bd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ Copyright: - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team This program is based on source code from the ObConf project diff --git a/CHANGELOG b/CHANGELOG index 60bc59c..360e90a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,24 @@ -obconf-qt-0.11.1 / 2016-12-11 +obconf-qt-0.12.0 / 2017-09-24 ============================= + * Bump version to 0.12.0 + * Don't export github templates + * Added Lithuanian language + * liblxqt dont make sense here + * Copied issue template + * Drops Qt5Core_VERSION_STRING + * set Qt::AA_UseHighDpiPixmaps to true + * Added default CMAKE_BUILD_TYPE and versioning (#29) + * added Polish translation + * Add obconf-qt_ca.desktop (Catalan) + * Update AUTHORS + * Added *da.desktop + +0.11.1 / 2016-12-11 +=================== + + * Release 0.11.1: Update changelog * Create obconf-qt_fr.desktop * Use the LXQtCompilerSettings * Use lxqt-build-tools translation modules diff --git a/CMakeLists.txt b/CMakeLists.txt index 912e8f7..aafc986 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ else() find_package(Qt5Widgets REQUIRED) find_package(Qt5X11Extras REQUIRED) find_package(Qt5LinguistTools REQUIRED QUIET) - message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") + message(STATUS "Building with Qt${Qt5Core_VERSION}") endif() find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) @@ -38,6 +38,16 @@ pkg_check_modules(OPENBOX REQUIRED obt-3.5 ) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif() + +set(OBCONFQT_MAJOR_VERSION 0) +set(OBCONFQT_MINOR_VERSION 12) +set(OBCONFQT_PATCH_VERSION 0) +set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION}) +add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"") + include(LXQtTranslateTs) include(LXQtTranslateDesktop) include(LXQtCompilerSettings) diff --git a/debian/changelog b/debian/changelog index 755a284..07447ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ obconf-qt (0.12.0-1) experimental; urgency=medium - * Ne + * Cherry-picking upstream release 0.12.0. * Switched to experimental * Bumped minimum version of lxqt-build-tools to >= 0.4.0 * Bumped Standards to 4.1.0, no changes needed - - -- Alf Gaida Wed, 26 Jul 2017 00:13:47 +0200 + -- Alf Gaida Sun, 24 Sep 2017 12:56:19 +0200 obconf-qt (0.11.1-2) unstable; urgency=medium diff --git a/src/obconf-qt.cpp b/src/obconf-qt.cpp index b4a3bd1..5912fda 100644 --- a/src/obconf-qt.cpp +++ b/src/obconf-qt.cpp @@ -1,20 +1,20 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - * + * * main.c for ObConf, the configuration tool for Openbox * Copyright (c) 2003-2008 Dana Jansens * Copyright (c) 2003 Tim Riley * Copyright (C) 2013 Hong Jen Yee (PCMan) - * + * * 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 2 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. - * + * * See the COPYING file for a copy of the GNU General Public License. */ @@ -180,11 +180,15 @@ static gboolean prop_get_string_utf8(Window win, Atom prop, gchar** ret) { int main(int argc, char** argv) { QApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + // load translations QTranslator qtTranslator, translator; + // install the translations built-into Qt itself qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); app.installTranslator(&qtTranslator); + // install our own tranlations translator.load("obconf-qt_" + QLocale::system().name(), PACKAGE_DATA_DIR "/translations"); app.installTranslator(&translator); diff --git a/src/translations/obconf-qt_ca.desktop b/src/translations/obconf-qt_ca.desktop new file mode 100644 index 0000000..3cb64db --- /dev/null +++ b/src/translations/obconf-qt_ca.desktop @@ -0,0 +1,3 @@ +Name[ca]=Ajusts d'Openbox +GenericName[ca]=Ajusts del gestor de finestres +Comment[ca]=Configureu el gestor de finestres Openbox diff --git a/src/translations/obconf-qt_da.desktop b/src/translations/obconf-qt_da.desktop new file mode 100644 index 0000000..d1ca913 --- /dev/null +++ b/src/translations/obconf-qt_da.desktop @@ -0,0 +1,3 @@ +Name[da]=Openbox-indstillinger +GenericName[da]=Indstillinger for Window Manager +Comment[da]=Konfigurér window manageren Openbox diff --git a/src/translations/obconf-qt_lt.desktop b/src/translations/obconf-qt_lt.desktop new file mode 100644 index 0000000..5cf53db --- /dev/null +++ b/src/translations/obconf-qt_lt.desktop @@ -0,0 +1,3 @@ +Name[lt]=Openbox nustatymai +GenericName[lt]=Langų tvarkytuvės nustatymai +Comment[lt]=Konfigūruoti Openbox langų tvarkytuvę diff --git a/src/translations/obconf-qt_pl.desktop b/src/translations/obconf-qt_pl.desktop new file mode 100644 index 0000000..405ee99 --- /dev/null +++ b/src/translations/obconf-qt_pl.desktop @@ -0,0 +1,3 @@ +Name[pl]=Edytor konfiguracji OpenBox +GenericName[pl]=Ustawienia menedżera okien +Comment[pl]=Edytor konfiguracji menedżera okien OpenBox (wersja Qt)