Author: baby-guest Date: 2008-01-14 18:11:48 +0000 (Mon, 14 Jan 2008) New Revision: 5345
Added: packages/trunk/micropolis-activity/debian/ packages/trunk/micropolis-activity/debian/changelog packages/trunk/micropolis-activity/debian/compat packages/trunk/micropolis-activity/debian/control packages/trunk/micropolis-activity/debian/copyright packages/trunk/micropolis-activity/debian/menu packages/trunk/micropolis-activity/debian/micropolis-data.dirs packages/trunk/micropolis-activity/debian/micropolis.dirs packages/trunk/micropolis-activity/debian/patches/ packages/trunk/micropolis-activity/debian/patches/01_mac-osx.patch packages/trunk/micropolis-activity/debian/patches/02_micropolis-path.patch packages/trunk/micropolis-activity/debian/patches/03_makefile.patch packages/trunk/micropolis-activity/debian/patches/series packages/trunk/micropolis-activity/debian/rules Log: [svn-inject] Applying Debian modifications to trunk Property changes on: packages/trunk/micropolis-activity/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: packages/trunk/micropolis-activity/debian/changelog =================================================================== --- packages/trunk/micropolis-activity/debian/changelog (rev 0) +++ packages/trunk/micropolis-activity/debian/changelog 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,29 @@ +micropolis-activity (0.0.20071228-1) UNRELEASED; urgency=low + + [ Miriam Ruiz ] + * Separate packages in arch-dependent program and arch-indep data. + * Changed package descriptions. + * Added XS-DM-Upload-Allowed tag to debian/control + * Fixed optimization flags. + * First release of the package. Closes: #460674 + + -- Miriam Ruiz <[EMAIL PROTECTED]> Mon, 14 Jan 2008 16:44:23 +0000 + +micropolis-activity (0.0-3) unstable; urgency=low + + * Satisfy the build dependency: bison + + -- Kenshi Muto <[EMAIL PROTECTED]> Mon, 14 Jan 2008 21:24:30 +0900 + +micropolis-activity (0.0-2) unstable; urgency=low + + * chdir before running micropolis. + + -- Kenshi Muto <[EMAIL PROTECTED]> Mon, 14 Jan 2008 18:36:00 +0900 + +micropolis-activity (0.0-1) unstable; urgency=low + + * Initial release + + -- Kenshi Muto <[EMAIL PROTECTED]> Mon, 14 Jan 2008 17:06:19 +0900 + Added: packages/trunk/micropolis-activity/debian/compat =================================================================== --- packages/trunk/micropolis-activity/debian/compat (rev 0) +++ packages/trunk/micropolis-activity/debian/compat 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1 @@ +5 Added: packages/trunk/micropolis-activity/debian/control =================================================================== --- packages/trunk/micropolis-activity/debian/control (rev 0) +++ packages/trunk/micropolis-activity/debian/control 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,35 @@ +Source: micropolis-activity +Section: games +Priority: extra +Maintainer: Debian Games Team <[EMAIL PROTECTED]> +Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Kenshi Muto <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5), quilt, libx11-dev, libxpm-dev, bison +Standards-Version: 3.7.3 +Homepage: http://www.donhopkins.com/home/micropolis/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/micropolis-activity/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/micropolis-activity/?op=log +XS-DM-Upload-Allowed: yes + +Package: micropolis +Architecture: any +Depends: micropolis-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: real-time city management simulator + Simulation and city-building personal computer game. The goal of the + game is to build and design a city. The player can mark land as being + zoned as commercial, industrial, or residential, add buildings, change + the tax rate, build a power grid, build transportation systems and many + other actions, in order to enhance the city. + . + This is the GPLed version of SimCity. + +Package: micropolis-data +Architecture: all +Depends: ${misc:Depends} +Description: real-time city management simulator - data + Simulation and city-building personal computer game. The goal of the + game is to build and design a city. The player can mark land as being + zoned as commercial, industrial, or residential, add buildings, change + the tax rate, build a power grid, build transportation systems and many + other actions, in order to enhance the city. + . + This package includes the data for the game. Added: packages/trunk/micropolis-activity/debian/copyright =================================================================== --- packages/trunk/micropolis-activity/debian/copyright (rev 0) +++ packages/trunk/micropolis-activity/debian/copyright 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,76 @@ +This package was debianized by Kenshi Muto <[EMAIL PROTECTED]> on +Mon, 14 Jan 2008 17:06:19 +0900. + +It was downloaded from http://www.donhopkins.com/home/micropolis/ + +Upstream Authors: + + Electronic Arts Inc. + Don Hopkins <[EMAIL PROTECTED]> + +Copyright: + + Copyright (C) 1989-2007 Electronic Arts Inc. + +License: + + This package 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, either version 3 of the License, or + (at your option) any later version. + + This package 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, see <http://www.gnu.org/licenses/>. + + + ADDITIONAL TERMS per GNU GPL Section 7 + + No trademark or publicity rights are granted. This license does NOT + give you any right, title or interest in the trademark SimCity or any + other Electronic Arts trademark. You may not distribute any + modification of this program using the trademark SimCity or claim any + affliation or association with Electronic Arts Inc. or its employees. + + Any propagation or conveyance of this program must include this + copyright notice and these terms. + + If you convey this program (or any modifications of it) and assume + contractual liability for the program to recipients of it, you agree + to indemnify Electronic Arts for any liability that those contractual + assumptions impose on Electronic Arts. + + You may not misrepresent the origins of this program; modified + versions of the program must be marked as such and not identified as + the original program. + + This disclaimer supplements the one included in the General Public + License. TO THE FULLEST EXTENT PERMISSIBLE UNDER APPLICABLE LAW, THIS + PROGRAM IS PROVIDED TO YOU "AS IS," WITH ALL FAULTS, WITHOUT WARRANTY + OF ANY KIND, AND YOUR USE IS AT YOUR SOLE RISK. THE ENTIRE RISK OF + SATISFACTORY QUALITY AND PERFORMANCE RESIDES WITH YOU. ELECTRONIC ARTS + DISCLAIMS ANY AND ALL EXPRESS, IMPLIED OR STATUTORY WARRANTIES, + INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY + RIGHTS, AND WARRANTIES (IF ANY) ARISING FROM A COURSE OF DEALING, + USAGE, OR TRADE PRACTICE. ELECTRONIC ARTS DOES NOT WARRANT AGAINST + INTERFERENCE WITH YOUR ENJOYMENT OF THE PROGRAM; THAT THE PROGRAM WILL + MEET YOUR REQUIREMENTS; THAT OPERATION OF THE PROGRAM WILL BE + UNINTERRUPTED OR ERROR-FREE, OR THAT THE PROGRAM WILL BE COMPATIBLE + WITH THIRD PARTY SOFTWARE OR THAT ANY ERRORS IN THE PROGRAM WILL BE + CORRECTED. NO ORAL OR WRITTEN ADVICE PROVIDED BY ELECTRONIC ARTS OR + ANY AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY. SOME + JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF OR LIMITATIONS ON IMPLIED + WARRANTIES OR THE LIMITATIONS ON THE APPLICABLE STATUTORY RIGHTS OF A + CONSUMER, SO SOME OR ALL OF THE ABOVE EXCLUSIONS AND LIMITATIONS MAY + NOT APPLY TO YOU. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2008, Kenshi Muto <[EMAIL PROTECTED]> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. Added: packages/trunk/micropolis-activity/debian/menu =================================================================== --- packages/trunk/micropolis-activity/debian/menu (rev 0) +++ packages/trunk/micropolis-activity/debian/menu 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,2 @@ +?package(micropolis):needs="X11" section="Games/Simulation"\ + title="Micropolis" command="/usr/games/Micropolis" Added: packages/trunk/micropolis-activity/debian/micropolis-data.dirs =================================================================== --- packages/trunk/micropolis-activity/debian/micropolis-data.dirs (rev 0) +++ packages/trunk/micropolis-activity/debian/micropolis-data.dirs 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,3 @@ +usr/share/pixmaps +usr/share/games/micropolis +usr/share/doc/micropolis Added: packages/trunk/micropolis-activity/debian/micropolis.dirs =================================================================== --- packages/trunk/micropolis-activity/debian/micropolis.dirs (rev 0) +++ packages/trunk/micropolis-activity/debian/micropolis.dirs 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,2 @@ +usr/games +usr/lib/games/micropolis Added: packages/trunk/micropolis-activity/debian/patches/01_mac-osx.patch =================================================================== --- packages/trunk/micropolis-activity/debian/patches/01_mac-osx.patch (rev 0) +++ packages/trunk/micropolis-activity/debian/patches/01_mac-osx.patch 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,288 @@ +# Copyright (C) 2008 by Kenshi Muto <[EMAIL PROTECTED]> +# Distributed under the same license as the game. See debian/copyright. + +Index: micropolis-activity-0.0.20071228/Micropolis +=================================================================== +--- micropolis-activity-0.0.20071228.orig/Micropolis 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/Micropolis 2008-01-14 17:54:39.000000000 +0000 +@@ -1,7 +1,7 @@ + #!/bin/bash + export SIMHOME=`pwd` + echo "Starting Micropolis in $SIMHOME ... " +-res/sim $* ++res/sim -w $* + + # + # Micropolis, Unix Version. This game was released for the Unix platform +Index: micropolis-activity-0.0.20071228/src/sim/g_map.c +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/sim/g_map.c 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/sim/g_map.c 2008-01-14 17:49:29.000000000 +0000 +@@ -467,11 +467,8 @@ + unsigned char *data = + (unsigned char *)view->data; + unsigned char *image; +- int bitmapPad = view->x->small_tile_image->bitmap_pad; +- int rowBytes = view->x->small_tile_image->bytes_per_line; +- line = rowBytes >> 1; /* Convert from byte offset to short offset */ + image = +- &data[(line * y) + x]; ++ &data[(line * y) + x * pixelBytes]; + + if (solid) { + for (i = h; i > 0; i--) { +@@ -479,11 +476,11 @@ + *(image++) = (pixel >> 0) & 0xff; + *(image++) = (pixel >> 8) & 0xff; + *(image++) = (pixel >> 16) & 0xff; +- if (bitmapPad == 32) { ++ if (pixelBytes == 4) { + image++; + } + } +- image += line - w; ++ image += line - w * pixelBytes; + } + } else { + for (i = h; i > 0; i--) { +@@ -492,15 +489,17 @@ + *(image++) = (pixel >> 0) & 0xff; + *(image++) = (pixel >> 8) & 0xff; + *(image++) = (pixel >> 16) & 0xff; +- if (bitmapPad == 32) { +- image++; +- } ++ } else { ++ image += 3; ++ } ++ if (pixelBytes == 4) { ++ image++; + } + } + if (!(w & 1)) { + stipple++; + } +- image += line - w; ++ image += line - w * pixelBytes; + } + } + } +Index: micropolis-activity-0.0.20071228/src/sim/g_smmaps.c +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/sim/g_smmaps.c 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/sim/g_smmaps.c 2008-01-14 17:49:29.000000000 +0000 +@@ -153,8 +153,6 @@ + ROW3_16 \ + break; \ + case 24: \ +- ROW3_24 \ +- break; \ + case 32: \ + ROW3_32 \ + break; \ +Index: micropolis-activity-0.0.20071228/src/sim/headers/sim.h +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/sim/headers/sim.h 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/sim/headers/sim.h 2008-01-14 17:49:29.000000000 +0000 +@@ -91,7 +91,6 @@ + #include <assert.h> + #include <ctype.h> + #include <setjmp.h> +-#include <malloc.h> + #include <errno.h> + #include <signal.h> + #include <math.h> +Index: micropolis-activity-0.0.20071228/src/sim/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/sim/makefile 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/sim/makefile 2008-01-14 17:54:16.000000000 +0000 +@@ -13,9 +13,10 @@ + #DEFINES = -DIS_LINUX -DIS_INTEL -DCAM -DNET + DEFINES = -DIS_LINUX -DIS_INTEL + +-CFLAGS = $(OPTFLAGS) $(DEFINES) ++CFLAGS = $(TARGET_FLAG) $(OPTFLAGS) $(DEFINES) + + #LDFLAGS = -Bstatic ++LDFLAGS=-L/usr/X11/lib + + INSTALL = install -s + +Index: micropolis-activity-0.0.20071228/src/sim/w_x.c +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/sim/w_x.c 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/sim/w_x.c 2008-01-14 17:49:29.000000000 +0000 +@@ -1156,7 +1156,7 @@ + view->pixel_bytes = 4; + //view->pixel_bytes = 3; + view->depth = 24; +- bitmap_depth = 32; ++ bitmap_depth = 24; + bitmap_pad = 32; + view->line_bytes8 = + ((view->m_width * 4) + 3) & (~3); +Index: micropolis-activity-0.0.20071228/src/tcl/tclunix.h +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tcl/tclunix.h 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tcl/tclunix.h 2008-01-14 17:49:29.000000000 +0000 +@@ -101,7 +101,7 @@ + */ + + extern int errno; +-extern int sys_nerr; ++//extern int sys_nerr; + //#ifndef IS_LINUX + //extern char *sys_errlist[]; + //#endif +Index: micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/ossupp/makefile 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile 2008-01-14 17:54:38.000000000 +0000 +@@ -30,7 +30,7 @@ + all: made.tmp + + made.tmp: $(SUPPORT_OBJS) +- $(AR) cr ../libtcl.a $(SUPPORT_OBJS) ++ #$(AR) cr ../libtcl.a $(SUPPORT_OBJS) + touch made.tmp + + #------------------------------------------------------------------------------ +Index: micropolis-activity-0.0.20071228/src/tclx/src/tclxgdat.y +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/src/tclxgdat.y 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/src/tclxgdat.y 2008-01-14 17:49:29.000000000 +0000 +@@ -64,78 +64,78 @@ + timedate: /* empty */ + | timedate item; + +-item: tspec = ++item: tspec + {timeflag++;} +- | zone = ++ | zone + {zoneflag++;} +- | dtspec = ++ | dtspec + {dateflag++;} +- | dyspec = ++ | dyspec + {dayflag++;} +- | rspec = ++ | rspec + {relflag++;} + | nspec; + +-nspec: NUMBER = ++nspec: NUMBER + {if (timeflag && dateflag && !relflag) year = $1; + else {timeflag++;hh = $1/100;mm = $1%100;ss = 0;merid = 24;}}; + +-tspec: NUMBER MERIDIAN = ++tspec: NUMBER MERIDIAN + {hh = $1; mm = 0; ss = 0; merid = $2;} +- | NUMBER ':' NUMBER = ++ | NUMBER ':' NUMBER + {hh = $1; mm = $3; merid = 24;} +- | NUMBER ':' NUMBER MERIDIAN = ++ | NUMBER ':' NUMBER MERIDIAN + {hh = $1; mm = $3; merid = $4;} +- | NUMBER ':' NUMBER NUMBER = ++ | NUMBER ':' NUMBER NUMBER + {hh = $1; mm = $3; merid = 24; + dayLight = STANDARD; ourzone = -($4%100 + 60*$4/100);} +- | NUMBER ':' NUMBER ':' NUMBER = ++ | NUMBER ':' NUMBER ':' NUMBER + {hh = $1; mm = $3; ss = $5; merid = 24;} +- | NUMBER ':' NUMBER ':' NUMBER MERIDIAN = ++ | NUMBER ':' NUMBER ':' NUMBER MERIDIAN + {hh = $1; mm = $3; ss = $5; merid = $6;} +- | NUMBER ':' NUMBER ':' NUMBER NUMBER = ++ | NUMBER ':' NUMBER ':' NUMBER NUMBER + {hh = $1; mm = $3; ss = $5; merid = 24; + dayLight = STANDARD; ourzone = -($6%100 + 60*$6/100);}; + +-zone: ZONE = ++zone: ZONE + {ourzone = $1; dayLight = STANDARD;} +- | DAYZONE = ++ | DAYZONE + {ourzone = $1; dayLight = DAYLIGHT;}; + +-dyspec: DAY = ++dyspec: DAY + {dayord = 1; dayreq = $1;} +- | DAY ',' = ++ | DAY ',' + {dayord = 1; dayreq = $1;} +- | NUMBER DAY = ++ | NUMBER DAY + {dayord = $1; dayreq = $2;}; + +-dtspec: NUMBER '/' NUMBER = ++dtspec: NUMBER '/' NUMBER + {month = $1; day = $3;} +- | NUMBER '/' NUMBER '/' NUMBER = ++ | NUMBER '/' NUMBER '/' NUMBER + {month = $1; day = $3; year = $5;} +- | MONTH NUMBER = ++ | MONTH NUMBER + {month = $1; day = $2;} +- | MONTH NUMBER ',' NUMBER = ++ | MONTH NUMBER ',' NUMBER + {month = $1; day = $2; year = $4;} +- | NUMBER MONTH = ++ | NUMBER MONTH + {month = $2; day = $1;} +- | NUMBER MONTH NUMBER = ++ | NUMBER MONTH NUMBER + {month = $2; day = $1; year = $3;}; + + +-rspec: NUMBER UNIT = ++rspec: NUMBER UNIT + {relsec += 60L * $1 * $2;} +- | NUMBER MUNIT = ++ | NUMBER MUNIT + {relmonth += $1 * $2;} +- | NUMBER SUNIT = ++ | NUMBER SUNIT + {relsec += $1;} +- | UNIT = ++ | UNIT + {relsec += 60L * $1;} +- | MUNIT = ++ | MUNIT + {relmonth += $1;} +- | SUNIT = ++ | SUNIT + {relsec++;} +- | rspec AGO = ++ | rspec AGO + {relsec = -relsec; relmonth = -relmonth;}; + %% + +@@ -228,7 +228,7 @@ + + static char *lptr; + +-static ++//static + yylex() + { + #ifndef YYSTYPE +Index: micropolis-activity-0.0.20071228/src/tclx/src/tclxint.h +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/src/tclxint.h 2008-01-14 17:49:23.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/src/tclxint.h 2008-01-14 17:49:29.000000000 +0000 +@@ -67,7 +67,10 @@ + # include <sys/times.h> + #endif + +-#include <values.h> ++//#include "values.h" ++#include <limits.h> ++#include <float.h> ++#define MAXDOUBLE DBL_MAX + #include <grp.h> + /* + * On some systems this is not included by tclUnix.h. Added: packages/trunk/micropolis-activity/debian/patches/02_micropolis-path.patch =================================================================== --- packages/trunk/micropolis-activity/debian/patches/02_micropolis-path.patch (rev 0) +++ packages/trunk/micropolis-activity/debian/patches/02_micropolis-path.patch 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,17 @@ +# Copyright (C) 2008 by Kenshi Muto <[EMAIL PROTECTED]> +# Distributed under the same license as the game. See debian/copyright. + +Index: micropolis-activity-0.0.20071228/Micropolis +=================================================================== +--- micropolis-activity-0.0.20071228.orig/Micropolis 2008-01-14 17:05:57.000000000 +0000 ++++ micropolis-activity-0.0.20071228/Micropolis 2008-01-14 17:05:57.000000000 +0000 +@@ -1,7 +1,7 @@ + #!/bin/bash +-export SIMHOME=`pwd` ++export SIMHOME=/usr/share/games/micropolis + echo "Starting Micropolis in $SIMHOME ... " +-res/sim -w $* ++cd $SIMHOME && /usr/lib/games/micropolis/sim -w $* + + # + # Micropolis, Unix Version. This game was released for the Unix platform Added: packages/trunk/micropolis-activity/debian/patches/03_makefile.patch =================================================================== --- packages/trunk/micropolis-activity/debian/patches/03_makefile.patch (rev 0) +++ packages/trunk/micropolis-activity/debian/patches/03_makefile.patch 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,194 @@ +Index: micropolis-activity-0.0.20071228/src/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -60,6 +60,7 @@ + # NOT APPLY TO YOU. + + RES = ../res ++OPTFLAGS = -O2 -Wall -g + + TARFILES = \ + micropolis-activity/Micropolis \ +@@ -75,10 +76,10 @@ + micropolis-activity/Micropolis.png + + all: +- cd tcl ; make all +- cd tk ; make all +- cd tclx ; make all +- cd sim ; make all ++ cd tcl ; make OPTFLAGS="$(OPTFLAGS)" all ++ cd tk ; make OPTFLAGS="$(OPTFLAGS)" all ++ cd tclx ; make OPTFLAGS="$(OPTFLAGS)" all ++ cd sim ; make OPTFLAGS="$(OPTFLAGS)" all + + clean: + rm -f Micropolis.tgz +Index: micropolis-activity-0.0.20071228/src/tcl/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tcl/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tcl/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -24,10 +24,9 @@ + + TCL_LIBRARY = /usr/local/lib/tcl + +-CC = gcc +- +-CFLAGS = -O3 -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX +-#CFLAGS = -g -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX ++CC = gcc ++OPTFLAGS = -O3 ++CFLAGS = $(OPTFLAGS) -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -DIS_LINUX + + GENERIC_OBJS = \ + regexp.o \ +Index: micropolis-activity-0.0.20071228/src/tclx/config.mk +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/config.mk 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/config.mk 2008-01-14 18:01:50.000000000 +0000 +@@ -62,8 +62,7 @@ + + CC=gcc + +-OPTIMIZE_FLAG=-O3 -DIS_LINUX +-#OPTIMIZE_FLAG=-g -DIS_LINUX ++TARGET_FLAG=-DIS_LINUX + + #------------------------------------------------------------------------------ + # Stripping of the final tclshell binary. Specify `true' if the binary is to +Index: micropolis-activity-0.0.20071228/src/tclx/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -30,8 +30,9 @@ + MADE.FILES=ucbsrc/made.tmp ossupp/made.tmp src/made.tmp + TKMADE.FILES=tkucbsrc/made.tmp + +-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ +- $(SYS_DEP_FLAGS) ++OPTFLAGS= -O3 ++CFLAGS= $(OPTFLAGS) $(TARGET_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) \ ++ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) + + #------------------------------------------------------------------------------ + +@@ -45,10 +46,10 @@ + tcl: TCLX_MAKES + + TCLX_MAKES: libtcl.a +- cd ucbsrc; $(MAKE) -$(MAKEFLAGS) all +- cd ossupp; $(MAKE) -$(MAKEFLAGS) all +- cd tclsrc; $(MAKE) -$(MAKEFLAGS) all +- cd src; $(MAKE) -$(MAKEFLAGS) all ++ cd ucbsrc; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all ++ cd ossupp; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all ++ cd tclsrc; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all ++ cd src; $(MAKE) OPTFLAGS="$(OPTFLAGS)" -$(MAKEFLAGS) all + + + # Copy the UCB libtcl.a file from where it was built. Force the other +Index: micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/ossupp/makefile 2008-01-14 18:01:50.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -22,8 +22,9 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ +- $(SYS_DEP_FLAGS) $(SUPPORT_FLAGS) ++OPTFLAGS=-O3 ++CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) \ ++ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) $(SUPPORT_FLAGS) + + #------------------------------------------------------------------------------ + +Index: micropolis-activity-0.0.20071228/src/tclx/src/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/src/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/src/makefile 2008-01-14 18:03:40.000000000 +0000 +@@ -25,7 +25,8 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ ++OPTFLAGS= -O3 ++CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ + $(SYS_DEP_FLAGS) + + #------------------------------------------------------------------------------ +Index: micropolis-activity-0.0.20071228/src/tclx/tksrc/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/tksrc/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/tksrc/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -23,7 +23,8 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) ++OPTFLAGS= -O3 ++CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) + + #------------------------------------------------------------------------------ + +Index: micropolis-activity-0.0.20071228/src/tclx/tkucbsrc/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/tkucbsrc/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/tkucbsrc/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -23,7 +23,8 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \ ++OPTFLAGS= -O3 ++CFLAGS= $(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \ + -I../$(TCL_UCB_DIR) -I$(XHOME)/include \ + $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) \ + -DTK_VERSION=\"2.2/\" +Index: micropolis-activity-0.0.20071228/src/tclx/ucbsrc/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/ucbsrc/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/ucbsrc/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -24,8 +24,9 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ +- $(SYS_DEP_FLAGS) ++OPTFLAGS=-O3 ++CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) \ ++ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) + + #------------------------------------------------------------------------------ + +Index: micropolis-activity-0.0.20071228/src/tk/makefile +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tk/makefile 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tk/makefile 2008-01-14 18:01:50.000000000 +0000 +@@ -28,9 +28,8 @@ + # + + CC = gcc +- +-CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX +-#CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX ++OPTFLAGS = -O3 ++CFLAGS = $(OPTFLAGS) -I. -I$(XINCLUDE) -I$(TCL_DIR) -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX + + TCL_DIR = ../tcl + XINCLUDE = /usr/include/X11 +Index: micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile.dvx +=================================================================== +--- micropolis-activity-0.0.20071228.orig/src/tclx/ossupp/makefile.dvx 2008-01-14 18:01:48.000000000 +0000 ++++ micropolis-activity-0.0.20071228/src/tclx/ossupp/makefile.dvx 2008-01-14 18:01:50.000000000 +0000 +@@ -22,7 +22,8 @@ + + #------------------------------------------------------------------------------ + +-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ ++OPTFLAGS= -O3 ++CFLAGS=$(TARGET_FLAG) $(OPTFLAGS) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \ + -DTCL_HAS_TM_ZONE $(SUPPORT_FLAGS) + + #------------------------------------------------------------------------------ Added: packages/trunk/micropolis-activity/debian/patches/series =================================================================== --- packages/trunk/micropolis-activity/debian/patches/series (rev 0) +++ packages/trunk/micropolis-activity/debian/patches/series 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,3 @@ +01_mac-osx.patch +02_micropolis-path.patch +03_makefile.patch Added: packages/trunk/micropolis-activity/debian/rules =================================================================== --- packages/trunk/micropolis-activity/debian/rules (rev 0) +++ packages/trunk/micropolis-activity/debian/rules 2008-01-14 18:11:48 UTC (rev 5345) @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +OPTFLAGS= -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPTFLAGS += -O0 +else + OPTFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + $(MAKE) -f /usr/share/quilt/quilt.make patch + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) OPTFLAGS="$(OPTFLAGS)" -C src + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + $(MAKE) -C src clean + find res -name "*.wav" | while read a; do chmod -x $$a; done + $(MAKE) -f /usr/share/quilt/quilt.make unpatch + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -o root -g root -m 0755 src/sim/sim $(CURDIR)/debian/micropolis/usr/lib/games/micropolis + install -o root -g root -m 0755 Micropolis $(CURDIR)/debian/micropolis/usr/games/micropolis + install -o root -g root -m 0644 Micropolis.png $(CURDIR)/debian/micropolis-data/usr/share/pixmaps + tar cf - activity cities images manual res | tar xCf $(CURDIR)/debian/micropolis-data/usr/share/games/micropolis - + ln -s /usr/share/games/micropolis/manual $(CURDIR)/debian/micropolis-data/usr/share/doc/micropolis/manual + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install +# dh_installmenu +# dh_python +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure Property changes on: packages/trunk/micropolis-activity/debian/rules ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
