From 08dbd356692c306037075dc149461d5aa405ee0e Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 5 Apr 2017 18:27:13 +0100 Subject: [PATCH] Import lgogdownloader_3.1-2.debian.tar.xz [dgit import tarball lgogdownloader 3.1-2 lgogdownloader_3.1-2.debian.tar.xz] --- changelog | 134 ++++++++++++++++++++ compat | 1 + control | 39 ++++++ copyright | 36 ++++++ gbp.conf | 4 + patches/Fix-crash-in-Website-getGames.patch | 49 +++++++ patches/manpage-whatis.patch | 14 ++ patches/series | 2 + rules | 11 ++ source/format | 2 + watch | 4 + 11 files changed, 296 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 gbp.conf create mode 100644 patches/Fix-crash-in-Website-getGames.patch create mode 100644 patches/manpage-whatis.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..f030c4d --- /dev/null +++ b/changelog @@ -0,0 +1,134 @@ +lgogdownloader (3.1-2) unstable; urgency=medium + + [ Simon McVittie ] + * Team upload + * Backport patch from 3.2 fixing the ability to list games if a game + has {'updates': null} (Closes: #857691) + + -- Stephen Kitt Wed, 05 Apr 2017 19:27:13 +0200 + +lgogdownloader (3.1-1) unstable; urgency=medium + + * New upstream release. + + -- Stephen Kitt Mon, 16 Jan 2017 19:35:28 +0100 + +lgogdownloader (3.0-1) unstable; urgency=medium + + * New upstream release. + * Now that libjsoncpp-dev is fixed, drop the explicit dependency on + libjsoncpp1. + * Switch to debhelper compatibility level 10. + * Clarify the description regarding DFSG-free games on GOG.com. + + -- Stephen Kitt Thu, 24 Nov 2016 22:06:40 +0100 + +lgogdownloader (2.28-1) unstable; urgency=medium + + * New upstream release, merging jsoncpp-1.7.1.patch. + * Standards-Version 3.9.8, no change required. + + -- Stephen Kitt Mon, 09 May 2016 23:35:51 +0200 + +lgogdownloader (2.27-2) unstable; urgency=medium + + * Apply upstream patch to build with libjsoncpp 1.7.1 and later. Closes: + #820064, #820315. + + -- Stephen Kitt Fri, 08 Apr 2016 13:46:48 +0200 + +lgogdownloader (2.27-1) unstable; urgency=medium + + * New upstream release, with a new cmake-based build obsoleting all the + existing patches apart from manpage-whatis.patch. + + -- Stephen Kitt Fri, 18 Mar 2016 12:56:19 +0100 + +lgogdownloader (2.26-2) unstable; urgency=medium + + * Switch to https: VCS URIs (see #810378). + * Apply upstream's fix for crashes after login (thanks to Phil Morrell + for pointing it out!). + * Standards-Version 3.9.7, no change required. + * Enable full hardening. + + -- Stephen Kitt Wed, 24 Feb 2016 20:23:37 +0100 + +lgogdownloader (2.26-1) unstable; urgency=medium + + * New upstream release. + * Drop unattended-login.patch, merged upstream. + + -- Stephen Kitt Wed, 14 Oct 2015 18:25:27 +0200 + +lgogdownloader (2.25-2) unstable; urgency=medium + + * Handle unattended login attempts. Closes: #798740. + + -- Stephen Kitt Sun, 13 Sep 2015 19:41:13 +0200 + +lgogdownloader (2.25-1) unstable; urgency=medium + + * New upstream release. + + -- Stephen Kitt Mon, 07 Sep 2015 22:40:29 +0200 + +lgogdownloader (2.24-1) unstable; urgency=medium + + * New upstream release. + * Refresh manpage-whatis.patch. + + -- Stephen Kitt Tue, 14 Jul 2015 14:02:39 +0200 + +lgogdownloader (2.23-1) unstable; urgency=medium + + * New upstream release. + * Refresh patch. + + -- Stephen Kitt Wed, 20 May 2015 07:18:47 +0200 + +lgogdownloader (2.21-2) unstable; urgency=medium + + * Upload to unstable. + + -- Stephen Kitt Sun, 10 May 2015 21:45:26 +0200 + +lgogdownloader (2.21-1) experimental; urgency=medium + * New upstream release. + + -- Stephen Kitt Fri, 10 Apr 2015 21:24:56 +0200 + +lgogdownloader (2.20-1) experimental; urgency=medium + + * New upstream release, uploaded to experimental for the Jessie freeze. + + -- Stephen Kitt Thu, 11 Dec 2014 00:16:28 +0100 + +lgogdownloader (2.19-1) unstable; urgency=medium + + * New upstream release. + * Standards-Version 3.9.6, no change required. + + -- Stephen Kitt Tue, 21 Oct 2014 20:31:24 +0200 + +lgogdownloader (2.18-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches, and drop help-without-home.patch (merged upstream). + * Add pointers to the git repository on Alioth. + * Make sure CPPFLAGS are taken into account. + + -- Stephen Kitt Tue, 23 Sep 2014 17:18:17 +0200 + +lgogdownloader (2.17-2) unstable; urgency=medium + + * Avoid touching $HOME if --help or --version are specified on the + command-line. Closes: #761217. + + -- Stephen Kitt Thu, 11 Sep 2014 23:17:00 +0200 + +lgogdownloader (2.17-1) unstable; urgency=low + + * Initial release. Closes: #761130. + + -- Stephen Kitt Wed, 10 Sep 2014 23:26:18 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..256681e --- /dev/null +++ b/control @@ -0,0 +1,39 @@ +Source: lgogdownloader +Maintainer: Debian Games Team +Uploaders: Stephen Kitt +Section: web +Priority: optional +Build-Depends: cmake, + debhelper (>= 10), + help2man, + libboost-date-time-dev, + libboost-filesystem-dev, + libboost-program-options-dev, + libboost-regex-dev, + libboost-system-dev, + libhtmlcxx-dev, + libjsoncpp-dev (>= 1.7.1), + liboauth-dev, + librhash-dev, + libssl-dev, + libtinyxml2-dev, + pkg-config +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/lgogdownloader.git +Vcs-Git: https://anonscm.debian.org/git/pkg-games/lgogdownloader.git +Homepage: https://sites.google.com/site/gogdownloader/ + +Package: lgogdownloader +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: downloader for GOG.com files + lgogdownloader is a client for the GOG.com download API, allowing + simple downloads and updates of games and other files from GOG.com. + . + This package is only useful if you own games on GOG.com. There are a + few free-as-in-beer games available for Linux, but the DFSG-free + games available on GOG.com are not provided for Linux and are + available in Debian anyway (lure-of-the-temptress, + beneath-a-steel-sky, flight-of-the-amazon-queen). diff --git a/copyright b/copyright new file mode 100644 index 0000000..28919ec --- /dev/null +++ b/copyright @@ -0,0 +1,36 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lgogdownloader +Source: https://sites.google.com/site/gogdownloader/ + +Files: * +Copyright: none declared +License: WTFPL-2 + +Files: debian/* +Copyright: 2014 Stephen Kitt +License: WTFPL-2 + +License: WTFPL-2 + This program is free software. It comes without any warranty, to the + extent permitted by applicable law. You can redistribute it and/or + modify it under the terms of the Do What The Fuck You Want To Public + License, Version 2, as published by Sam Hocevar. See + http://www.wtfpl.net/ for more details. + . + The full text of the license is provided in the COPYING file and + reproduced here: + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + . + Copyright (C) 2004 Sam Hocevar + . + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. You just DO WHAT THE FUCK YOU WANT TO. + . diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..7e38616 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,4 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True diff --git a/patches/Fix-crash-in-Website-getGames.patch b/patches/Fix-crash-in-Website-getGames.patch new file mode 100644 index 0000000..a689162 --- /dev/null +++ b/patches/Fix-crash-in-Website-getGames.patch @@ -0,0 +1,49 @@ +From: Sude +Date: Fri, 20 Jan 2017 00:15:50 +0200 +Subject: Fix crash in Website::getGames + +JSON value for updates can be null in some cases. For example when user owns a dlc but not the base game. +This caused a crash due to std::stoi throwing std::invalid_argument exception + +Origin: upstream, 3.2, commit:22f47de4fcd8cd7ecc2a89fbb25f94efb1b3f743 +--- + src/website.cpp | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/src/website.cpp b/src/website.cpp +index 0803432..8ca4c8c 100644 +--- a/src/website.cpp ++++ b/src/website.cpp +@@ -163,7 +163,31 @@ std::vector Website::getGames() + gameItem game; + game.name = product["slug"].asString(); + game.id = product["id"].isInt() ? std::to_string(product["id"].asInt()) : product["id"].asString(); +- game.updates = product["updates"].isInt() ? product["updates"].asInt() : std::stoi(product["updates"].asString()); ++ ++ if (product.isMember("updates")) ++ { ++ if (product["updates"].isNull()) ++ { ++ /* In some cases the value can be null. ++ * For example when user owns a dlc but not the base game ++ * https://github.com/Sude-/lgogdownloader/issues/101 ++ * Assume that there are no updates in this case */ ++ game.updates = 0; ++ } ++ else if (product["updates"].isInt()) ++ game.updates = product["updates"].asInt(); ++ else ++ { ++ try ++ { ++ game.updates = std::stoi(product["updates"].asString()); ++ } ++ catch (std::invalid_argument& e) ++ { ++ game.updates = 0; // Assume no updates ++ } ++ } ++ } + + unsigned int platform = 0; + if (product["worksOn"]["Windows"].asBool()) diff --git a/patches/manpage-whatis.patch b/patches/manpage-whatis.patch new file mode 100644 index 0000000..6293f58 --- /dev/null +++ b/patches/manpage-whatis.patch @@ -0,0 +1,14 @@ +Description: Provide meaningful whatis entry +Author: Stephen Kitt + +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -9,7 +9,7 @@ + set(MAN_FILE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.1.gz) + add_custom_command( + OUTPUT ${MAN_FILE} +- COMMAND ${HELP2MAN} -N -i ${H2M_FILE} -o ${MAN_PAGE} ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX} ++ COMMAND ${HELP2MAN} -N -i ${H2M_FILE} -n "downloader for GOG.com games and other files" -o ${MAN_PAGE} ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX} + COMMAND ${GZIP} -f -9 ${MAN_PAGE} + MAIN_DEPENDENCY ${H2M_FILE} + COMMENT "Building man page" diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..69eb314 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +Fix-crash-in-Website-getGames.patch +manpage-whatis.patch diff --git a/rules b/rules new file mode 100755 index 0000000..700cb18 --- /dev/null +++ b/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +#DH_VERBOSE = 1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ + + + + diff --git a/source/format b/source/format new file mode 100644 index 0000000..c3d9f24 --- /dev/null +++ b/source/format @@ -0,0 +1,2 @@ +3.0 (quilt) + diff --git a/watch b/watch new file mode 100644 index 0000000..3642829 --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +# watch control file for uscan +version=3 + +https://github.com/Sude-/lgogdownloader/tags (?:.*/)?v?(\d[\d\.]*)\.(?:tar\.gz|tar\.bz2|tar\.xz) -- 2.30.2