[planetblupi] 59/61: record new upstream branch

[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 440c7b3f10af64a0dae7fa1d3891bdd23fd87da6
Merge: dca700c 7831bc6
Author: Didier Raboud <odyx at debian.org>
Date:   Thu Nov 2 20:12:47 2017 +0100

    record new upstream branch

 CMakeLists.txt                                     |    7 +-
 debian/.git-dpm                                    |   14 +-
 ...allDirs-to-let-the-BINDIR-be-overriden-by.patch |   31 -
 ...-to-link-to-the-icon-from-the-desktop-fil.patch |   20 +
 ...RL-dependency-optional-through-the-PB_HTT.patch |  144 ---
 debian/patches/0003-Install-a-desktop-file.patch   |   85 --
 debian/patches/0004-Replace-a-char-by-Sint8.patch  |   23 -
 debian/patches/series                              |    5 +-
 resources/data/pl/stories.blp                      | 1100 ++++++++++++++++++++
 resources/image/little.png                         |  Bin 1015 -> 1088 bytes
 resources/image/text.png                           |  Bin 6966 -> 7422 bytes
 resources/po/pl.po                                 |  914 ++++++++++++++++
 src/action.cxx                                     |    4 +-
 src/blupi.cxx                                      |   77 +-
 src/button.cxx                                     |    2 +-
 src/button.h                                       |    2 +-
 src/decblupi.cxx                                   |   12 +-
 src/decio.cxx                                      |    6 +-
 src/decmap.cxx                                     |   12 +-
 src/decor.cxx                                      |  112 +-
 src/decor.h                                        |    9 +-
 src/decstat.cxx                                    |    8 +-
 src/def.h                                          |    7 +
 src/event.cxx                                      |  499 +++++----
 src/event.h                                        |    6 +-
 src/menu.h                                         |    2 +-
 src/movie.cxx                                      |   35 +-
 src/movie.h                                        |    6 +-
 src/path.cxx                                       |   34 +-
 src/pixmap.cxx                                     |   25 +-
 src/pixmap.h                                       |   13 +-
 src/progress.cxx                                   |    2 +-
 src/progress.h                                     |    2 +-
 src/text.cxx                                       |   31 +-
 34 files changed, 2613 insertions(+), 636 deletions(-)

diff --cc debian/.git-dpm
index b79bf6f,0000000..da7c769
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
- 854dea4aa90bce52fa6ab356042778dee5a20617
- 854dea4aa90bce52fa6ab356042778dee5a20617
- e0ace8819512553d3680e912e419a5df1b8295ab
- e0ace8819512553d3680e912e419a5df1b8295ab
- planetblupi_1.11.0.orig.tar.xz
- d62eb5661224b1859f3b23afdbfbe03349e2f789
- 23135816
++7831bc6a1846d599a7d92c27760ed11218d91977
++7831bc6a1846d599a7d92c27760ed11218d91977
++8f51f0c9cf33dff0d410dc8eadb0763d8c79a496
++8f51f0c9cf33dff0d410dc8eadb0763d8c79a496
++planetblupi_1.12.0.orig.tar.gz
++8d0b14f6897a5e52561e5d279f9a5e0e111ccc5d
++32930919
diff --cc debian/patches/0001-Use-PB_ICON-to-link-to-the-icon-from-the-desktop-fil.patch
index 0000000,0000000..581f7bb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-PB_ICON-to-link-to-the-icon-from-the-desktop-fil.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 7831bc6a1846d599a7d92c27760ed11218d91977 Mon Sep 17 00:00:00 2001
++From: Didier Raboud <odyx at debian.org>
++Date: Thu, 2 Nov 2017 20:15:32 +0100
++Subject: Use @PB_ICON@ to link to the icon from the desktop file
++
++---
++ resources/linux/application.desktop.in | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/resources/linux/application.desktop.in b/resources/linux/application.desktop.in
++index cda0397..db29df3 100644
++--- a/resources/linux/application.desktop.in
+++++ b/resources/linux/application.desktop.in
++@@ -6,5 +6,5 @@ GenericName=Video Game
++ Comment=@PB_DESCRIPTION@
++ Exec=@PB_EXEC@
++ StartupWMClass=@PB_EXEC@
++-Icon=@APPIMAGE_ICON_REF@
+++Icon=@PB_ICON_REF@
++ Categories=Game;StrategyGame;
diff --cc debian/patches/series
index bd2c74d,0000000..376d845
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
- 0001-Use-GNUInstallDirs-to-let-the-BINDIR-be-overriden-by.patch
- 0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch
- 0003-Install-a-desktop-file.patch
- 0004-Replace-a-char-by-Sint8.patch
++0001-Use-PB_ICON-to-link-to-the-icon-from-the-desktop-fil.patch

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