Control: tags -1 pending Dear maintainer,
I've uploaded a new revision of acm versioned as 5.0-29.2 to fix Debian bug #889530. In addition I switched to compat level 11 because compat level 6 is deprecated and will lead to another RC bug in the near future. Furthermore I ensured that the -dbgsym package is built correctly and format-not-a-string-literal errors were fixed as well. The rest were some cosmetic changes like removing trailing whitespace and ordering some lines. The game builds fine again but I noticed the black screen and even a segmentation fault which seems related to #765815. Please find attached the debdiff. Regards, Markus
diff -u acm-5.0/debian/acm.dirs acm-5.0/debian/acm.dirs
--- acm-5.0/debian/acm.dirs
+++ acm-5.0/debian/acm.dirs
@@ -9 +8,0 @@
-
diff -u acm-5.0/debian/changelog acm-5.0/debian/changelog
--- acm-5.0/debian/changelog
+++ acm-5.0/debian/changelog
@@ -1,3 +1,17 @@
+acm (5.0-29.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depend on libgdbm-compat-dev and fix the FTBFS with newer gdbm
+ versions. (Closes: #889530)
+ * wrap-and-sort -sa.
+ * Switch to compat level 11 (was 6).
+ * d/rules: Use the correct dpkg buildflag variable CFLAGS instead of
+ DEBCFLAGS. This will also ensure that the -dbgsym package is created
+ correctly.
+ * Fix error "format-not-a-string-literal".
+
+ -- Markus Koschany <a...@debian.org> Wed, 18 Apr 2018 03:18:08 +0200
+
acm (5.0-29.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -63,7 +77,7 @@
* Update to standards-version 3.8.2.
* Replaced build-dependency on x-dev with x11proto-core-dev
(closes: #515356).
- * Bump debian/compat to 6 and build-depends on debhelper.
+ * Bump debian/compat to 6 and build-depends on debhelper.
* Now refer to GPL-2 common licence, not the GPL.
* Adjust copyright notice in debian/copyright to add dates.
@@ -100,7 +114,7 @@
* Applied patch from Mohammed Adnène Trojette:
* Correct copyright file to show original source (closes: #372495).
* Bump standards-version to 3.7.2 (no changes needed).
- * Added PostScript version of acmdoc.rtf (HTML conversion lost images)
+ * Added PostScript version of acmdoc.rtf (HTML conversion lost images)
(closes: #372496).
-- Phil Brooke <p...@debian.org> Sat, 10 Jun 2006 14:01:11 +0100
@@ -124,7 +138,7 @@
acm (5.0-19) unstable; urgency=low
- * Applied patch from Andreas Jochens to fix dis/sdbm/util.c so that
+ * Applied patch from Andreas Jochens to fix dis/sdbm/util.c so that
acm builds with amd64/gcc-3.4 (Closes: #280272).
-- Phil Brooke <p...@debian.org> Thu, 11 Nov 2004 18:50:05 +0000
@@ -146,7 +160,7 @@
acm (5.0-16) unstable; urgency=low
- * Adding missing includes to prevent `assignment makes pointer from
+ * Adding missing includes to prevent `assignment makes pointer from
integer without a cast' warnings that are fatal on ia64
(Closes: #226558).
* Cleaned up similar warnings from audio.c.
@@ -237,7 +251,7 @@
acm (5.0-6) unstable; urgency=low
* Folding in suggested changes to audio code from Giuseppe Borzi'.
- * Added -dis-silent switch.
+ * Added -dis-silent switch.
* More comments added to README.Debian.
-- Phil Brooke <p...@debian.org> Tue, 16 Jul 2002 13:20:25 +0100
diff -u acm-5.0/debian/compat acm-5.0/debian/compat
--- acm-5.0/debian/compat
+++ acm-5.0/debian/compat
@@ -1 +1 @@
-6
+11
diff -u acm-5.0/debian/control acm-5.0/debian/control
--- acm-5.0/debian/control
+++ acm-5.0/debian/control
@@ -2,12 +2,23 @@
Section: games
Priority: optional
Maintainer: Phil Brooke <p...@debian.org>
-Build-Depends: debhelper (>> 6.0.0), libx11-dev, libxext-dev,
x11proto-core-dev, libgdbm-dev, libaudio-dev, libelfg0-dev [hurd-i386],
sharutils
+Build-Depends:
+ debhelper (>= 11),
+ libaudio-dev,
+ libelfg0-dev [hurd-i386],
+ libgdbm-compat-dev,
+ libgdbm-dev,
+ libx11-dev,
+ libxext-dev,
+ sharutils,
+ x11proto-core-dev
Standards-Version: 3.9.6
Package: acm
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Multi-player classic aerial combat simulation
A multiplayer aerial combat simulation. Players engage in air to air
combat against one another using heat seeking missiles and cannons.
@@ -25,2 +35,0 @@
-
-
diff -u acm-5.0/debian/copyright acm-5.0/debian/copyright
--- acm-5.0/debian/copyright
+++ acm-5.0/debian/copyright
@@ -9,14 +9,14 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the
+ along with this program; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA.
diff -u acm-5.0/debian/rules acm-5.0/debian/rules
--- acm-5.0/debian/rules
+++ acm-5.0/debian/rules
@@ -25,7 +25,7 @@
configure-stamp:
dh_testdir
# Configuration of ACM.
- CFLAGS="$(DEBCFLAGS)" ./configure --prefix=/usr
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
touch configure-stamp
build: build-arch build-indep
@@ -70,7 +70,7 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
+# dh_installdebconf
dh_installdocs acmdoc.rtf debian/acmdoc.ps README ACM-Bibliography
# dh_installexamples
dh_installmenu
@@ -83,7 +83,7 @@
dh_installman src/acm.man
# dh_installinfo
# dh_undocumented
- dh_installchangelogs
+ dh_installchangelogs
# dh_link
dh_strip
dh_compress
diff -u acm-5.0/dis/configure acm-5.0/dis/configure
--- acm-5.0/dis/configure
+++ acm-5.0/dis/configure
@@ -1167,7 +1167,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lgdbm $LIBS"
+LIBS="-lgdbm -lgdbm_compat $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1173 "configure"
#include "confdefs.h"
@@ -1195,7 +1195,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -lgdbm"
+ LIBS="$LIBS -lgdbm -lgdbm_compat"
else
echo "$ac_t""no" 1>&6
fi
only in patch2:
unchanged:
--- acm-5.0.orig/V/lib/VBindColors.c
+++ acm-5.0/V/lib/VBindColors.c
@@ -240,7 +240,7 @@
}
if (v->AllocColor(v, v->cmap, &hcolor) == 0) {
- fprintf(stderr, errmsg);
+ fprintf(stderr, "%s", errmsg);
return -1;
}
@@ -285,7 +285,7 @@
xcolor2.blue = (unsigned short) (xcolor.blue * (1.0 -
d) + hcolor.blue * d);
xcolor2.flags = xcolor.flags;
if (v->AllocColor(v, v->cmap, &xcolor2) == 0) {
- fprintf(stderr, errmsg);
+ fprintf(stderr, "%s", errmsg);
return -1;
}
v->aPixel[cxt->nextPixel++] = xcolor2.pixel;
@@ -294,7 +294,7 @@
}
else {
if (v->AllocColor(v, v->cmap, &xcolor) == 0) {
- fprintf(stderr, errmsg);
+ fprintf(stderr, "%s", errmsg);
return -1;
}
vc->cIndex = cxt->nextPixel;
only in patch2:
unchanged:
--- acm-5.0.orig/V/lib/VPrintPoly.c
+++ acm-5.0/V/lib/VPrintPoly.c
@@ -9,10 +9,10 @@
char *nullPoly = "*** Null Polygon ***\n";
if (p == (VPolygon *) NULL)
- fprintf(file, nullPoly);
+ fprintf(file, "%s", nullPoly);
else {
if (p->numVtces == 0) {
- fprintf(file, nullPoly);
+ fprintf(file, "%s", nullPoly);
return;
}
signature.asc
Description: OpenPGP digital signature
