[lgogdownloader] 03/04: New upstream release.
Stephen Kitt
skitt at moszumanska.debian.org
Fri Mar 18 12:03:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository lgogdownloader.
commit efbba39cc6d086e61e74e4a45c042dad1b05d7bc
Author: Stephen Kitt <steve at sk2.org>
Date: Fri Mar 18 12:56:14 2016 +0100
New upstream release.
---
debian/changelog | 7 +++++++
debian/control | 6 ++++--
debian/patches/honour-flags.patch | 34 ----------------------------------
debian/patches/login-crash-fix.patch | 18 ------------------
debian/patches/manpage-whatis.patch | 22 +++++++++++-----------
debian/patches/no-debug-build.patch | 14 --------------
debian/patches/series | 3 ---
7 files changed, 22 insertions(+), 82 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8009347..c4f0b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lgogdownloader (2.27-1) UNRELEASED; urgency=medium
+
+ * New upstream release, with a new cmake-based build obsoleting all the
+ existing patches apart from manpage-whatis.patch.
+
+ -- Stephen Kitt <skitt at debian.org> Fri, 18 Mar 2016 12:49:04 +0100
+
lgogdownloader (2.26-2) unstable; urgency=medium
* Switch to https: VCS URIs (see #810378).
diff --git a/debian/control b/debian/control
index 9f03e00..212a685 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Stephen Kitt <skitt at debian.org>
Section: web
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake,
+ debhelper (>= 9),
help2man,
libboost-date-time-dev,
libboost-filesystem-dev,
@@ -14,7 +15,8 @@ Build-Depends: debhelper (>= 9),
libjsoncpp-dev,
liboauth-dev,
librhash-dev,
- libtinyxml-dev
+ libtinyxml-dev,
+ pkg-config
Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/lgogdownloader.git
Vcs-Git: https://anonscm.debian.org/git/pkg-games/lgogdownloader.git
diff --git a/debian/patches/honour-flags.patch b/debian/patches/honour-flags.patch
deleted file mode 100644
index d389b03..0000000
--- a/debian/patches/honour-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Take externally-defined flags into account
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -16,11 +16,11 @@
- WINDRES = windres
-
- INC = -Iinclude -I/usr/include/rhash -I/usr/include/jsoncpp
--CFLAGS = -std=c++11 -Wall -fexceptions -D_FILE_OFFSET_BITS=64
-+CFLAGS := $(CFLAGS) -std=c++11 -Wall -fexceptions -D_FILE_OFFSET_BITS=64
- RESINC =
- LIBDIR =
- LIB = -lcurl -loauth -ljsoncpp -lhtmlcxx -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lboost_date_time -ltinyxml -lrhash
--LDFLAGS =
-+LDFLAGS := $(LDFLAGS)
-
- VERSION = -DVERSION_STRING="\"$(shell sh version.sh)\""
- HELP2MAN = $(shell which help2man 2> /dev/null)
-@@ -39,12 +39,12 @@
- OUT_DEBUG = bin/Debug/lgogdownloader
-
- INC_RELEASE = $(INC)
--CFLAGS_RELEASE = $(CFLAGS) -O2
-+CFLAGS_RELEASE = $(CFLAGS) $(CPPFLAGS)
- RESINC_RELEASE = $(RESINC)
- RCFLAGS_RELEASE = $(RCFLAGS)
- LIBDIR_RELEASE = $(LIBDIR)
- LIB_RELEASE = $(LIB)
--LDFLAGS_RELEASE = $(LDFLAGS) -s
-+LDFLAGS_RELEASE = $(LDFLAGS)
- OBJDIR_RELEASE = obj/Release
- DEP_RELEASE =
- OUT_RELEASE = bin/Release/lgogdownloader
diff --git a/debian/patches/login-crash-fix.patch b/debian/patches/login-crash-fix.patch
deleted file mode 100644
index fb36ebe..0000000
--- a/debian/patches/login-crash-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 8780b9c53cf7e5cfb6f4d2f66aa42131fb66d0e1
-Author: Sude <lgogdownloader at gmail.com>
-Date: Wed Nov 18 15:21:22 2015 +0200
-
- Possible fix for crash after login
-
-diff --git a/main.cpp b/main.cpp
-index 020f3a7..0ae59ed 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -451,7 +451,6 @@ int main(int argc, char *argv[])
- {
- set_vm_value(vm, "token", downloader.config.sToken);
- set_vm_value(vm, "secret", downloader.config.sSecret);
-- bpo::notify(vm);
- }
- std::ofstream ofs(config.sConfigFilePath.c_str());
- if (ofs)
diff --git a/debian/patches/manpage-whatis.patch b/debian/patches/manpage-whatis.patch
index 87ffc39..6293f58 100644
--- a/debian/patches/manpage-whatis.patch
+++ b/debian/patches/manpage-whatis.patch
@@ -1,14 +1,14 @@
Description: Provide meaningful whatis entry
Author: Stephen Kitt <skitt at debian.org>
---- a/Makefile
-+++ b/Makefile
-@@ -115,7 +115,7 @@
- after_release: out_release
- ifdef HELP2MAN
- if ! test -f $(MAN_DIR)/$(MAN_PAGE).gz; then \
-- help2man -N -i $(MAN_DIR)/lgogdownloader.supplemental.groff -o $(MAN_DIR)/$(MAN_PAGE) $(OUT_RELEASE); \
-+ help2man -N -i $(MAN_DIR)/lgogdownloader.supplemental.groff -n "downloader for GOG.com games and other files" -o $(MAN_DIR)/$(MAN_PAGE) $(OUT_RELEASE); \
- gzip -f -9 $(MAN_DIR)/$(MAN_PAGE); \
- fi
- endif
+--- 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/debian/patches/no-debug-build.patch b/debian/patches/no-debug-build.patch
deleted file mode 100644
index 624def8..0000000
--- a/debian/patches/no-debug-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Don't build the debug version
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -53,7 +53,7 @@
-
- OBJ_RELEASE = $(OBJDIR_RELEASE)/main.o $(OBJDIR_RELEASE)/src/api.o $(OBJDIR_RELEASE)/src/downloader.o $(OBJDIR_RELEASE)/src/progressbar.o $(OBJDIR_RELEASE)/src/util.o $(OBJDIR_RELEASE)/src/blacklist.o $(OBJDIR_RELEASE)/src/gamedetails.o $(OBJDIR_RELEASE)/src/gamefile.o
-
--all: debug release
-+all: release
-
- clean: clean_debug clean_release
-
diff --git a/debian/patches/series b/debian/patches/series
index caf9eea..48af9e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-honour-flags.patch
manpage-whatis.patch
-no-debug-build.patch
-login-crash-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git
More information about the Pkg-games-commits
mailing list