Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: libretro-bsnes-merc...@packages.debian.org
Control: affects -1 + src:libretro-bsnes-mercury

Please consider unblocking libretro-bsnes-mercury. The upload fixes the
incorrect location of the buttonmap.xml file for the Kodi libretro
plugins, without which it is not possible to use game controllers with
the emulator.

[ Tests ]

Manually confirmed generated kodi-game-* debs have buttonmap.xml in
resources/ subdirectory, confirmed correct operation of game controller
with package.

[ Risks ]

This is a trivial fix that just corrects the location of the button map
for the Kodi plugins.

[ Checklist ]

  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock libretro-bsnes-mercury/094+git20220807-8

git show --stat:

commit 8fa1fad276c3ede227c0c70037a486e2ef23fa96 (HEAD -> master, tag: 
debian/094+git20220807-8)
Author: Jonathan McDowell <nood...@earth.li>
Date:   Thu May 11 10:48:30 2023 +0000

    Fix Kodi plugins buttonmap.xml location (Closes: #1034583)

    The buttonmap.xml file needs to live in the resources subdirectory, not
    the parent plugin directory.

 debian/changelog                                                               
        | 7 +++++++
 debian/kodi-game/game.libretro.bsnes-mercury-accuracy/{ => 
resources}/buttonmap.xml    | 0
 debian/kodi-game/game.libretro.bsnes-mercury-balanced/{ => 
resources}/buttonmap.xml    | 0
 debian/kodi-game/game.libretro.bsnes-mercury-performance/{ => 
resources}/buttonmap.xml | 0
 4 files changed, 7 insertions(+)

J.

-- 
I'm not allowed to talk to you any more.
diff -Nru libretro-bsnes-mercury-094+git20220807/debian/changelog 
libretro-bsnes-mercury-094+git20220807/debian/changelog
--- libretro-bsnes-mercury-094+git20220807/debian/changelog     2023-04-19 
08:49:56.000000000 +0000
+++ libretro-bsnes-mercury-094+git20220807/debian/changelog     2023-05-11 
10:47:35.000000000 +0000
@@ -1,3 +1,10 @@
+libretro-bsnes-mercury (094+git20220807-8) unstable; urgency=medium
+
+  * Team upload
+  * Fix Kodi plugins buttonmap.xml location (Closes: #1034583)
+
+ -- Jonathan McDowell <nood...@earth.li>  Thu, 11 May 2023 10:47:35 +0000
+
 libretro-bsnes-mercury (094+git20220807-7) unstable; urgency=medium
 
   * Team upload
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/buttonmap.xml
  2023-01-22 15:29:27.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/buttonmap.xml
  1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buttonmap version="2">
-       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
-               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
-               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
-               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
-               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
-               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
-               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
-               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
-               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
-               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
-               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
-               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
-               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
-       </controller>
-</buttonmap>
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/resources/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/resources/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/resources/buttonmap.xml
        1970-01-01 00:00:00.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-accuracy/resources/buttonmap.xml
        2023-05-11 10:47:35.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buttonmap version="2">
+       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
+               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
+               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
+               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
+               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
+               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
+               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
+               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
+               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
+               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
+               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
+               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
+               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
+       </controller>
+</buttonmap>
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/buttonmap.xml
  2023-01-22 15:29:27.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/buttonmap.xml
  1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buttonmap version="2">
-       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
-               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
-               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
-               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
-               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
-               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
-               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
-               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
-               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
-               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
-               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
-               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
-               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
-       </controller>
-</buttonmap>
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/resources/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/resources/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/resources/buttonmap.xml
        1970-01-01 00:00:00.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-balanced/resources/buttonmap.xml
        2023-05-11 10:47:35.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buttonmap version="2">
+       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
+               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
+               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
+               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
+               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
+               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
+               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
+               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
+               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
+               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
+               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
+               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
+               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
+       </controller>
+</buttonmap>
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/buttonmap.xml
       2023-01-22 15:29:27.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/buttonmap.xml
       1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buttonmap version="2">
-       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
-               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
-               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
-               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
-               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
-               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
-               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
-               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
-               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
-               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
-               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
-               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
-               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
-       </controller>
-</buttonmap>
diff -Nru 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/resources/buttonmap.xml
 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/resources/buttonmap.xml
--- 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/resources/buttonmap.xml
     1970-01-01 00:00:00.000000000 +0000
+++ 
libretro-bsnes-mercury-094+git20220807/debian/kodi-game/game.libretro.bsnes-mercury-performance/resources/buttonmap.xml
     2023-05-11 10:47:35.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buttonmap version="2">
+       <controller id="game.controller.snes" type="RETRO_DEVICE_JOYPAD">
+               <feature name="a" mapto="RETRO_DEVICE_ID_JOYPAD_A"/>
+               <feature name="b" mapto="RETRO_DEVICE_ID_JOYPAD_B"/>
+               <feature name="x" mapto="RETRO_DEVICE_ID_JOYPAD_X"/>
+               <feature name="y" mapto="RETRO_DEVICE_ID_JOYPAD_Y"/>
+               <feature name="start" mapto="RETRO_DEVICE_ID_JOYPAD_START"/>
+               <feature name="select" mapto="RETRO_DEVICE_ID_JOYPAD_SELECT"/>
+               <feature name="up" mapto="RETRO_DEVICE_ID_JOYPAD_UP"/>
+               <feature name="down" mapto="RETRO_DEVICE_ID_JOYPAD_DOWN"/>
+               <feature name="right" mapto="RETRO_DEVICE_ID_JOYPAD_RIGHT"/>
+               <feature name="left" mapto="RETRO_DEVICE_ID_JOYPAD_LEFT"/>
+               <feature name="rightbumper" mapto="RETRO_DEVICE_ID_JOYPAD_R"/>
+               <feature name="leftbumper" mapto="RETRO_DEVICE_ID_JOYPAD_L"/>
+       </controller>
+</buttonmap>

Reply via email to