[planetblupi] 12/13: 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 741c8aadd8f8135f101719213dcce01af53c1398
Merge: de252f0 61a1ab6
Author: Didier Raboud <odyx at debian.org>
Date:   Tue Feb 6 20:38:57 2018 +0100

    merge patched-debian/master into debian/master

 debian/.git-dpm                                    |   6 +-
 ...de-to-retrieve-the-music-in-a-dedicated-m.patch | 106 ---------------------
 ...-music-choices-accordingly-to-the-availab.patch |  74 --------------
 debian/patches/series                              |   2 -
 src/blupi.cxx                                      |  10 +-
 src/decblupi.cxx                                   |   2 +-
 src/pixmap.cxx                                     |  12 +--
 7 files changed, 17 insertions(+), 195 deletions(-)

diff --cc debian/.git-dpm
index 93fb3fb,0000000..4fdd93a
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
- 3baa931c68cc55464f545163b4f8c4f6f9537f40
- 3baa931c68cc55464f545163b4f8c4f6f9537f40
- 13a7e27133bfb0ceb5c4df8a377354c580bf3b01
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
 +61a1ab65ebe5fa609899deffa05903d74e8ec6c0
 +planetblupi_1.12.2.orig.tar.gz
 +4a95a5b39fc0d62ce4c560984762053ff0937d36
 +106578253

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