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,10 @@ +acm (5.0-27ubuntu1) maverick; urgency=low + + * Merge from debian testing. Remaining changes below. (LP: #595398) + + Added call to fclose to close file pointer (LP: #480661) + + -- Bilal Akhtar Thu, 17 Jun 2010 10:57:00 +0300 + acm (5.0-27) unstable; urgency=low * Fix FTBFS on hurd-i386: @@ -17,6 +24,24 @@ -- Phil Brooke Sun, 07 Feb 2010 16:47:08 +0000 +acm (5.0-25ubuntu2) karmic; urgency=low + + * Test-rebuild FTFBS: type clash of float_t which is defined + by system. In acm, "float_t" is locally defined as float, I chose + to rename the type to "float_type"; upstream authors might possibly + want make use of system definition. Files affected: + src/interpolate.*, src/inventory.c + + -- Morten Kjeldgaard Tue, 29 Sep 2009 12:45:13 +0200 + +acm (5.0-25ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + + Add .desktop file from Phil Bull (LP: #51934) + + Include converted icon suggested by Phill Bul as XPM + + -- Stephan Hermann Wed, 24 Jun 2009 18:23:34 +0000 + acm (5.0-25) unstable; urgency=low * Update to standards-version 3.8.2. @@ -28,6 +53,14 @@ -- Phil Brooke Tue, 23 Jun 2009 18:01:46 +0100 +acm (5.0-24ubuntu1) hardy; urgency=low + + * Add .desktop file from Phil Bull (LP: #51934) + * Include converted icon suggested by Phill Bul as XPM + * Set Ubuntu maintainer + + -- Emmet Hikory Thu, 03 Jan 2008 15:16:01 +0900 + acm (5.0-24) unstable; urgency=low * Acknowledge NMU -23.1 -- thanks. @@ -316,0 +350 @@ + diff -u acm-5.0/debian/rules acm-5.0/debian/rules --- acm-5.0/debian/rules +++ acm-5.0/debian/rules @@ -53,6 +53,9 @@ install -g root -m 755 -o root src/acm debian/acm/usr/games/acm cd objects && install -g root -m 644 -o root \ $(SCENES) $(OBJECTS) $(SOUNDS) ../debian/acm/usr/share/games/acm + dh_installdirs usr/share/pixmaps usr/share/applications + dh_install debian/acm.xpm usr/share/pixmaps + dh_install debian/acm.desktop usr/share/applications # Build architecture-independent files here. binary-indep: build install diff -u acm-5.0/debian/control acm-5.0/debian/control --- acm-5.0/debian/control +++ acm-5.0/debian/control @@ -1,8 +1,9 @@ Source: acm Section: games Priority: optional -Maintainer: Phil Brooke -Build-Depends: debhelper (>> 6.0.0), libx11-dev, libxext-dev, x11proto-core-dev, libgdbm-dev, libaudio-dev, libelfg0-dev [hurd-i386] +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bilal Akhtar +Build-Depends: debhelper (>> 6.0.0), libx11-dev, libxext-dev, libxt-dev, x11proto-core-dev, libgdbm-dev, libaudio-dev, libelfg0-dev Standards-Version: 3.8.4 Package: acm diff -u acm-5.0/debian/menu acm-5.0/debian/menu --- acm-5.0/debian/menu +++ acm-5.0/debian/menu @@ -7 +7,2 @@ - command="/usr/games/acm" + command="/usr/games/acm"\ + icon="/usr/share/pixmaps/acm.xpm" diff -u acm-5.0/src/interpolate.h acm-5.0/src/interpolate.h --- acm-5.0/src/interpolate.h +++ acm-5.0/src/interpolate.h @@ -31,15 +31,17 @@ #include +typedef float float_type; + typedef struct { - float_t x; /* upper x value for this interval */ - float_t m; /* slope of line in this interval */ - float_t b; /* y-intercept of line in this interval */ + float_type x; /* upper x value for this interval */ + float_type m; /* slope of line in this interval */ + float_type b; /* y-intercept of line in this interval */ } IEntry; typedef struct { int count; /* entry count in the interpolation table */ - float_t minX; /* minimum x value that can be interpolated */ + float_type minX; /* minimum x value that can be interpolated */ IEntry *entry; /* vector of intterpolation entries */ } ITable; @@ -59 +61 @@ -extern float_t interpolate(ITable * table, double x); +extern float_type interpolate(ITable * table, double x); diff -u acm-5.0/src/main.c acm-5.0/src/main.c --- acm-5.0/src/main.c +++ acm-5.0/src/main.c @@ -651,4 +651,6 @@ processCommandSwitches ( *argc, argv, display, auserver, name, switches); + fclose (f); + return 0; } diff -u acm-5.0/src/inventory.c acm-5.0/src/inventory.c --- acm-5.0/src/inventory.c +++ acm-5.0/src/inventory.c @@ -1275,14 +1275,14 @@ table = (ITable *) malloc(sizeof(ITable)); entry = (IEntry *) malloc(sizeof(IEntry) * (count - 1)); - table->minX = (float_t) x[0]; + table->minX = (float_type) x[0]; table->count = count - 1; table->entry = entry; for (i = 1; i < count; ++i) { - entry[i - 1].x = (float_t) x[i]; - entry[i - 1].m = (float_t) ((y[i] - y[i - 1]) / (x[i] - x[i - 1])); - entry[i - 1].b = (float_t) (y[i] - (x[i] * entry[i - 1].m)); + entry[i - 1].x = (float_type) x[i]; + entry[i - 1].m = (float_type) ((y[i] - y[i - 1]) / (x[i] - x[i - 1])); + entry[i - 1].b = (float_type) (y[i] - (x[i] * entry[i - 1].m)); } push_value(p, table_value, table); only in patch2: unchanged: --- acm-5.0.orig/debian/acm.xpm +++ acm-5.0/debian/acm.xpm @@ -0,0 +1,38 @@ +/* XPM */ +/* converted from http://openclipart.org/clipart//transportation/vehicles/military_airplane_mo_01.svg */ +static char * acm_xpm[] = { +"32 32 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" . ", +" . ", +" . ", +" . ", +" . ", +" . ", +" . ", +" . ", +" .... ", +" .... ", +" ..... ", +" ..... ", +" ....... ", +" ........ ", +" ......... ", +" .. ... ... ", +" .. ... .. ", +" .. ... .. ", +" . ... .. ", +" ..... . ", +" ...... ", +" ....... ", +" ......... ", +" .. ", +" ", +" ", +" ", +" "}; only in patch2: unchanged: --- acm-5.0.orig/debian/acm.desktop +++ acm-5.0/debian/acm.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=ACM Aerial Combat Simulator +GenericName=Flight Simulator +Comment=Fly military aircraft in a combat situation +Type=Application +Exec=acm -nosplash +Icon=acm +Categories=ActionGame;Game;Simulation; only in patch2: unchanged: --- acm-5.0.orig/src/interpolate.c +++ acm-5.0/src/interpolate.c @@ -31,12 +31,12 @@ static char *ierrmsg = "interpolate: x value is out of bounds\n"; -float_t +float_type interpolate(ITable * table, double x) { register int i, count = table->count; - float_t result; + float_type result; if (x < table->minX) { fprintf(stderr, ierrmsg); @@ -44,12 +44,12 @@ #ifdef DUMP kill(getpid(), SIGBUS); #endif - return (float_t) I_NaN; + return (float_type) I_NaN; } for (i = 0; i < count; ++i) { if (x <= table->entry[i].x) { - result = (float_t) (table->entry[i].m * x + table->entry[i].b); + result = (float_type) (table->entry[i].m * x + table->entry[i].b); if (isnan(result)) { fprintf(stderr, "interpolate: internal error\n"); } @@ -64,7 +64,7 @@ kill(getpid(), SIGBUS); #endif - return (float_t) I_NaN; + return (float_type) I_NaN; } ITable *