tag 269916 + fixed thanks Hi,
Please find attached the diff of the NMU. Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian GNU/Linux developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -u lxdoom-1.4.4/src/g_game.c lxdoom-1.4.4/src/g_game.c --- lxdoom-1.4.4/src/g_game.c +++ lxdoom-1.4.4/src/g_game.c @@ -871,7 +871,6 @@ switch (prevgamestate) { case GS_INTERMISSION: WI_End(); - default: } prevgamestate = gamestate; } diff -u lxdoom-1.4.4/src/d_main.c lxdoom-1.4.4/src/d_main.c --- lxdoom-1.4.4/src/d_main.c +++ lxdoom-1.4.4/src/d_main.c @@ -232,7 +232,6 @@ case -1: case GS_LEVEL: V_SetPalette(0); // cph - use default (basic) palette - default: } switch (gamestate) { @@ -245,7 +244,6 @@ case GS_DEMOSCREEN: D_PageDrawer(); break; - default: } } else if (gametic) { // In a level boolean redrawborderstuff; diff -u lxdoom-1.4.4/debian/changelog lxdoom-1.4.4/debian/changelog --- lxdoom-1.4.4/debian/changelog +++ lxdoom-1.4.4/debian/changelog @@ -1,3 +1,20 @@ +lxdoom (1.4.4-9.2) unstable; urgency=low + + * 0-day NMU during the BSP. + * Added a patch by Andreas Jochen to fix the build with gcc-4.0 (closes: + bug#274088, bug#297718). + * debian/rules: + - s/DEB_BUILD_GNU_CPU/DEB_BUILD_ARCH_CPU/g + - s/DEB_BUILD_GNU_SYSTEM/DEB_BUILD_ARCH_OS/g + - Added kfreebsd to the list of kernels that support sound. + - Update config.{guess,sub} at build time. + * debian/control: + - Added build-dependency on autotools-dev + - Added build-dependency on dpkg-dev (>= 1.13) for new DEB_* variables + support. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 5 Aug 2005 10:06:48 +0200 + lxdoom (1.4.4-9.1) unstable; urgency=high * Non-maintainer upload. diff -u lxdoom-1.4.4/debian/control lxdoom-1.4.4/debian/control --- lxdoom-1.4.4/debian/control +++ lxdoom-1.4.4/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Joe Drew <[EMAIL PROTECTED]> Standards-Version: 3.6.1 -Build-Depends: svgalibg1-dev [i386], debhelper (>= 3.0.0), xlibs-dev +Build-Depends: svgalibg1-dev [i386], debhelper (>= 3.0.0), xlibs-dev, dpkg-dev (>=1.13), autotools-dev Package: lxdoom Architecture: any diff -u lxdoom-1.4.4/debian/rules lxdoom-1.4.4/debian/rules --- lxdoom-1.4.4/debian/rules +++ lxdoom-1.4.4/debian/rules @@ -1,19 +1,19 @@ #!/usr/bin/make -f # Debhelper-using rules file for lxdoom -DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) -DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) SVGA_ARCHS=i386 SVGA_KERNS=linux -ifneq ($(findstring $(DEB_BUILD_GNU_CPU),$(SVGA_ARCHS)),) -ifneq ($(findstring $(DEB_BUILD_GNU_SYSTEM),$(SVGA_KERNS)),) +ifneq ($(findstring $(DEB_BUILD_ARCH_CPU),$(SVGA_ARCHS)),) +ifneq ($(findstring $(DEB_BUILD_ARCH_OS),$(SVGA_KERNS)),) DO_SVGA=1 endif endif -SOUND_KERNS=linux -ifneq ($(findstring $(DEB_BUILD_GNU_SYSTEM),$(SOUND_KERNS)),) +SOUND_KERNS=linux kfreebsd +ifneq ($(findstring $(DEB_BUILD_ARCH_OS),$(SOUND_KERNS)),) DO_SOUND=1 endif @@ -42,6 +42,7 @@ build-stamp: dh_testdir + cp -f /usr/share/misc/config.{guess,sub} . CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man --disable-cpu-opt # Add here commands to compile the package. $(MAKE) @@ -52,6 +53,7 @@ dh_testdir dh_testroot rm -f build-stamp install-stamp + rm -f config.{guess,sub} # Add here commands to clean up after the build process. -$(MAKE) distclean --- lxdoom-1.4.4.orig/src/l_main.c +++ lxdoom-1.4.4/src/l_main.c @@ -314,9 +314,7 @@ } } -#ifdef SECURE_UID uid_t stored_euid = -1; -#endif int main(int argc, const char * const * argv) { --- lxdoom-1.4.4.orig/src/i_main.h +++ lxdoom-1.4.4/src/i_main.h @@ -44,9 +44,7 @@ extern int broken_pipe; extern int (*I_GetTime)(void); -#ifdef SECURE_UID extern uid_t stored_euid; /* UID that the SVGALib I_InitGraphics switches to before vga_init() */ -#endif #endif --- lxdoom-1.4.4.orig/src/r_bsp.h +++ lxdoom-1.4.4/src/r_bsp.h @@ -41,11 +41,6 @@ extern line_t *linedef; extern sector_t *frontsector; extern sector_t *backsector; -extern int rw_x; -extern int rw_stopx; -extern boolean segtextured; -extern boolean markfloor; /* false if the back side is the same plane */ -extern boolean markceiling; /* old code -- killough: * extern drawseg_t drawsegs[MAXDRAWSEGS]; --- lxdoom-1.4.4.orig/src/p_maputl.c +++ lxdoom-1.4.4/src/p_maputl.c @@ -322,7 +322,7 @@ // // A fast function for testing intersections between things and linedefs. -boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l) +boolean ThingIsOnLine(const mobj_t *t, const line_t *l) { int dx = l->dx >> FRACBITS; // Linedef vector int dy = l->dy >> FRACBITS;