diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a6e99fb..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -CMakeLists.txt.user* -build -translations/lxqt-sudo diff --git a/CHANGELOG b/CHANGELOG index 8400efb..9874b7d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,16 @@ -lxqt-about-0.11.0 / 2016-09-24 +lxqt-about-0.11.1 / 2017-01-01 ============================== + * Removed da_DK (keep da) + * Added *da.desktop, renamed da_DK to da + * .gitignore: Fix typo + * Remove cpack (#34) + +0.11.0 / 2016-09-24 +=================== + + * Release 0.11.0: Add changelog * Extend README.md * translation: Fix language in _nl.desktop * Create lxqt-about_nl.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index f1326f0..f324b94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,13 +84,3 @@ install(FILES DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" COMPONENT Runtime ) - -# building tarball with CPack ------------------------------------------------- -include(InstallRequiredSystemLibraries) -set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION}) -set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION}) -set(CPACK_GENERATOR TBZ2) -set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include(CPack) diff --git a/debian/changelog b/debian/changelog index 9425c3f..2956558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +lxqt-about (0.11.1-1) unstable; urgency=medium + + * Cherry-picking upstream release: 0.11.1. + * Removed some build dependencies: + -cmake + -libqt5xdg-dev + -libqt5xdgiconloader-dev + -pkg-config + -qttools5-dev + -qttools5-dev-tools + * Bumped build dependency liblxqt0-dev (>= 0.11.1) + * Bumped years in d/copyright + + -- Alf Gaida Mon, 02 Jan 2017 11:40:22 +0100 + lxqt-about (0.11.0-2) unstable; urgency=medium * Cherry-picking upstream release: 0.11.0 diff --git a/debian/control b/debian/control index 3559c4f..4262765 100644 --- a/debian/control +++ b/debian/control @@ -6,17 +6,11 @@ Uploaders: Alf Gaida , Section: x11 Priority: optional Build-Depends: debhelper (>= 10), - cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.0), + liblxqt0-dev (>= 0.11.1), libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 2.0.0), - libqt5xdgiconloader-dev (>= 2.0.0), - libx11-dev, - pkg-config, - qttools5-dev, - qttools5-dev-tools + libx11-dev Standards-Version: 3.9.8 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 diff --git a/debian/copyright b/debian/copyright index e2cac65..04b91ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,13 +3,13 @@ Upstream-Name: lxqt-about Source: https://github.com/lxde/lxqt-about Files: * -Copyright: 2012-2016 LXQt team +Copyright: 2012-2017 LXQt team 2010-2012 Razor team 2010-2014 Petr Vanek License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2016 Alf Gaida +Copyright: 2014-2017 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/translations/lxqt-about_da.desktop b/translations/lxqt-about_da.desktop new file mode 100644 index 0000000..dc8a0b6 --- /dev/null +++ b/translations/lxqt-about_da.desktop @@ -0,0 +1,3 @@ +Name[da]=Om LXQt +GenericName[da]=Om LXQt +Comment[da]=Lær mere om LXQt diff --git a/translatorsinfo/translators_da_DK.info b/translatorsinfo/translators_da.info similarity index 83% rename from translatorsinfo/translators_da_DK.info rename to translatorsinfo/translators_da.info index 6661ae2..280e7ef 100644 --- a/translatorsinfo/translators_da_DK.info +++ b/translatorsinfo/translators_da.info @@ -1,4 +1,6 @@ -# _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. +_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 = Peter Jespersen @@ -17,8 +19,8 @@ translator_4_nameEnglish = Mikkel Skovlund translator_4_nameNative = Mikkel Skovlund # 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_nameEnglish = scootergrisen +translator_5_nameNative = scootergrisen # translator_5_contact = Translator 5. Contact information, email or web site address. # translator_6_nameEnglish = Translator 6. Your name in English. diff --git a/translatorsinfo/translatorsinfo.cpp b/translatorsinfo/translatorsinfo.cpp index 4bc33c3..65c63a1 100644 --- a/translatorsinfo/translatorsinfo.cpp +++ b/translatorsinfo/translatorsinfo.cpp @@ -92,7 +92,6 @@ void fillLangguages(QMap *languages) languages->insert("cs" ,"Czech"); languages->insert("cs_CZ" ,"Czech (Czech Republic)"); languages->insert("da" ,"Danish"); - languages->insert("da_DK" ,"Danish (Denmark)"); languages->insert("nl" ,"Dutch"); languages->insert("nl_BE" ,"Dutch (Belgium)"); languages->insert("nl_NL" ,"Dutch (Netherlands)");