[planetblupi] 08/10: merge patched-debian/master into debian/master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit a167b122adafdc95f16b6b50b99e7f5513985a15
Merge: de9c653 aa6cb71
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Oct 15 17:50:43 2017 +0200

    merge patched-debian/master into debian/master

 CMakeLists.txt                                     |  2 +-
 debian/.git-dpm                                    |  6 +++---
 ...lupi-executable-goes-to-usr-games-not-usr.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 027b086,0000000..2111a8d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- NONE
- 3de778b80f898384646ec06886057a4553f1ae16
- 3de778b80f898384646ec06886057a4553f1ae16
++aa6cb7114d1f2f7af95a0567817aa3e593ba13dc
++aa6cb7114d1f2f7af95a0567817aa3e593ba13dc
++e0ace8819512553d3680e912e419a5df1b8295ab
 +e0ace8819512553d3680e912e419a5df1b8295ab
 +planetblupi_1.11.0.orig.tar.xz
 +d62eb5661224b1859f3b23afdbfbe03349e2f789
 +23135816
diff --cc debian/patches/0001-The-planetblupi-executable-goes-to-usr-games-not-usr.patch
index 0000000,0000000..46d4840
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-The-planetblupi-executable-goes-to-usr-games-not-usr.patch
@@@ -1,0 -1,0 +1,22 @@@
++From aa6cb7114d1f2f7af95a0567817aa3e593ba13dc Mon Sep 17 00:00:00 2001
++From: Didier Raboud <odyx at debian.org>
++Date: Sun, 15 Oct 2017 17:46:30 +0200
++Subject: The planetblupi executable goes to /usr/games, not /usr/bin
++
++---
++ CMakeLists.txt | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index 1a0a456..66e8f7d 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -219,7 +219,7 @@ endforeach (file)
++ ##############
++ 
++ install (TARGETS planetblupi
++-  RUNTIME DESTINATION bin
+++  RUNTIME DESTINATION games
++ )
++ 
++ install (
diff --cc debian/patches/series
index 0000000,0000000..7156133
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-The-planetblupi-executable-goes-to-usr-games-not-usr.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git