This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository lgogdownloader.
commit e9252c966d1839cfe593630fc86fd4ccfd4b5e5d Author: Stephen Kitt <[email protected]> Date: Fri Apr 8 13:46:29 2016 +0200 Build with libjsoncpp 1.7.1 and later. --- debian/changelog | 7 +++++++ debian/control | 5 +++-- debian/patches/jsoncpp-1.7.1.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46c5278..8497e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lgogdownloader (2.27-2) UNRELEASED; urgency=medium + + * Apply upstream patch to build with libjsoncpp 1.7.1 and later. Closes: + #820064, #820315. + + -- Stephen Kitt <[email protected]> Fri, 08 Apr 2016 13:40:10 +0200 + lgogdownloader (2.27-1) unstable; urgency=medium * New upstream release, with a new cmake-based build obsoleting all the diff --git a/debian/control b/debian/control index 212a685..50150fb 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cmake, libboost-regex-dev, libboost-system-dev, libhtmlcxx-dev, - libjsoncpp-dev, + libjsoncpp-dev (>= 1.7.1), liboauth-dev, librhash-dev, libtinyxml-dev, @@ -26,7 +26,8 @@ Package: lgogdownloader Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, + libjsoncpp1 (>= 1.7.1) 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. diff --git a/debian/patches/jsoncpp-1.7.1.patch b/debian/patches/jsoncpp-1.7.1.patch new file mode 100644 index 0000000..a72de9f --- /dev/null +++ b/debian/patches/jsoncpp-1.7.1.patch @@ -0,0 +1,24 @@ +commit 519cb78d38be04a3af79784b5326e21651ced6e1 +Author: Sude <[email protected]> +Date: Fri Mar 25 23:09:17 2016 +0200 + + Fix compiling with JsonCpp 1.7.1 + +diff --git a/src/util.cpp b/src/util.cpp +index 4b98c45..3d9dfed 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -388,11 +388,11 @@ int Util::getTerminalWidth() + void Util::getDownloaderUrlsFromJSON(const Json::Value &root, std::vector<std::string> &urls) + { + if(root.size() > 0) { +- for(Json::ValueIterator it = root.begin() ; it != root.end() ; ++it) ++ for(Json::ValueConstIterator it = root.begin() ; it != root.end() ; ++it) + { + if (it.key() == "downloaderUrl") + { +- Json::Value& url = *it; ++ Json::Value url = *it; + urls.push_back(url.asString()); + } + else diff --git a/debian/patches/series b/debian/patches/series index 48af9e8..8bbb52a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ manpage-whatis.patch +jsoncpp-1.7.1.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
