diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2997899 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build +*.kdev4 +src/translations/obconf-qt diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..af7b6b6 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,112 @@ + +obconf-qt-0.11.0 / 2016-09-24 +============================= + + * Bump version to 0.2.0 (#20) + * Extend README.md + * occured -> occurred + * build: Use external translations + * ts-files removal + * Bump year + * Work around grep 2.23 new behaviour + * Don't track $IDE settings + * Japanese translation update + * Reflect replacement README --> README.md in CMakeLists.txt + * Use markdown for README + * Update translations + * Fix license file + * Hungarian translations added + * src/CMakeLists.txt: do not completely overwrite CMAKE_CXX_FLAGS + * Use GNUInstallDirs + * Small build fix (themes dir path) + * Update German translation + * Update translations. + * Update the About dialog. + * Port missing "Dock" options from obconf gtk+ version. + * Support changing the name of desktops. + * German translation + * Default to Qt5 + +0.9.0 / 2015-02-25 +================== + + * Generate .desktop file again + * Enhance Portuguese translations + * Portuguese update with fixes + * Fix COPYING and AUTHORS information. The license should be GPL2, not LGPL. * Also update AUTHORS file to include more information of upstream obconf project. + * remove the old and outdated packaging stub + * lxqt_translate_desktop: pass -h instead of --no-filename to grep which is compatible with Busybox + * lxqt_translate_desktop: Updates code to cope with the cmake-policy CMP0054 + * Adds .gitigore + * Fixes the app icon install location + * Adds .desktop translations support + * Update translations + * Makes it extract and compile and load translations + * Renames the translations files to their proper names + * Translate to Russian .desktop file + * Update Russian translation + * Commit from LXDE Pootle server by user andika.: 611 of 611 strings translated (0 need review). + * Commit from LXDE Pootle server by user rago1975.: 611 of 611 strings translated (0 need review). + * Support Qt5. + +0.1.0 / 2014-05-07 +================== + + * Sync COPYING file with the actual used license + * Commit from LXDE Pootle server by user knedlyk.: 72 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user knedlyk.: 54 of 108 strings translated (1 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 108 of 108 strings translated (0 fuzzy). + * Update AUTHORS and COPYING + * Do not re-generate *.ts files everytime + * Commit from LXDE Pootle server by user strebski.: 105 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 102 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 95 of 108 strings translated (1 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 89 of 108 strings translated (1 fuzzy). + * Commit from LXDE Pootle server by user zvacet.: 73 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user hirkmt.: 108 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * Handle translations correctly. + * Commit from LXDE Pootle server by user zvacet.: 72 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user Fitoschido.: 107 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 83 of 108 strings translated (1 fuzzy). + * Commit from LXDE Pootle server by user Fitoschido.: 103 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user mbouzada.: 108 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user Fitoschido.: 98 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user zvacet.: 64 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * Commit from LXDE Pootle server by user strebski.: 82 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user smarquespt.: 106 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user andika.: 108 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user andika.: 65 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user Fitoschido.: 87 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * Commit from LXDE Pootle server by user smarquespt.: 56 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * Commit from LXDE Pootle server by user strebski.: 63 of 108 strings translated (0 fuzzy). + * Commit from LXDE Pootle server by user strebski.: 54 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * New files added from LXDE Pootle server based on templates + * Commit from LXDE Pootle server by user brother.: 108 of 108 strings translated (0 fuzzy). + * New files added from LXDE Pootle server based on templates + * Implement changing font and remove unnecessary files. This commit is done in front of our presidential palace during a protest. + * Add a debian directory + * Fix signal/slot auto-connection problems. Add contents for README and AUTHORS. + * Remove unnecessary files. + * Remove unused files. + * Implement theme configuration. + * Fix text labels. Replace _ with & for keyboard shortcuts. + * Fix mouse page. + * Fix move & resize page. + * Ask openbox to reload confie file correctly. * Remove unnecessary files. + * Split different tab page into different *.cpp files. + * Partially handle combobox. + * Little UI polishing. + * Partially implement config options. + * Initial import into git repo. diff --git a/CMakeLists.txt b/CMakeLists.txt index 8591cfd..490ff13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set (CPACK_PACKAGE_VENDOR "") set (CPACK_PACKAGE_VERSION_MAJOR "0") -set (CPACK_PACKAGE_VERSION_MINOR "1") +set (CPACK_PACKAGE_VERSION_MINOR "2") set (CPACK_PACKAGE_VERSION_PATCH "0") set (CPACK_GENERATOR TBZ2) set (CPACK_SOURCE_GENERATOR TBZ2) diff --git a/README.md b/README.md index d5a0a7a..7d10f69 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,23 @@ -# obconf-qt +# ObConf-Qt -A Qt port of [ObConf](http://openbox.org/wiki/ObConf:About), a configuration -editor for the [OpenBox](http://openbox.org) window manager. +## Overview +ObConf-Qt is a Qt port of [ObConf](http://openbox.org/wiki/ObConf:About), a configuration editor for window manager [OpenBox](http://openbox.org). + +It is maintained by the LXQt project but can be used independently from this desktop environment. + +## Installation + +### Compiling source code + +Runtime dependencies are xkbcommon, qtx11extras, xdg-utils, hicolor-icon-theme and Openbox. +Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +Official binary packages are available in Arch Linux and Debian (as of Debian stretch). +The tool is missing in Fedora so far. Same applies to openSUSE where it is about to be included, though. diff --git a/debian/changelog b/debian/changelog index ab18300..1c50725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +obconf-qt (0.11.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.11.0. + * Added build dependency libqt5svg5-dev + * Bumped compat to 10 + * Bumped build dependency debhelper (>= 10) + * Bumped build dependency libqtxdg-dev (>= 2.0.0) + * Bumped build dependency liblxqt-dev (>= 0.11.0) + * Removed --parallel from rules, standard in compat 10 + + -- Alf Gaida Sun, 25 Sep 2016 20:47:32 +0200 + obconf-qt (0.10.96~25-gbc999b9-1) experimental; urgency=medium * Cherry-picking upstream version 0.10.96~25-gbc999b9. diff --git a/debian/control b/debian/control index 66e65be..71a830c 100644 --- a/debian/control +++ b/debian/control @@ -8,15 +8,16 @@ Priority: optional Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.96~), + liblxqt0-dev (>= 0.11.0), + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.1~), + libqt5xdg-dev (>= 2.0.0), openbox-dev, pkg-config, qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git/?h=debian/experimental +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/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/rules b/debian/rules index 1bf200b..d719340 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh ${@} --buildsystem cmake\ - --parallel + dh ${@} --buildsystem cmake override_dh_auto_configure: dh_auto_configure -- \