[micropolis-activity] 01/01: Imported Debian patch 0.0.20071228-8
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Oct 31 22:30:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository micropolis-activity.
commit dee5786fba843242c646c42ed08e4f85e1e930ed
Author: Markus Koschany <apo at debian.org>
Date: Sat Oct 31 22:53:41 2015 +0100
Imported Debian patch 0.0.20071228-8
---
debian/changelog | 18 ++-
debian/control | 6 +-
debian/copyright | 16 +-
debian/micropolis-data.links | 12 +-
debian/micropolis.6 | 16 +-
debian/patches/clang-FTBFS.patch | 50 +++++++
debian/patches/makefile.patch | 24 +--
debian/patches/micropolis-path.patch | 2 +-
debian/patches/series | 1 +
debian/patches/zerfleddert.20100109.patch | 240 +++++++++++++++---------------
debian/rules | 2 +-
11 files changed, 227 insertions(+), 160 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 84838be..506aae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,23 @@
+micropolis-activity (0.0.20071228-8) unstable; urgency=medium
+
+ * Team upload.
+ * Vcs-Browser: Switch to cgit and use https.
+ * Declare compliance with Debian Policy 3.9.6.
+ * Update copyright years.
+ * Add clang-FTBFS.patch.
+ Fix build failure when building with the clang compiler.
+ Thanks to Alexander Ovchinnikov for the report and patch. (Closes: #741766)
+ * micropolis-data: Switch from ttf-dejavu-core to fonts-dejavu-core.
+ Thanks to The Wanderer for the report. (Closes: #756883)
+ * Fix Lintian warnings dep5-copyright-license-name-not-unique and
+ space-in-std-shortname-in-dep5-copyright.
+
+ -- Markus Koschany <apo at debian.org> Sat, 31 Oct 2015 22:53:41 +0100
+
micropolis-activity (0.0.20071228-7) unstable; urgency=low
* Team upload.
- * Do not build in parallel to prevent a FTBFS on the build servers.
+ * Do not build in parallel to prevent a FTBFS on the build servers.
-- Markus Koschany <apo at gambaru.de> Sun, 27 Jan 2013 18:13:37 +0100
diff --git a/debian/control b/debian/control
index 20888cc..d4698d6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,10 @@ Build-Depends:
libxext-dev,
libxpm-dev,
x11proto-xext-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Homepage: http://www.donhopkins.com/home/micropolis/
Vcs-Git: git://anonscm.debian.org/pkg-games/micropolis-activity.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/micropolis-activity.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/micropolis-activity.git
Package: micropolis
Architecture: any
@@ -38,7 +38,7 @@ Description: real-time city management simulator
Package: micropolis-data
Architecture: all
-Depends: ttf-dejavu-core, ${misc:Depends}
+Depends: fonts-dejavu-core, ${misc:Depends}
Suggests: micropolis
Description: real-time city management simulator - data
This game simulates building and managing a whole city. The goal of the
diff --git a/debian/copyright b/debian/copyright
index 28a3ca6..e10f965 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,21 +27,21 @@ Comment:
Files: res/dejavu-lgc/*
Copyright: 2003, Bitstream Inc
-License: Bitstream Vera Fonts Copyright
+License: Bitstream-Vera-Fonts-Copyright
Files: debian/*
Copyright: 2008, Kenshi Muto <kmuto at debian.org>
2008, Clint Adams <schizo at debian.org>
- 2008, Miriam Ruiz <little_miry at yahoo.es>
- 2009, Bruno "Fuddl" Kleinert <fuddl at debian.org>
- 2009, 2010 Christoph Egger <debian at christoph-egger.org>
- 2013, Markus Koschany <apo at gambaru.de>
+ 2008, Miriam Ruiz <little_miry at yahoo.es>
+ 2009, Bruno "Fuddl" Kleinert <fuddl at debian.org>
+ 2009, 2010 Christoph Egger <debian at christoph-egger.org>
+ 2013-2015, Markus Koschany <apo at debian.org>
License: GPL-3+
Files: src/tcl/*
src/tk/*
Copyright: 1987-1992 Regents of the University of California
-License: MIT
+License: TCL-TK-License
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided that
the above copyright notice appear in all copies. The University of California
@@ -50,7 +50,7 @@ License: MIT
Files: src/tclx/*
Copyright: 1992, Karl Lehenbauer and Mark Diekhans
-License: MIT
+License: TCLX-License
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided that
the above copyright notice appear in all copies. Karl Lehenbauer and Mark
@@ -116,7 +116,7 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General
Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.
-License: Bitstream Vera Fonts Copyright
+License: Bitstream-Vera-Fonts-Copyright
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
.
diff --git a/debian/micropolis-data.links b/debian/micropolis-data.links
index 7e09502..9b8fdc0 100644
--- a/debian/micropolis-data.links
+++ b/debian/micropolis-data.links
@@ -1,7 +1,7 @@
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSans.ttf
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSerif.ttf
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSansMono.ttf
-/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSans-Bold.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSans.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSerif.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSansMono.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf /usr/share/games/micropolis/res/dejavu-lgc/DejaVuLGCSans-Bold.ttf
/usr/share/games/micropolis/manual /usr/share/doc/micropolis/manual
diff --git a/debian/micropolis.6 b/debian/micropolis.6
index 8939517..8a4d72b 100644
--- a/debian/micropolis.6
+++ b/debian/micropolis.6
@@ -3,7 +3,7 @@
Micropolis \- a real-time city management simulator
.SH SYNOPSIS
.B micropolis
-[\fIOPTION...\fR]
+[\fIOPTION...\fR]
.SH DESCRIPTION
.PP
This game simulates building and managing a whole city. The goal of Micropolis
@@ -18,24 +18,24 @@ order to enhance the city.
\fRcolormap mode: create own X11 colormap on 8 bit screens
.TP
\fB\-g
-.br
+.br
\fRgenerate random map and start playing
.TP
\fB\-l [number|name]
-.br
+.br
\fRchoose a level. Game levels include: 1: Easy, 2: Medium, 3: Hard
.TP
-\fB\-m
-.br
+\fB\-m
+.br
\fRmulti player mode: enable adding multiple players via X11
.TP
\fB\-s [number|name]
-.br
+.br
\fRchoose a scenario. Scenarios include: 1: Dullsville, 2: San_Francisco, 3:
Hamburg, 4: Bern, 5: Tokyo, 6: Detroit, 7: Boston, 8: Rio_de_Janeiro
.TP
\fB\-S
-.br
+.br
\fRSugar mode: enable OLPC Sugar user interface integration
.TP
\fB\-t
@@ -43,5 +43,5 @@ Hamburg, 4: Bern, 5: Tokyo, 6: Detroit, 7: Boston, 8: Rio_de_Janeiro
\fRtty mode: interactive TCL session on stdin/stdout
.TP
\fB\-w
-.br
+.br
\fRwire mode: use X11 networking without shared memory
diff --git a/debian/patches/clang-FTBFS.patch b/debian/patches/clang-FTBFS.patch
new file mode 100644
index 0000000..cba2920
--- /dev/null
+++ b/debian/patches/clang-FTBFS.patch
@@ -0,0 +1,50 @@
+From: Alexander Ovchinnikov <sanek23994 at gmail.com>
+Date: Sat, 31 Oct 2015 22:48:04 +0100
+Subject: clang FTBFS
+
+Fix build failure with clang compiler.
+
+Bug: https://bugs.debian.org/741766
+Forwarded: no
+---
+ src/tcl/tclenv.c | 4 ++--
+ src/tclx/src/tclxgdat.y | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tcl/tclenv.c b/src/tcl/tclenv.c
+index be330e1..e850891 100644
+--- a/src/tcl/tclenv.c
++++ b/src/tcl/tclenv.c
+@@ -58,7 +58,7 @@ static char * EnvTraceProc _ANSI_ARGS_((ClientData clientData,
+ static int FindVariable _ANSI_ARGS_((char *name, int *lengthPtr));
+
+ void setenv_tcl _ANSI_ARGS_((char *name, char *value));
+-int unsetenv_tcl _ANSI_ARGS_((char *name));
++void unsetenv_tcl _ANSI_ARGS_((char *name));
+
+
+ /*
+@@ -277,7 +277,7 @@ setenv_tcl(name, value)
+ *----------------------------------------------------------------------
+ */
+
+-int
++void
+ unsetenv_tcl(name)
+ char *name; /* Name of variable to remove. */
+ {
+diff --git a/src/tclx/src/tclxgdat.y b/src/tclx/src/tclxgdat.y
+index e29d7ea..93b1610 100644
+--- a/src/tclx/src/tclxgdat.y
++++ b/src/tclx/src/tclxgdat.y
+@@ -580,8 +580,8 @@ Tcl_GetDate (p, now, zone)
+ * Error message are not used, so discard with dummy function.
+ */
+
+-void
++int
+ yyerror(msg)
+- char *msg;
++ const char *msg;
+ {
+ }
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 58239e8..5fdb17f 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -3,18 +3,18 @@ Date: Sat, 26 Jan 2013 06:09:28 +0100
Subject: makefile
---
- src/makefile | 9 +++++----
- src/sim/makefile | 4 +++-
- src/tcl/makefile | 9 +++++----
- src/tclx/config.mk | 3 +--
- src/tclx/makefile | 15 +++++++++------
- src/tclx/ossupp/makefile | 5 +++--
- src/tclx/ossupp/makefile.dvx | 3 ++-
- src/tclx/src/makefile | 3 ++-
- src/tclx/tksrc/makefile | 3 ++-
- src/tclx/tkucbsrc/makefile | 5 ++++-
- src/tclx/ucbsrc/makefile | 5 +++--
- src/tk/makefile | 9 ++++-----
+ src/makefile | 9 +++++----
+ src/sim/makefile | 4 +++-
+ src/tcl/makefile | 9 +++++----
+ src/tclx/config.mk | 3 +--
+ src/tclx/makefile | 15 +++++++++------
+ src/tclx/ossupp/makefile | 5 +++--
+ src/tclx/ossupp/makefile.dvx | 3 ++-
+ src/tclx/src/makefile | 3 ++-
+ src/tclx/tksrc/makefile | 3 ++-
+ src/tclx/tkucbsrc/makefile | 5 ++++-
+ src/tclx/ucbsrc/makefile | 5 +++--
+ src/tk/makefile | 9 ++++-----
12 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/src/makefile b/src/makefile
diff --git a/debian/patches/micropolis-path.patch b/debian/patches/micropolis-path.patch
index aa7ccb0..3e93f63 100644
--- a/debian/patches/micropolis-path.patch
+++ b/debian/patches/micropolis-path.patch
@@ -3,7 +3,7 @@ Date: Sat, 26 Jan 2013 06:09:28 +0100
Subject: micropolis-path
---
- Micropolis | 4 ++--
+ Micropolis | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Micropolis b/Micropolis
diff --git a/debian/patches/series b/debian/patches/series
index 4b8ec9a..84a189b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
zerfleddert.20100109.patch
micropolis-path.patch
makefile.patch
+clang-FTBFS.patch
diff --git a/debian/patches/zerfleddert.20100109.patch b/debian/patches/zerfleddert.20100109.patch
index e95bc32..2828a90 100644
--- a/debian/patches/zerfleddert.20100109.patch
+++ b/debian/patches/zerfleddert.20100109.patch
@@ -81,126 +81,126 @@ Subject: zerfleddert.20100109
disable image translation until a case is found where ...
fix for main window not appearing on all window managers
---
- .gitignore | 19 +++
- Makefile | 124 +++++++++++++++++
- Micropolis.desktop | 12 ++
- res/micropolis.tcl | 99 +++++++------
- res/sounds/a.wav | Bin 4338 -> 4338 bytes
- res/sounds/aaah.wav | Bin 52380 -> 52380 bytes
- res/sounds/airport.wav | Bin 16696 -> 16696 bytes
- res/sounds/beep.wav | Bin 4856 -> 4856 bytes
- res/sounds/boing.wav | Bin 18908 -> 18908 bytes
- res/sounds/bop.wav | Bin 6548 -> 6548 bytes
- res/sounds/build.wav | Bin 18780 -> 18780 bytes
- res/sounds/bulldozer.wav | Bin 17188 -> 17188 bytes
- res/sounds/chalk.wav | Bin 15920 -> 15920 bytes
- res/sounds/coal.wav | Bin 35820 -> 35820 bytes
- res/sounds/com.wav | Bin 17082 -> 17082 bytes
- res/sounds/computer.wav | Bin 119604 -> 119604 bytes
- res/sounds/cuckoo.wav | Bin 35058 -> 35058 bytes
- res/sounds/e.wav | Bin 3946 -> 3946 bytes
- res/sounds/eraser.wav | Bin 26708 -> 26708 bytes
- res/sounds/explosion-hi.wav | Bin 12916 -> 12916 bytes
- res/sounds/explosion-high.wav | Bin 70924 -> 70924 bytes
- res/sounds/explosion-low.wav | Bin 226900 -> 226900 bytes
- res/sounds/fire.wav | Bin 29744 -> 29744 bytes
- res/sounds/heavytraffic.wav | Bin 91640 -> 91640 bytes
- res/sounds/honkhonk-hi.wav | Bin 5347 -> 5347 bytes
- res/sounds/honkhonk-high.wav | Bin 29200 -> 29200 bytes
- res/sounds/honkhonk-low.wav | Bin 41954 -> 41954 bytes
- res/sounds/honkhonk-med.wav | Bin 35334 -> 35334 bytes
- res/sounds/ignition.wav | Bin 134394 -> 134394 bytes
- res/sounds/ind.wav | Bin 21652 -> 21652 bytes
- res/sounds/monster.wav | Bin 32666 -> 32666 bytes
- res/sounds/nuclear.wav | Bin 38548 -> 38548 bytes
- res/sounds/o.wav | Bin 4338 -> 4338 bytes
- res/sounds/oop.wav | Bin 4988 -> 4988 bytes
- res/sounds/park.wav | Bin 17734 -> 17734 bytes
- res/sounds/player | 25 ++++
- res/sounds/police.wav | Bin 36662 -> 36662 bytes
- res/sounds/quack.wav | Bin 7818 -> 7818 bytes
- res/sounds/quackquack.wav | Bin 42820 -> 42820 bytes
- res/sounds/query.wav | Bin 16322 -> 16322 bytes
- res/sounds/rail.wav | Bin 14354 -> 14354 bytes
- res/sounds/res.wav | Bin 22418 -> 22418 bytes
- res/sounds/road.wav | Bin 12982 -> 12982 bytes
- res/sounds/rumble.wav | Bin 11906 -> 11906 bytes
- res/sounds/seaport.wav | Bin 22502 -> 22502 bytes
- res/sounds/siren.wav | Bin 103232 -> 103232 bytes
- res/sounds/skid.wav | Bin 31078 -> 31078 bytes
- res/sounds/sorry.wav | Bin 16696 -> 16696 bytes
- res/sounds/stadium.wav | Bin 28890 -> 28890 bytes
- res/sounds/uhuh.wav | Bin 16564 -> 16564 bytes
- res/sounds/whip.wav | Bin 76326 -> 76326 bytes
- res/sounds/wire.wav | Bin 16564 -> 16564 bytes
- res/sounds/woosh.wav | Bin 9150 -> 9150 bytes
- res/sounds/zone.wav | Bin 19288 -> 19288 bytes
- res/weditor.tcl | 8 +-
- res/whead.tcl | 77 ++++++----
- res/wmap.tcl | 8 +-
- res/wscen.tcl | 2 +-
- src/sim/g_ani.c | 1 +
- src/sim/g_bigmap.c | 16 ++-
- src/sim/g_cam.c | 48 ++++---
- src/sim/g_map.c | 159 +++++++++++----------
- src/sim/g_setup.c | 17 +--
- src/sim/g_smmaps.c | 117 +++++++++-------
- src/sim/headers/sim.h | 250 +++++++++++++++++++++++++++++++--
- src/sim/headers/view.h | 2 +
- src/sim/makefile | 24 +++-
- src/sim/rand.c | 5 +-
- src/sim/s_alloc.c | 2 +-
- src/sim/s_disast.c | 18 ++-
- src/sim/s_eval.c | 26 +++-
- src/sim/s_fileio.c | 63 ++++++---
- src/sim/s_gen.c | 45 +++++-
- src/sim/s_init.c | 11 +-
- src/sim/s_msg.c | 29 +++-
- src/sim/s_power.c | 8 +-
- src/sim/s_scan.c | 35 ++++-
- src/sim/s_sim.c | 67 +++++++--
- src/sim/s_traf.c | 24 +++-
- src/sim/s_zone.c | 61 +++++++-
- src/sim/sdl_helper | 46 ++++++
- src/sim/sim.c | 21 ++-
- src/sim/w_budget.c | 44 ++++--
- src/sim/w_con.c | 9 ++
- src/sim/w_date.c | 37 +++--
- src/sim/w_editor.c | 37 +++--
- src/sim/w_eval.c | 19 ++-
- src/sim/w_graph.c | 30 ++--
- src/sim/w_inter.c | 15 +-
- src/sim/w_keys.c | 5 +-
- src/sim/w_map.c | 30 +++-
- src/sim/w_piem.c | 38 +++--
- src/sim/w_resrc.c | 7 +-
- src/sim/w_sim.c | 83 ++++-------
- src/sim/w_sound.c | 310 +++++++++++++++++++++++++++++++++++------
- src/sim/w_sprite.c | 113 ++++++++++++---
- src/sim/w_stubs.c | 31 +++--
- src/sim/w_tk.c | 59 ++++----
- src/sim/w_tool.c | 56 +++++---
- src/sim/w_update.c | 35 +++--
- src/sim/w_util.c | 28 +++-
- src/sim/w_x.c | 85 +++++++----
- src/tcl/tclenv.c | 43 ++----
- src/tcl/tclunix.h | 2 +-
- src/tcl/tclunxst.c | 4 +-
- src/tclx/config.mk | 2 +-
- src/tclx/ossupp/makefile | 2 +-
- src/tclx/src/tclxgdat.y | 64 ++++-----
- src/tclx/src/tclxid.c | 2 +-
- src/tclx/src/tclxint.h | 5 +-
- src/tk/tkbind.c | 76 ++++++++--
- src/tk/tkcanvas.c | 2 +-
- src/tk/tkcolor.c | 79 +++++++----
- src/tk/tkgrab.c | 2 -
- src/tk/tkint.h | 9 ++
- src/tk/tkpixmap.c | 2 +-
- src/tk/tkscale.c | 2 +-
- src/tk/tkscrbar.c | 2 +-
- src/tk/tkwindow.c | 3 +
- src/tk/tkwm.c | 45 +++---
+ .gitignore | 19 +++
+ Makefile | 124 +++++++++++++++++
+ Micropolis.desktop | 12 ++
+ res/micropolis.tcl | 99 ++++++++------
+ res/sounds/a.wav | Bin
+ res/sounds/aaah.wav | Bin
+ res/sounds/airport.wav | Bin
+ res/sounds/beep.wav | Bin
+ res/sounds/boing.wav | Bin
+ res/sounds/bop.wav | Bin
+ res/sounds/build.wav | Bin
+ res/sounds/bulldozer.wav | Bin
+ res/sounds/chalk.wav | Bin
+ res/sounds/coal.wav | Bin
+ res/sounds/com.wav | Bin
+ res/sounds/computer.wav | Bin
+ res/sounds/cuckoo.wav | Bin
+ res/sounds/e.wav | Bin
+ res/sounds/eraser.wav | Bin
+ res/sounds/explosion-hi.wav | Bin
+ res/sounds/explosion-high.wav | Bin
+ res/sounds/explosion-low.wav | Bin
+ res/sounds/fire.wav | Bin
+ res/sounds/heavytraffic.wav | Bin
+ res/sounds/honkhonk-hi.wav | Bin
+ res/sounds/honkhonk-high.wav | Bin
+ res/sounds/honkhonk-low.wav | Bin
+ res/sounds/honkhonk-med.wav | Bin
+ res/sounds/ignition.wav | Bin
+ res/sounds/ind.wav | Bin
+ res/sounds/monster.wav | Bin
+ res/sounds/nuclear.wav | Bin
+ res/sounds/o.wav | Bin
+ res/sounds/oop.wav | Bin
+ res/sounds/park.wav | Bin
+ res/sounds/player | 25 ++++
+ res/sounds/police.wav | Bin
+ res/sounds/quack.wav | Bin
+ res/sounds/quackquack.wav | Bin
+ res/sounds/query.wav | Bin
+ res/sounds/rail.wav | Bin
+ res/sounds/res.wav | Bin
+ res/sounds/road.wav | Bin
+ res/sounds/rumble.wav | Bin
+ res/sounds/seaport.wav | Bin
+ res/sounds/siren.wav | Bin
+ res/sounds/skid.wav | Bin
+ res/sounds/sorry.wav | Bin
+ res/sounds/stadium.wav | Bin
+ res/sounds/uhuh.wav | Bin
+ res/sounds/whip.wav | Bin
+ res/sounds/wire.wav | Bin
+ res/sounds/woosh.wav | Bin
+ res/sounds/zone.wav | Bin
+ res/weditor.tcl | 8 +-
+ res/whead.tcl | 77 +++++++----
+ res/wmap.tcl | 8 +-
+ res/wscen.tcl | 2 +-
+ src/sim/g_ani.c | 1 +
+ src/sim/g_bigmap.c | 16 ++-
+ src/sim/g_cam.c | 48 ++++---
+ src/sim/g_map.c | 159 +++++++++++-----------
+ src/sim/g_setup.c | 17 +--
+ src/sim/g_smmaps.c | 117 +++++++++-------
+ src/sim/headers/sim.h | 250 ++++++++++++++++++++++++++++++++--
+ src/sim/headers/view.h | 2 +
+ src/sim/makefile | 24 +++-
+ src/sim/rand.c | 5 +-
+ src/sim/s_alloc.c | 2 +-
+ src/sim/s_disast.c | 18 ++-
+ src/sim/s_eval.c | 26 +++-
+ src/sim/s_fileio.c | 63 ++++++---
+ src/sim/s_gen.c | 45 +++++-
+ src/sim/s_init.c | 11 +-
+ src/sim/s_msg.c | 29 +++-
+ src/sim/s_power.c | 8 +-
+ src/sim/s_scan.c | 35 ++++-
+ src/sim/s_sim.c | 67 +++++++--
+ src/sim/s_traf.c | 24 +++-
+ src/sim/s_zone.c | 61 ++++++++-
+ src/sim/sdl_helper | 46 +++++++
+ src/sim/sim.c | 21 ++-
+ src/sim/w_budget.c | 44 ++++--
+ src/sim/w_con.c | 9 ++
+ src/sim/w_date.c | 37 +++--
+ src/sim/w_editor.c | 37 +++--
+ src/sim/w_eval.c | 19 ++-
+ src/sim/w_graph.c | 30 ++--
+ src/sim/w_inter.c | 15 +-
+ src/sim/w_keys.c | 5 +-
+ src/sim/w_map.c | 30 +++-
+ src/sim/w_piem.c | 38 +++---
+ src/sim/w_resrc.c | 7 +-
+ src/sim/w_sim.c | 83 ++++-------
+ src/sim/w_sound.c | 310 ++++++++++++++++++++++++++++++++++++------
+ src/sim/w_sprite.c | 113 ++++++++++++---
+ src/sim/w_stubs.c | 31 +++--
+ src/sim/w_tk.c | 59 ++++----
+ src/sim/w_tool.c | 56 +++++---
+ src/sim/w_update.c | 35 +++--
+ src/sim/w_util.c | 28 +++-
+ src/sim/w_x.c | 85 ++++++++----
+ src/tcl/tclenv.c | 43 ++----
+ src/tcl/tclunix.h | 2 +-
+ src/tcl/tclunxst.c | 4 +-
+ src/tclx/config.mk | 2 +-
+ src/tclx/ossupp/makefile | 2 +-
+ src/tclx/src/tclxgdat.y | 64 ++++-----
+ src/tclx/src/tclxid.c | 2 +-
+ src/tclx/src/tclxint.h | 5 +-
+ src/tk/tkbind.c | 76 +++++++++--
+ src/tk/tkcanvas.c | 2 +-
+ src/tk/tkcolor.c | 79 +++++++----
+ src/tk/tkgrab.c | 2 -
+ src/tk/tkint.h | 9 ++
+ src/tk/tkpixmap.c | 2 +-
+ src/tk/tkscale.c | 2 +-
+ src/tk/tkscrbar.c | 2 +-
+ src/tk/tkwindow.c | 3 +
+ src/tk/tkwm.c | 45 +++---
120 files changed, 2115 insertions(+), 771 deletions(-)
create mode 100644 .gitignore
create mode 100644 Makefile
diff --git a/debian/rules b/debian/rules
index 25e4e80..20775e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@
override_dh_install:
## change permissions of sound files
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/micropolis-activity.git
More information about the Pkg-games-commits
mailing list