Bug#857036: unblock: adplug/2.2.1+dfsg3-0.4
Package: release.debian.org
Severity: normal
Tags: patch
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi!
adplug 2.2.1+dfsg3-0.4 contains a minor patch to fix
an FTBFS of the package on architectures where "char"
is by default unsigned instead of signed.
Attaching the full debdiff. Unfortunately, I had a
typo in the bug number, so I closed a non-existant
bug in the distant future with my upload :(.
Adrian
unblock adplug/2.2.1+dfsg3-0.4
-- System Information:
Debian Release: 9.0
APT prefers buildd-unstable
APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru adplug-2.2.1+dfsg3/debian/changelog adplug-2.2.1+dfsg3/debian/changelog
--- adplug-2.2.1+dfsg3/debian/changelog 2015-08-21 21:44:22.000000000 +0200
+++ adplug-2.2.1+dfsg3/debian/changelog 2017-03-07 11:50:44.000000000 +0100
@@ -1,3 +1,11 @@
+adplug (2.2.1+dfsg3-0.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add 06-fix-chnresolv-signage.diff to fix signage
+ of Cs3mPlayer::chnresolv array. (Closes: #8570222)
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Tue, 07 Mar 2017 11:50:44 +0100
+
adplug (2.2.1+dfsg3-0.3) unstable; urgency=medium
* Non-maintainer upload, applying changes from Ubuntu.
diff -Nru adplug-2.2.1+dfsg3/debian/patches/06-fix-chnresolv-signage.diff adplug-2.2.1+dfsg3/debian/patches/06-fix-chnresolv-signage.diff
--- adplug-2.2.1+dfsg3/debian/patches/06-fix-chnresolv-signage.diff 1970-01-01 01:00:00.000000000 +0100
+++ adplug-2.2.1+dfsg3/debian/patches/06-fix-chnresolv-signage.diff 2017-03-07 11:50:01.000000000 +0100
@@ -0,0 +1,28 @@
+Description: Fix signage of the chnresolv array
+Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Bug-Debian: https://bugs.debian.org/857022
+Forwarded: no
+Last-Update: 2017-03-07
+
+--- adplug-2.2.1+dfsg3.orig/src/s3m.cpp
++++ adplug-2.2.1+dfsg3/src/s3m.cpp
+@@ -25,7 +25,7 @@
+ #include <cstring>
+ #include "s3m.h"
+
+-const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
++const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
+ {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
+
+ const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table
+--- adplug-2.2.1+dfsg3.orig/src/s3m.h
++++ adplug-2.2.1+dfsg3/src/s3m.h
+@@ -90,7 +90,7 @@ class Cs3mPlayer: public CPlayer
+ unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt;
+
+ private:
+- static const char chnresolv[];
++ static const signed char chnresolv[];
+ static const unsigned short notetable[12];
+ static const unsigned char vibratotab[32];
+
diff -Nru adplug-2.2.1+dfsg3/debian/patches/series adplug-2.2.1+dfsg3/debian/patches/series
--- adplug-2.2.1+dfsg3/debian/patches/series 2015-05-23 01:13:32.000000000 +0200
+++ adplug-2.2.1+dfsg3/debian/patches/series 2017-03-07 11:48:55.000000000 +0100
@@ -1,3 +1,4 @@
03-no-tests.diff
04-no-gfdl-docs.diff
update-automake-files.patch
+06-fix-chnresolv-signage.diff
Reply to: