tag 668815 patch pending thanks Tobias Hansen <[email protected]> (17/06/2012): > I also prepared a NMU, before Siegfried Gevatter wrote that mail. You > could also upload that for now: > > http://mentors.debian.net/debian/pool/main/o/open-invaders/open-invaders_0.3-3.2.dsc
Thanks! I only tweaked urgency=high (will save me an age-days later), final source debdiff is attached. Package just uploaded. Mraw, KiBi.
diff -Nru open-invaders-0.3/debian/changelog open-invaders-0.3/debian/changelog --- open-invaders-0.3/debian/changelog 2011-12-04 12:48:04.000000000 +0100 +++ open-invaders-0.3/debian/changelog 2012-06-17 20:48:58.000000000 +0200 @@ -1,3 +1,15 @@ +open-invaders (0.3-3.2) unstable; urgency=high + + * Non-maintainer upload. + * debian/patches/do-not-use-ALLEGRO_LINUX-macro.patch: + - Replace ALLEGRO_LINUX macro with ALLEGRO_UNIX to allow building + with an Allegro version without Linux console mode (allegro4.4). + Closes: #668815 + * Replace Build-Depends: liballegro4.2-dev by liballegro4-dev in + preparation for a renaming of the dev package in the future. + + -- Tobias Hansen <[email protected]> Sun, 03 Jun 2012 12:26:36 +0200 + open-invaders (0.3-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru open-invaders-0.3/debian/control open-invaders-0.3/debian/control --- open-invaders-0.3/debian/control 2011-09-03 21:58:26.000000000 +0200 +++ open-invaders-0.3/debian/control 2012-06-03 12:34:25.000000000 +0200 @@ -7,7 +7,7 @@ cdbs (>= 0.4.49), autotools-dev, libaldmb1-dev (>= 1:0.9.3), - liballegro4.2-dev (>= 2:4.2.2-2), + liballegro4-dev, libxext-dev, libxxf86vm1, pkg-config, diff -Nru open-invaders-0.3/debian/patches/do-not-use-ALLEGRO_LINUX-macro.patch open-invaders-0.3/debian/patches/do-not-use-ALLEGRO_LINUX-macro.patch --- open-invaders-0.3/debian/patches/do-not-use-ALLEGRO_LINUX-macro.patch 1970-01-01 01:00:00.000000000 +0100 +++ open-invaders-0.3/debian/patches/do-not-use-ALLEGRO_LINUX-macro.patch 2012-06-03 12:22:20.000000000 +0200 @@ -0,0 +1,155 @@ +Description: Don't use the ALLEGRO_LINUX macro + This macro specifies if the Linux console mode is enabled, + not if the platform is Linux. Use ALLEGRO_UNIX instead. +Author: Tobias Hansen <[email protected]> + +--- a/headers/declare.h ++++ b/headers/declare.h +@@ -74,7 +74,7 @@ + #define ENDING_SONG PACKAGE_DATA_DIR"/"PACKAGE"/endsong.mod" + #define HISCORE_SONG PACKAGE_DATA_DIR"/"PACKAGE"/hiscore.mod" + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + #include "headers/pmask.h" + #else + #include "../include/pmask.h" +--- a/src/collision.cc ++++ b/src/collision.cc +@@ -24,14 +24,14 @@ + + #include <allegro.h> + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + #include "config.h" + #include "headers/pmask.h" + #include "headers/declare.h" + #include "headers/logic.h" + #endif + +-#ifndef ALLEGRO_LINUX ++#ifndef ALLEGRO_UNIX + #include "../include/pmask.h" + #include "../include/declare.h" + #endif +--- a/src/init.cc ++++ b/src/init.cc +@@ -176,7 +176,7 @@ + ostringstream filepath; + int checksum; + +- #ifndef ALLEGRO_LINUX ++ #ifndef ALLEGRO_UNIX + filepath << "./data/hiscore.dat"; + #else + filepath << getenv("HOME") << "/.openinvaders/hiscore"; +@@ -297,7 +297,7 @@ + + int checksum = (totalhiscore*239)-686; //simple, I know! + +- #ifndef ALLEGRO_LINUX ++ #ifndef ALLEGRO_UNIX + filepath << "./data/hiscore.dat"; + #else + filepath << getenv("HOME") << "/.openinvaders"; +@@ -330,7 +330,7 @@ + { + ostringstream filepath; + +- #ifndef ALLEGRO_LINUX ++ #ifndef ALLEGRO_UNIX + filepath << "./data/config.dat"; + #else + filepath << getenv("HOME") << "/.openinvaders"; +@@ -479,7 +479,7 @@ + { + ostringstream filepath; + +- #ifndef ALLEGRO_LINUX ++ #ifndef ALLEGRO_UNIX + filepath << "./data/config.dat"; + #else + filepath << getenv("HOME") << "/.openinvaders"; +@@ -625,7 +625,7 @@ + + loaded_graphic=load_bitmap(filenamebuffer.str().c_str(),NULL); + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + if(!loaded_graphic) + { + loaded_graphic=load_bitmap(defsymbol.c_str(), NULL); +@@ -651,7 +651,7 @@ + + loaded_sound=load_wav(filenamebuffer.str().c_str()); + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + if(!loaded_sound) + { + loaded_sound=load_wav(defsymbol.c_str()); +--- a/src/ending.cc ++++ b/src/ending.cc +@@ -187,7 +187,7 @@ + + endingsong=dumb_load_mod_quick("./data/endsong.mod"); + +- #ifdef ALLEGRO_LINUX ++ #ifdef ALLEGRO_UNIX + if(!endingsong) + { + endingsong=dumb_load_mod_quick(ENDING_SONG); +--- a/src/input.cc ++++ b/src/input.cc +@@ -55,11 +55,11 @@ + int result; + static bool keyreleased=true; + +- #ifdef ALLEGRO_LINUX ++ #ifdef ALLEGRO_UNIX + string filepath=getenv("HOME"); + #endif + +- #ifndef ALLEGRO_LINUX ++ #ifndef ALLEGRO_UNIX + string filepath='.'; + #endif + +--- a/src/interrupt.cc ++++ b/src/interrupt.cc +@@ -24,12 +24,12 @@ + + #include <allegro.h> + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + #include "config.h" + #include "headers/declare.h" + #endif + +-#ifndef ALLEGRO_LINUX ++#ifndef ALLEGRO_UNIX + #include "../include/declare.h" + #endif + +--- a/src/intro.cc ++++ b/src/intro.cc +@@ -110,7 +110,7 @@ + allegro=load_pcx("./data/allegro_logo.pcx", NULL); + linuxlogo=load_pcx("./data/linux.pcx", NULL); + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + if(!jamyskis) + { + jamyskis=load_pcx(JAMYSKIS_LOGO, NULL); +@@ -217,7 +217,7 @@ + big_hiscore_font=load_font("./data/arcade_font_big.pcx",NULL,NULL); + gamefont_trans=load_font("./data/arcade_font.pcx",NULL,NULL); + +-#ifdef ALLEGRO_LINUX ++#ifdef ALLEGRO_UNIX + if(!titlesong) + { + titlesong=dumb_load_mod_quick(TITLE_SONG); diff -Nru open-invaders-0.3/debian/patches/series open-invaders-0.3/debian/patches/series --- open-invaders-0.3/debian/patches/series 2011-12-04 12:47:03.000000000 +0100 +++ open-invaders-0.3/debian/patches/series 2012-06-03 12:24:24.000000000 +0200 @@ -1,3 +1,4 @@ fix_ftbfs_gcc45.patch fix_pmask_amd64.patch format-security.patch +do-not-use-ALLEGRO_LINUX-macro.patch
signature.asc
Description: Digital signature
