Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package edtsurf
Fixes #856233 - edtsurf FTBFS on architectures where char is unsigned
Please note that there is another change done which fixes a lintian
error. Formerly citation data were kept in debian/upstream but for
Jessie this file was moved to debian/upstream/metadata. Since this
seems non-invasive for the functionality of the package I used the
chance to fix this issue with this upload.
unblock edtsurf/0.2009-4
-- System Information:
Debian Release: 8.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru edtsurf-0.2009/debian/changelog edtsurf-0.2009/debian/changelog
--- edtsurf-0.2009/debian/changelog 2014-01-30 16:04:03.000000000 +0100
+++ edtsurf-0.2009/debian/changelog 2017-02-27 15:50:54.000000000 +0100
@@ -1,3 +1,14 @@
+edtsurf (0.2009-4) unstable; urgency=medium
+
+ [ John Paul Adrian Glaubitz ]
+ * debian/patches/fix-use-of-unsigned-char.patch:
+ - Add patch to fix use of unsigned char (Closes: #856233)
+
+ [ Andreas Tille ]
+ * moved debian/upstream to debian/upstream/metadata
+
+ -- Andreas Tille <ti...@debian.org> Mon, 27 Feb 2017 15:50:54 +0100
+
edtsurf (0.2009-3) unstable; urgency=medium
* Fix Vcs URL subdirectory
diff -Nru edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch
--- edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch 1970-01-01 01:00:00.000000000 +0100
+++ edtsurf-0.2009/debian/patches/fix-use-of-unsigned-char.patch 2017-02-27 15:50:54.000000000 +0100
@@ -0,0 +1,35 @@
+Author: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
+Last-Update: Mon, 27 Feb 2017 12:55:30 +0100
+Description: Fix use of unsigned char declarations
+
+--- a/CommonPara.h
++++ b/CommonPara.h
+@@ -44,7 +44,7 @@ static unsigned char mycolor[19][4]={128
+ 128,255,128,220, 128,128,255,220, 255,0,128,220,
+ 128,128, 0,220, 128,255,0,220, 128,0,128,220,
+ };
+-static char nb[26][3]={1,0,0, -1,0,0, 0,1,0, 0,-1,0, 0,0,1, 0,0,-1,
++static int nb[26][3]={1,0,0, -1,0,0, 0,1,0, 0,-1,0, 0,0,1, 0,0,-1,
+ 1,1,0, 1,-1,0, -1,1,0, -1,-1,0, 1,0,1, 1,0,-1, -1,0,1, -1,0,-1, 0,1,1, 0,1,-1, 0,-1,1, 0,-1,-1,
+ 1,1,1, 1,1,-1, 1,-1,1, -1,1,1, 1,-1,-1, -1,-1,1, -1,1,-1, -1,-1,-1};
+ static double asarea2[]= {
+--- a/ProteinSurface.h
++++ b/ProteinSurface.h
+@@ -22,7 +22,7 @@ static const char vcmcoffset[8][3] =
+ {0, 0, 0},{1, 0, 0},{0, 1, 0},{1, 1, 0},
+ {0,0, 1},{1, 0, 1},{0, 1, 1},{1, 1, 1}
+ };
+-static const char vcmctable[256][10]=
++static const int vcmctable[256][10]=
+ {
+ 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,//0 0 0 0 0 0 0 0 0 0 oka
+ 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,//1 0 0 0 0 0 0 0 1 1 okb
+@@ -312,7 +312,7 @@ static const int aiCubeEdgeFlags[256]=
+ 0xe90, 0xf99, 0xc93, 0xd9a, 0xa96, 0xb9f, 0x895, 0x99c, 0x69c, 0x795, 0x49f, 0x596, 0x29a, 0x393, 0x099, 0x190,
+ 0xf00, 0xe09, 0xd03, 0xc0a, 0xb06, 0xa0f, 0x905, 0x80c, 0x70c, 0x605, 0x50f, 0x406, 0x30a, 0x203, 0x109, 0x000
+ };
+-static const char a2iTriangleConnectionTable[256][16] =
++static const int a2iTriangleConnectionTable[256][16] =
+ {
+ {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+ {0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
diff -Nru edtsurf-0.2009/debian/patches/series edtsurf-0.2009/debian/patches/series
--- edtsurf-0.2009/debian/patches/series 2014-01-30 15:46:11.000000000 +0100
+++ edtsurf-0.2009/debian/patches/series 2017-02-27 15:43:15.000000000 +0100
@@ -1 +1,2 @@
CFLAGS_missing_in_Makefile.patch
+fix-use-of-unsigned-char.patch
File /tmp/EcVqaOBB6i/edtsurf-0.2009/debian/upstream is a regular file while file /tmp/ejBaNQRbJq/edtsurf-0.2009/debian/upstream is a directory
