Control: tags 848345 + patch
Control: tags 848345 + pending

Dear maintainer,

I've prepared an NMU for gpsshogi (versioned as 0.7.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Also, all of this is cause by you not incorporating the previous NMU.
And the git repository was quite a mess, with upstream/* and debian/*
tags not in the branch, pristine-tar not committed/pushed, and some
changes done in the tagged git commit not actually uploaded.
I tried to make some order out of it, and if I disrupted something of
yours I'm sorry, but then please try to be more ordered and pay some
more attention to your packages.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for gpsshogi-0.7.0 gpsshogi-0.7.0

 changelog                                |   23 +++++++++++++++++++++++
 control                                  |    8 ++++----
 patches/0004-Specify-QT_SELECT-qt5.patch |   17 +++++++++++++++++
 patches/series                           |    1 +
 rules                                    |    2 +-
 5 files changed, 46 insertions(+), 5 deletions(-)

diff -Nru gpsshogi-0.7.0/debian/changelog gpsshogi-0.7.0/debian/changelog
--- gpsshogi-0.7.0/debian/changelog	2016-12-04 02:15:52.000000000 +0100
+++ gpsshogi-0.7.0/debian/changelog	2017-03-31 00:57:08.000000000 +0200
@@ -1,3 +1,13 @@
+gpsshogi (0.7.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Import back again un-incorporated NMU  0.6.0-3+nmu2.  Closes: 848345
+  * Use HTTPS in Vcs-* headers.
+  * Apply change in git reposiotry from Daigo Moriwaki: specify QT_SELECT=qt5
+    and add a patch to build with qt5.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Fri, 31 Mar 2017 00:57:08 +0200
+
 gpsshogi (0.7.0-1) unstable; urgency=medium
 
   * New upstream release (r3043).
@@ -12,6 +22,19 @@
 
  -- Daigo Moriwaki <da...@debian.org>  Sun, 04 Dec 2016 10:15:52 +0900
 
+gpsshogi (0.6.0-3+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Steve Langasek ]
+  * Remove hard-coded dependency on libosl1. (Closes: #795237)
+
+  [ Bas Couwenberg ]
+  * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
+    (Closes: #807204)
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Sat, 02 Jan 2016 17:16:11 +0100
+
 gpsshogi (0.6.0-3+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gpsshogi-0.7.0/debian/control gpsshogi-0.7.0/debian/control
--- gpsshogi-0.7.0/debian/control	2016-12-04 02:15:52.000000000 +0100
+++ gpsshogi-0.7.0/debian/control	2017-03-31 00:56:33.000000000 +0200
@@ -2,15 +2,15 @@
 Section: games
 Priority: optional
 Maintainer: Daigo Moriwaki <da...@debian.org>
-Build-Depends: debhelper (>= 9), cdbs, quilt, dpkg-dev (>= 1.16.1~), libosl-dev (>= 0.7.0-2), libboost-all-dev, libgoogle-perftools-dev, chrpath, help2man, qtbase5-dev, qt5-default, libpoco-dev, libreadline6-dev, libgsl0-dev
+Build-Depends: debhelper (>= 9), cdbs, quilt, dpkg-dev (>= 1.16.1~), libosl-dev (>= 0.8.0), libboost-all-dev, libgoogle-perftools-dev, chrpath, help2man, qtbase5-dev, qtchooser, qt5-qmake, qtbase5-dev-tools, libpoco-dev, libreadline6-dev, libgsl-dev
 Standards-Version: 3.9.8
 Homepage: http://gps.tanaka.ecc.u-tokyo.ac.jp/gpsshogi/pukiwiki.php
-Vcs-Browser: http://git.debian.org/?p=collab-maint/gpsshogi.git;a=summary
-Vcs-Git: git://git.debian.org/git/collab-maint/gpsshogi.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/gpsshogi.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/gpsshogi.git
 
 Package: gpsshogi
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, libosl1 (>= 0.6.0), gpsshogi-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, gpsshogi-data (= ${source:Version})
 Description: Shogi playing program based on OpenShogiLib
  GPSShogi is a Shogi playing program based on OpenShogiLib and won the 19th
  World Computer Shogi Championship. This package contains several binaries to
diff -Nru gpsshogi-0.7.0/debian/patches/0004-Specify-QT_SELECT-qt5.patch gpsshogi-0.7.0/debian/patches/0004-Specify-QT_SELECT-qt5.patch
--- gpsshogi-0.7.0/debian/patches/0004-Specify-QT_SELECT-qt5.patch	1970-01-01 01:00:00.000000000 +0100
+++ gpsshogi-0.7.0/debian/patches/0004-Specify-QT_SELECT-qt5.patch	2017-03-31 00:53:39.000000000 +0200
@@ -0,0 +1,17 @@
+From: Daigo Moriwaki <da...@debian.org>
+Date: Mon, 2 Jan 2017 15:17:44 +0900
+Subject: Specify QT_SELECT=qt5
+
+---
+ makefile.local | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 makefile.local
+
+diff --git a/makefile.local b/makefile.local
+new file mode 100644
+index 0000000..3ebd281
+--- /dev/null
++++ b/makefile.local
+@@ -0,0 +1,2 @@
++QMAKEENV = QT_SELECT=qt5 
++
diff -Nru gpsshogi-0.7.0/debian/patches/series gpsshogi-0.7.0/debian/patches/series
--- gpsshogi-0.7.0/debian/patches/series	2016-12-04 02:15:52.000000000 +0100
+++ gpsshogi-0.7.0/debian/patches/series	2017-03-31 00:53:39.000000000 +0200
@@ -1,3 +1,4 @@
 0001-Customize-qmake-files.patch
 0002-Customize-make-files.patch
 0003-Fix-compiler-warnings-with-GCC-6.patch
+0004-Specify-QT_SELECT-qt5.patch
diff -Nru gpsshogi-0.7.0/debian/rules gpsshogi-0.7.0/debian/rules
--- gpsshogi-0.7.0/debian/rules	2016-12-04 02:15:52.000000000 +0100
+++ gpsshogi-0.7.0/debian/rules	2017-03-31 00:53:39.000000000 +0200
@@ -48,7 +48,7 @@
 	# viewer
 	for dir in lib/gui sample/viewer ; do \
 	  (cd $(CURDIR)/$$dir && \
-	   qmake OSL_HOME_QT="" TCMALLOC="" OSL_HOME=/usr/share/libosl-dev && \
+	   env QT_SELECT=qt5 qmake OSL_HOME_QT="" TCMALLOC="" OSL_HOME=/usr/share/libosl-dev && \
 	   $(MAKE) OSL_HOME_QT="" TCMALLOC="" OSL_HOME=/usr/share/libosl-dev) ; \
 	done
 	make OSL_HOME=/usr/share/libosl-dev OSL_HOME_FLAGS=-DOSL_HOME=\\\"/usr/share/gpsshogi-data\\\" viewer-release

Attachment: signature.asc
Description: PGP signature

Reply via email to