[freedoom] 01/03: New upstream version 0.11.3
Jonathan Dowland
jmtd at moszumanska.debian.org
Wed Jul 26 15:53:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
jmtd pushed a commit to annotated tag debian/0.11.3-1
in repository freedoom.
commit 1e3d80deda5f9438d4977b3ff624561e0ae6ece4
Author: Jonathan Dowland <jmtd at debian.org>
Date: Tue Jul 25 22:44:54 2017 +0100
New upstream version 0.11.3
---
.gitattributes | 2 --
BUILD-SYSTEM.adoc | 5 -----
COMPILING.adoc | 18 +++++++-----------
Makefile | 2 +-
VERSION | 2 +-
musics/README | 25 +++++++++++--------------
musics/{d_bunny.mus => d_bunny.mid} | Bin
musics/{d_c1m1.mus => d_c1m1.mid} | Bin
musics/{d_c1m2.mus => d_c1m2.mid} | Bin
musics/{d_c1m3.mus => d_c1m3.mid} | Bin
musics/{d_c1m4.mus => d_c1m4.mid} | Bin
musics/{d_c1m5.mus => d_c1m5.mid} | Bin
musics/{d_c1m6.mus => d_c1m6.mid} | Bin
musics/{d_c1m7.mus => d_c1m7.mid} | Bin
musics/{d_c1m8.mus => d_c1m8.mid} | Bin
musics/{d_c1m9.mus => d_c1m9.mid} | Bin
musics/{d_c2m1.mus => d_c2m1.mid} | Bin
musics/{d_c2m2.mus => d_c2m2.mid} | Bin
musics/{d_c2m3.mus => d_c2m3.mid} | Bin
musics/{d_c2m4.mus => d_c2m4.mid} | Bin
musics/{d_c2m5.mus => d_c2m5.mid} | Bin
musics/{d_c2m6.mus => d_c2m6.mid} | Bin
musics/{d_c2m7.mus => d_c2m7.mid} | Bin
musics/{d_c2m8.mus => d_c2m8.mid} | Bin
musics/{d_c2m9.mus => d_c2m9.mid} | Bin
musics/{d_c3m1.mus => d_c3m1.mid} | Bin
musics/{d_c3m2.mus => d_c3m2.mid} | Bin
musics/{d_c3m3.mus => d_c3m3.mid} | Bin
musics/{d_c3m4.mus => d_c3m4.mid} | Bin
musics/{d_c3m5.mus => d_c3m5.mid} | Bin
musics/{d_c3m6.mus => d_c3m6.mid} | Bin
musics/{d_c3m7.mus => d_c3m7.mid} | Bin
musics/{d_c3m8.mus => d_c3m8.mid} | Bin
musics/{d_c3m9.mus => d_c3m9.mid} | Bin
musics/{d_dm01.mus => d_dm01.mid} | Bin
musics/{d_dm02.mus => d_dm02.mid} | Bin
musics/{d_dm03.mus => d_dm03.mid} | Bin
musics/{d_dm04.mus => d_dm04.mid} | Bin
musics/{d_dm05.mus => d_dm05.mid} | Bin
musics/{d_dm06.mus => d_dm06.mid} | Bin
musics/{d_dm07.mus => d_dm07.mid} | Bin
musics/{d_dm08.mus => d_dm08.mid} | Bin
musics/{d_dm09.mus => d_dm09.mid} | Bin
musics/{d_dm10.mus => d_dm10.mid} | Bin
musics/{d_dm11.mus => d_dm11.mid} | Bin
musics/{d_dm12.mus => d_dm12.mid} | Bin
musics/{d_dm13.mus => d_dm13.mid} | Bin
musics/{d_dm14.mus => d_dm14.mid} | Bin
musics/{d_dm15.mus => d_dm15.mid} | Bin
musics/{d_dm16.mus => d_dm16.mid} | Bin
musics/{d_dm17.mus => d_dm17.mid} | Bin
musics/{d_dm18.mus => d_dm18.mid} | Bin
musics/{d_dm19.mus => d_dm19.mid} | Bin
musics/{d_dm20.mus => d_dm20.mid} | Bin
musics/{d_dm21.mus => d_dm21.mid} | Bin
musics/{d_dm22.mus => d_dm22.mid} | Bin
musics/{d_dm23.mus => d_dm23.mid} | Bin
musics/{d_dm24.mus => d_dm24.mid} | Bin
musics/{d_dm25.mus => d_dm25.mid} | Bin
musics/{d_dm26.mus => d_dm26.mid} | Bin
musics/{d_dm27.mus => d_dm27.mid} | Bin
musics/{d_dm28.mus => d_dm28.mid} | Bin
musics/{d_dm29.mus => d_dm29.mid} | Bin
musics/{d_dm2int.mus => d_dm2int.mid} | Bin
musics/{d_dm2ttl.mus => d_dm2ttl.mid} | Bin
musics/{d_dm30.mus => d_dm30.mid} | Bin
musics/{d_dm31.mus => d_dm31.mid} | Bin
musics/{d_dm32.mus => d_dm32.mid} | Bin
musics/{d_inter.mus => d_inter.mid} | Bin
musics/{d_intro.mus => d_intro.mid} | Bin
musics/{d_introa.mus => d_introa.mid} | Bin
musics/{d_map01.mus => d_map01.mid} | Bin
musics/{d_map02.mus => d_map02.mid} | Bin
musics/{d_map03.mus => d_map03.mid} | Bin
musics/{d_map04.mus => d_map04.mid} | Bin
musics/{d_map05.mus => d_map05.mid} | Bin
musics/{d_map06.mus => d_map06.mid} | Bin
musics/{d_map07.mus => d_map07.mid} | Bin
musics/{d_map08.mus => d_map08.mid} | Bin
musics/{d_map09.mus => d_map09.mid} | Bin
musics/{d_map10.mus => d_map10.mid} | Bin
musics/{d_map11.mus => d_map11.mid} | Bin
musics/{d_map12.mus => d_map12.mid} | Bin
musics/{d_map13.mus => d_map13.mid} | Bin
musics/{d_map14.mus => d_map14.mid} | Bin
musics/{d_map15.mus => d_map15.mid} | Bin
musics/{d_map16.mus => d_map16.mid} | Bin
musics/{d_map17.mus => d_map17.mid} | Bin
musics/{d_map18.mus => d_map18.mid} | Bin
musics/{d_map19.mus => d_map19.mid} | Bin
musics/{d_map20.mus => d_map20.mid} | Bin
musics/{d_map21.mus => d_map21.mid} | Bin
musics/{d_map22.mus => d_map22.mid} | Bin
musics/{d_map23.mus => d_map23.mid} | Bin
musics/{d_map24.mus => d_map24.mid} | Bin
musics/{d_map25.mus => d_map25.mid} | Bin
musics/{d_map26.mus => d_map26.mid} | Bin
musics/{d_map27.mus => d_map27.mid} | Bin
musics/{d_map28.mus => d_map28.mid} | Bin
musics/{d_map29.mus => d_map29.mid} | Bin
musics/{d_map30.mus => d_map30.mid} | Bin
musics/{d_map31.mus => d_map31.mid} | Bin
musics/{d_map32.mus => d_map32.mid} | Bin
musics/{d_read_m.mus => d_read_m.mid} | Bin
musics/{d_victor.mus => d_victor.mid} | Bin
musics/{dummy.mus => dummy.mid} | Bin
scripts/music-duplicates.py | 4 ++--
scripts/wadinfo-builder.py | 2 +-
sprites/{vile$1.gif => vile[1.gif} | Bin
sprites/{vile$2.gif => vile[2.gif} | Bin
sprites/{vile$3.gif => vile[3.gif} | Bin
sprites/{vile$4.gif => vile[4.gif} | Bin
sprites/{vile$5.gif => vile[5.gif} | Bin
sprites/{vile$6.gif => vile[6.gif} | Bin
sprites/{vile$7.gif => vile[7.gif} | Bin
sprites/{vile$8.gif => vile[8.gif} | Bin
sprites/{vile#1.gif => vile]1.gif} | Bin
sprites/{vile#2.gif => vile]2.gif} | Bin
sprites/{vile#3.gif => vile]3.gif} | Bin
sprites/{vile#4.gif => vile]4.gif} | Bin
sprites/{vile#5.gif => vile]5.gif} | Bin
sprites/{vile#6.gif => vile]6.gif} | Bin
sprites/{vile#7.gif => vile]7.gif} | Bin
sprites/{vile#8.gif => vile]8.gif} | Bin
sprites/{vile at 1.gif => vile^1.gif} | Bin
sprites/{vile at 2.gif => vile^2.gif} | Bin
sprites/{vile at 3.gif => vile^3.gif} | Bin
sprites/{vile at 4.gif => vile^4.gif} | Bin
sprites/{vile at 5.gif => vile^5.gif} | Bin
sprites/{vile at 6.gif => vile^6.gif} | Bin
sprites/{vile at 7.gif => vile^7.gif} | Bin
sprites/{vile at 8.gif => vile^8.gif} | Bin
132 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index f8db65f..144bc4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,4 @@
*.gif -text
*.wad -text
*.wav -text
-*.mus -text
*.mid -text
-*.midi -text
diff --git a/BUILD-SYSTEM.adoc b/BUILD-SYSTEM.adoc
index 0769add..2d8c9da 100644
--- a/BUILD-SYSTEM.adoc
+++ b/BUILD-SYSTEM.adoc
@@ -262,11 +262,6 @@ around. Some of them are listed here.
“standard” background color of cyan is used instead by providing
the +-rgb 0 255 255+ command line parameter.
- * By default, deutex attempts to convert sound effects to 11,025Hz
- format. To keep the existing sample rate of sound effects, the
- following command line parameters are provided:
- +-v0 -fullsnd -rate accept+
-
* deutex does not allow the exact path to the +texture1.txt+ file to
be specified in the configuration file; this used to be a problem
but the Freedoom's texture lumps are now built using a custom
diff --git a/COMPILING.adoc b/COMPILING.adoc
index bf9297c..e0e5d60 100644
--- a/COMPILING.adoc
+++ b/COMPILING.adoc
@@ -26,20 +26,16 @@ Building the Freedoom IWADs pretty much simply requires the following:
* 'Python': Freedoom uses several Python programs in its tree to
assist with building the IWADs. Both Python 2.7 and 3.x are fully
supported.
- * 'DeuTex' 4.4.902: Freedoom depends on some features not present in
- the last official release, 4.4.0. Development of DeuTex,
- unfortunately, appears to have ceased and is presently abandoned.
- Debian includes 4.4.902 in its software repository, while Fedora
- has only 4.4.0. If your distribution does not provide 4.4.902, it
- is recommended to use Mike Swanson's unofficial
- https://github.com/Doom-Utils/deutex[repository], the master branch of
- which includes 4.4.902 and some additional patches.
+ * 'DeuTex' 5.0: Freedoom depends on features developed in this
+ version of DeuTex and will not build on earlier versions. It is
+ available at https://github.com/Doom-Utils/deutex in source,
+ Windows binary, and Ubuntu binary formats. As of July 2017, this
+ version is very recent and may not be widely available in other
+ distribution repositories yet.
All or most of this software should already be available in your
operating system's software repository, with the likely exception of
-DeuTex, which should be easy enough to build. Instructions on
-building DeuTex, or any other required program, is out of scope of
-this document.
+DeuTex, which is easy to build.
Building Freedoom
-----------------
diff --git a/Makefile b/Makefile
index 5479a05..17907e4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ VERSION=$(shell git describe --dirty 2>/dev/null || cat VERSION)
WADS=wads
CPP=scripts/simplecpp
DEUTEX=deutex
-DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255
+DEUTEX_BASIC_ARGS=-v0 -rate accept -rgb 0 255 255
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
FREEDOOM1=$(WADS)/freedoom1.wad
diff --git a/VERSION b/VERSION
index 4b8f7b0..8a2b962 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.11.2
+v0.11.3
diff --git a/musics/README b/musics/README
index 39f0abf..50168c9 100644
--- a/musics/README
+++ b/musics/README
@@ -1,21 +1,18 @@
-This directory contains the background music heard during play. The
-files are in General MIDI (.mid) format, but are renamed to .mus because
-of the limitations of the deutex tool.
+This directory contains the background music heard during play.
In general, most files are per-level music files:
- * d_eXmY.mus - Freedoom: Phase 1 music for cXmY.
- * d_mapXY.mus - Freedoom: Phase 2 music for mapXY.
- * d_dmXY.mus - FreeDM music for level XY.
+ * d_eXmY.mid - Freedoom: Phase 1 music for cXmY.
+ * d_mapXY.mid - Freedoom: Phase 2 music for mapXY.
+ * d_dmXY.mid - FreeDM music for level XY.
There are a few other MIDI files:
- * d_intro.mus / d_introa.mus - Freedoom: Phase 1 title music
- * d_inter.mus - Freedoom: Phase 1 intermission music
- * d_bunny.mus - Freedoom: Phase 1 Chapter 3 end music
- * d_victor.mus - Freedoom: Phase 1 victory screen music
-
- * d_dm2ttl.mus - Freedoom: Phase 2 / FreeDM title music
- * d_dm2int.mus - Freedoom: Phase 2 / FreeDM intermission music
- * d_read_m.mus - Freedoom: Phase 2 / FreeDM text screen music
+ * d_intro.mid / d_introa.mid - Freedoom: Phase 1 title music
+ * d_inter.mid - Freedoom: Phase 1 intermission music
+ * d_bunny.mid - Freedoom: Phase 1 Chapter 3 end music
+ * d_victor.mid - Freedoom: Phase 1 victory screen music
+ * d_dm2ttl.mid - Freedoom: Phase 2 / FreeDM title music
+ * d_dm2int.mid - Freedoom: Phase 2 / FreeDM intermission music
+ * d_read_m.mid - Freedoom: Phase 2 / FreeDM text screen music
diff --git a/musics/d_bunny.mus b/musics/d_bunny.mid
similarity index 100%
rename from musics/d_bunny.mus
rename to musics/d_bunny.mid
diff --git a/musics/d_c1m1.mus b/musics/d_c1m1.mid
similarity index 100%
rename from musics/d_c1m1.mus
rename to musics/d_c1m1.mid
diff --git a/musics/d_c1m2.mus b/musics/d_c1m2.mid
similarity index 100%
rename from musics/d_c1m2.mus
rename to musics/d_c1m2.mid
diff --git a/musics/d_c1m3.mus b/musics/d_c1m3.mid
similarity index 100%
rename from musics/d_c1m3.mus
rename to musics/d_c1m3.mid
diff --git a/musics/d_c1m4.mus b/musics/d_c1m4.mid
similarity index 100%
rename from musics/d_c1m4.mus
rename to musics/d_c1m4.mid
diff --git a/musics/d_c1m5.mus b/musics/d_c1m5.mid
similarity index 100%
rename from musics/d_c1m5.mus
rename to musics/d_c1m5.mid
diff --git a/musics/d_c1m6.mus b/musics/d_c1m6.mid
similarity index 100%
rename from musics/d_c1m6.mus
rename to musics/d_c1m6.mid
diff --git a/musics/d_c1m7.mus b/musics/d_c1m7.mid
similarity index 100%
rename from musics/d_c1m7.mus
rename to musics/d_c1m7.mid
diff --git a/musics/d_c1m8.mus b/musics/d_c1m8.mid
similarity index 100%
rename from musics/d_c1m8.mus
rename to musics/d_c1m8.mid
diff --git a/musics/d_c1m9.mus b/musics/d_c1m9.mid
similarity index 100%
rename from musics/d_c1m9.mus
rename to musics/d_c1m9.mid
diff --git a/musics/d_c2m1.mus b/musics/d_c2m1.mid
similarity index 100%
rename from musics/d_c2m1.mus
rename to musics/d_c2m1.mid
diff --git a/musics/d_c2m2.mus b/musics/d_c2m2.mid
similarity index 100%
rename from musics/d_c2m2.mus
rename to musics/d_c2m2.mid
diff --git a/musics/d_c2m3.mus b/musics/d_c2m3.mid
similarity index 100%
rename from musics/d_c2m3.mus
rename to musics/d_c2m3.mid
diff --git a/musics/d_c2m4.mus b/musics/d_c2m4.mid
similarity index 100%
rename from musics/d_c2m4.mus
rename to musics/d_c2m4.mid
diff --git a/musics/d_c2m5.mus b/musics/d_c2m5.mid
similarity index 100%
rename from musics/d_c2m5.mus
rename to musics/d_c2m5.mid
diff --git a/musics/d_c2m6.mus b/musics/d_c2m6.mid
similarity index 100%
rename from musics/d_c2m6.mus
rename to musics/d_c2m6.mid
diff --git a/musics/d_c2m7.mus b/musics/d_c2m7.mid
similarity index 100%
rename from musics/d_c2m7.mus
rename to musics/d_c2m7.mid
diff --git a/musics/d_c2m8.mus b/musics/d_c2m8.mid
similarity index 100%
rename from musics/d_c2m8.mus
rename to musics/d_c2m8.mid
diff --git a/musics/d_c2m9.mus b/musics/d_c2m9.mid
similarity index 100%
rename from musics/d_c2m9.mus
rename to musics/d_c2m9.mid
diff --git a/musics/d_c3m1.mus b/musics/d_c3m1.mid
similarity index 100%
rename from musics/d_c3m1.mus
rename to musics/d_c3m1.mid
diff --git a/musics/d_c3m2.mus b/musics/d_c3m2.mid
similarity index 100%
rename from musics/d_c3m2.mus
rename to musics/d_c3m2.mid
diff --git a/musics/d_c3m3.mus b/musics/d_c3m3.mid
similarity index 100%
rename from musics/d_c3m3.mus
rename to musics/d_c3m3.mid
diff --git a/musics/d_c3m4.mus b/musics/d_c3m4.mid
similarity index 100%
rename from musics/d_c3m4.mus
rename to musics/d_c3m4.mid
diff --git a/musics/d_c3m5.mus b/musics/d_c3m5.mid
similarity index 100%
rename from musics/d_c3m5.mus
rename to musics/d_c3m5.mid
diff --git a/musics/d_c3m6.mus b/musics/d_c3m6.mid
similarity index 100%
rename from musics/d_c3m6.mus
rename to musics/d_c3m6.mid
diff --git a/musics/d_c3m7.mus b/musics/d_c3m7.mid
similarity index 100%
rename from musics/d_c3m7.mus
rename to musics/d_c3m7.mid
diff --git a/musics/d_c3m8.mus b/musics/d_c3m8.mid
similarity index 100%
rename from musics/d_c3m8.mus
rename to musics/d_c3m8.mid
diff --git a/musics/d_c3m9.mus b/musics/d_c3m9.mid
similarity index 100%
rename from musics/d_c3m9.mus
rename to musics/d_c3m9.mid
diff --git a/musics/d_dm01.mus b/musics/d_dm01.mid
similarity index 100%
rename from musics/d_dm01.mus
rename to musics/d_dm01.mid
diff --git a/musics/d_dm02.mus b/musics/d_dm02.mid
similarity index 100%
rename from musics/d_dm02.mus
rename to musics/d_dm02.mid
diff --git a/musics/d_dm03.mus b/musics/d_dm03.mid
similarity index 100%
rename from musics/d_dm03.mus
rename to musics/d_dm03.mid
diff --git a/musics/d_dm04.mus b/musics/d_dm04.mid
similarity index 100%
rename from musics/d_dm04.mus
rename to musics/d_dm04.mid
diff --git a/musics/d_dm05.mus b/musics/d_dm05.mid
similarity index 100%
rename from musics/d_dm05.mus
rename to musics/d_dm05.mid
diff --git a/musics/d_dm06.mus b/musics/d_dm06.mid
similarity index 100%
rename from musics/d_dm06.mus
rename to musics/d_dm06.mid
diff --git a/musics/d_dm07.mus b/musics/d_dm07.mid
similarity index 100%
rename from musics/d_dm07.mus
rename to musics/d_dm07.mid
diff --git a/musics/d_dm08.mus b/musics/d_dm08.mid
similarity index 100%
rename from musics/d_dm08.mus
rename to musics/d_dm08.mid
diff --git a/musics/d_dm09.mus b/musics/d_dm09.mid
similarity index 100%
rename from musics/d_dm09.mus
rename to musics/d_dm09.mid
diff --git a/musics/d_dm10.mus b/musics/d_dm10.mid
similarity index 100%
rename from musics/d_dm10.mus
rename to musics/d_dm10.mid
diff --git a/musics/d_dm11.mus b/musics/d_dm11.mid
similarity index 100%
rename from musics/d_dm11.mus
rename to musics/d_dm11.mid
diff --git a/musics/d_dm12.mus b/musics/d_dm12.mid
similarity index 100%
rename from musics/d_dm12.mus
rename to musics/d_dm12.mid
diff --git a/musics/d_dm13.mus b/musics/d_dm13.mid
similarity index 100%
rename from musics/d_dm13.mus
rename to musics/d_dm13.mid
diff --git a/musics/d_dm14.mus b/musics/d_dm14.mid
similarity index 100%
rename from musics/d_dm14.mus
rename to musics/d_dm14.mid
diff --git a/musics/d_dm15.mus b/musics/d_dm15.mid
similarity index 100%
rename from musics/d_dm15.mus
rename to musics/d_dm15.mid
diff --git a/musics/d_dm16.mus b/musics/d_dm16.mid
similarity index 100%
rename from musics/d_dm16.mus
rename to musics/d_dm16.mid
diff --git a/musics/d_dm17.mus b/musics/d_dm17.mid
similarity index 100%
rename from musics/d_dm17.mus
rename to musics/d_dm17.mid
diff --git a/musics/d_dm18.mus b/musics/d_dm18.mid
similarity index 100%
rename from musics/d_dm18.mus
rename to musics/d_dm18.mid
diff --git a/musics/d_dm19.mus b/musics/d_dm19.mid
similarity index 100%
rename from musics/d_dm19.mus
rename to musics/d_dm19.mid
diff --git a/musics/d_dm20.mus b/musics/d_dm20.mid
similarity index 100%
rename from musics/d_dm20.mus
rename to musics/d_dm20.mid
diff --git a/musics/d_dm21.mus b/musics/d_dm21.mid
similarity index 100%
rename from musics/d_dm21.mus
rename to musics/d_dm21.mid
diff --git a/musics/d_dm22.mus b/musics/d_dm22.mid
similarity index 100%
rename from musics/d_dm22.mus
rename to musics/d_dm22.mid
diff --git a/musics/d_dm23.mus b/musics/d_dm23.mid
similarity index 100%
rename from musics/d_dm23.mus
rename to musics/d_dm23.mid
diff --git a/musics/d_dm24.mus b/musics/d_dm24.mid
similarity index 100%
rename from musics/d_dm24.mus
rename to musics/d_dm24.mid
diff --git a/musics/d_dm25.mus b/musics/d_dm25.mid
similarity index 100%
rename from musics/d_dm25.mus
rename to musics/d_dm25.mid
diff --git a/musics/d_dm26.mus b/musics/d_dm26.mid
similarity index 100%
rename from musics/d_dm26.mus
rename to musics/d_dm26.mid
diff --git a/musics/d_dm27.mus b/musics/d_dm27.mid
similarity index 100%
rename from musics/d_dm27.mus
rename to musics/d_dm27.mid
diff --git a/musics/d_dm28.mus b/musics/d_dm28.mid
similarity index 100%
rename from musics/d_dm28.mus
rename to musics/d_dm28.mid
diff --git a/musics/d_dm29.mus b/musics/d_dm29.mid
similarity index 100%
rename from musics/d_dm29.mus
rename to musics/d_dm29.mid
diff --git a/musics/d_dm2int.mus b/musics/d_dm2int.mid
similarity index 100%
rename from musics/d_dm2int.mus
rename to musics/d_dm2int.mid
diff --git a/musics/d_dm2ttl.mus b/musics/d_dm2ttl.mid
similarity index 100%
rename from musics/d_dm2ttl.mus
rename to musics/d_dm2ttl.mid
diff --git a/musics/d_dm30.mus b/musics/d_dm30.mid
similarity index 100%
rename from musics/d_dm30.mus
rename to musics/d_dm30.mid
diff --git a/musics/d_dm31.mus b/musics/d_dm31.mid
similarity index 100%
rename from musics/d_dm31.mus
rename to musics/d_dm31.mid
diff --git a/musics/d_dm32.mus b/musics/d_dm32.mid
similarity index 100%
rename from musics/d_dm32.mus
rename to musics/d_dm32.mid
diff --git a/musics/d_inter.mus b/musics/d_inter.mid
similarity index 100%
rename from musics/d_inter.mus
rename to musics/d_inter.mid
diff --git a/musics/d_intro.mus b/musics/d_intro.mid
similarity index 100%
rename from musics/d_intro.mus
rename to musics/d_intro.mid
diff --git a/musics/d_introa.mus b/musics/d_introa.mid
similarity index 100%
rename from musics/d_introa.mus
rename to musics/d_introa.mid
diff --git a/musics/d_map01.mus b/musics/d_map01.mid
similarity index 100%
rename from musics/d_map01.mus
rename to musics/d_map01.mid
diff --git a/musics/d_map02.mus b/musics/d_map02.mid
similarity index 100%
rename from musics/d_map02.mus
rename to musics/d_map02.mid
diff --git a/musics/d_map03.mus b/musics/d_map03.mid
similarity index 100%
rename from musics/d_map03.mus
rename to musics/d_map03.mid
diff --git a/musics/d_map04.mus b/musics/d_map04.mid
similarity index 100%
rename from musics/d_map04.mus
rename to musics/d_map04.mid
diff --git a/musics/d_map05.mus b/musics/d_map05.mid
similarity index 100%
rename from musics/d_map05.mus
rename to musics/d_map05.mid
diff --git a/musics/d_map06.mus b/musics/d_map06.mid
similarity index 100%
rename from musics/d_map06.mus
rename to musics/d_map06.mid
diff --git a/musics/d_map07.mus b/musics/d_map07.mid
similarity index 100%
rename from musics/d_map07.mus
rename to musics/d_map07.mid
diff --git a/musics/d_map08.mus b/musics/d_map08.mid
similarity index 100%
rename from musics/d_map08.mus
rename to musics/d_map08.mid
diff --git a/musics/d_map09.mus b/musics/d_map09.mid
similarity index 100%
rename from musics/d_map09.mus
rename to musics/d_map09.mid
diff --git a/musics/d_map10.mus b/musics/d_map10.mid
similarity index 100%
rename from musics/d_map10.mus
rename to musics/d_map10.mid
diff --git a/musics/d_map11.mus b/musics/d_map11.mid
similarity index 100%
rename from musics/d_map11.mus
rename to musics/d_map11.mid
diff --git a/musics/d_map12.mus b/musics/d_map12.mid
similarity index 100%
rename from musics/d_map12.mus
rename to musics/d_map12.mid
diff --git a/musics/d_map13.mus b/musics/d_map13.mid
similarity index 100%
rename from musics/d_map13.mus
rename to musics/d_map13.mid
diff --git a/musics/d_map14.mus b/musics/d_map14.mid
similarity index 100%
rename from musics/d_map14.mus
rename to musics/d_map14.mid
diff --git a/musics/d_map15.mus b/musics/d_map15.mid
similarity index 100%
rename from musics/d_map15.mus
rename to musics/d_map15.mid
diff --git a/musics/d_map16.mus b/musics/d_map16.mid
similarity index 100%
rename from musics/d_map16.mus
rename to musics/d_map16.mid
diff --git a/musics/d_map17.mus b/musics/d_map17.mid
similarity index 100%
rename from musics/d_map17.mus
rename to musics/d_map17.mid
diff --git a/musics/d_map18.mus b/musics/d_map18.mid
similarity index 100%
rename from musics/d_map18.mus
rename to musics/d_map18.mid
diff --git a/musics/d_map19.mus b/musics/d_map19.mid
similarity index 100%
rename from musics/d_map19.mus
rename to musics/d_map19.mid
diff --git a/musics/d_map20.mus b/musics/d_map20.mid
similarity index 100%
rename from musics/d_map20.mus
rename to musics/d_map20.mid
diff --git a/musics/d_map21.mus b/musics/d_map21.mid
similarity index 100%
rename from musics/d_map21.mus
rename to musics/d_map21.mid
diff --git a/musics/d_map22.mus b/musics/d_map22.mid
similarity index 100%
rename from musics/d_map22.mus
rename to musics/d_map22.mid
diff --git a/musics/d_map23.mus b/musics/d_map23.mid
similarity index 100%
rename from musics/d_map23.mus
rename to musics/d_map23.mid
diff --git a/musics/d_map24.mus b/musics/d_map24.mid
similarity index 100%
rename from musics/d_map24.mus
rename to musics/d_map24.mid
diff --git a/musics/d_map25.mus b/musics/d_map25.mid
similarity index 100%
rename from musics/d_map25.mus
rename to musics/d_map25.mid
diff --git a/musics/d_map26.mus b/musics/d_map26.mid
similarity index 100%
rename from musics/d_map26.mus
rename to musics/d_map26.mid
diff --git a/musics/d_map27.mus b/musics/d_map27.mid
similarity index 100%
rename from musics/d_map27.mus
rename to musics/d_map27.mid
diff --git a/musics/d_map28.mus b/musics/d_map28.mid
similarity index 100%
rename from musics/d_map28.mus
rename to musics/d_map28.mid
diff --git a/musics/d_map29.mus b/musics/d_map29.mid
similarity index 100%
rename from musics/d_map29.mus
rename to musics/d_map29.mid
diff --git a/musics/d_map30.mus b/musics/d_map30.mid
similarity index 100%
rename from musics/d_map30.mus
rename to musics/d_map30.mid
diff --git a/musics/d_map31.mus b/musics/d_map31.mid
similarity index 100%
rename from musics/d_map31.mus
rename to musics/d_map31.mid
diff --git a/musics/d_map32.mus b/musics/d_map32.mid
similarity index 100%
rename from musics/d_map32.mus
rename to musics/d_map32.mid
diff --git a/musics/d_read_m.mus b/musics/d_read_m.mid
similarity index 100%
rename from musics/d_read_m.mus
rename to musics/d_read_m.mid
diff --git a/musics/d_victor.mus b/musics/d_victor.mid
similarity index 100%
rename from musics/d_victor.mus
rename to musics/d_victor.mid
diff --git a/musics/dummy.mus b/musics/dummy.mid
similarity index 100%
rename from musics/dummy.mus
rename to musics/dummy.mid
diff --git a/scripts/music-duplicates.py b/scripts/music-duplicates.py
index 0c4c435..1e13e11 100755
--- a/scripts/music-duplicates.py
+++ b/scripts/music-duplicates.py
@@ -19,7 +19,7 @@ def get_music_tracks():
to a list of game tracks that use that MIDI."""
result = {}
musics_path = os.path.join(os.path.dirname(sys.argv[0]), '../musics')
- for mus in glob('%s/*.mus' % musics_path):
+ for mus in glob('%s/*.mid' % musics_path):
with open(mus) as f:
contents = f.read()
m = hashlib.sha1()
@@ -67,7 +67,7 @@ def print_report(title, tracks):
return
print(title)
for track in sorted(tracks):
- print('\t%s' % track.replace('.mus', '').upper())
+ print('\t%s' % track.replace('.mid', '').upper())
print('')
missing_tracks = set(find_missing_tracks(get_music_tracks()))
diff --git a/scripts/wadinfo-builder.py b/scripts/wadinfo-builder.py
index a603ae2..b00a062 100755
--- a/scripts/wadinfo-builder.py
+++ b/scripts/wadinfo-builder.py
@@ -91,7 +91,7 @@ def parse_assignment(section, line, match):
if override is not None:
filename = find_file(section, override.lower())
else:
- filename = find_file(section, resource.replace('[', '$').replace(']', '#').replace('\\', '@'))
+ filename = find_file(section, resource.replace('\\', '^'))
# File not found?
diff --git a/sprites/vile$1.gif b/sprites/vile[1.gif
similarity index 100%
rename from sprites/vile$1.gif
rename to sprites/vile[1.gif
diff --git a/sprites/vile$2.gif b/sprites/vile[2.gif
similarity index 100%
rename from sprites/vile$2.gif
rename to sprites/vile[2.gif
diff --git a/sprites/vile$3.gif b/sprites/vile[3.gif
similarity index 100%
rename from sprites/vile$3.gif
rename to sprites/vile[3.gif
diff --git a/sprites/vile$4.gif b/sprites/vile[4.gif
similarity index 100%
rename from sprites/vile$4.gif
rename to sprites/vile[4.gif
diff --git a/sprites/vile$5.gif b/sprites/vile[5.gif
similarity index 100%
rename from sprites/vile$5.gif
rename to sprites/vile[5.gif
diff --git a/sprites/vile$6.gif b/sprites/vile[6.gif
similarity index 100%
rename from sprites/vile$6.gif
rename to sprites/vile[6.gif
diff --git a/sprites/vile$7.gif b/sprites/vile[7.gif
similarity index 100%
rename from sprites/vile$7.gif
rename to sprites/vile[7.gif
diff --git a/sprites/vile$8.gif b/sprites/vile[8.gif
similarity index 100%
rename from sprites/vile$8.gif
rename to sprites/vile[8.gif
diff --git a/sprites/vile#1.gif b/sprites/vile]1.gif
similarity index 100%
rename from sprites/vile#1.gif
rename to sprites/vile]1.gif
diff --git a/sprites/vile#2.gif b/sprites/vile]2.gif
similarity index 100%
rename from sprites/vile#2.gif
rename to sprites/vile]2.gif
diff --git a/sprites/vile#3.gif b/sprites/vile]3.gif
similarity index 100%
rename from sprites/vile#3.gif
rename to sprites/vile]3.gif
diff --git a/sprites/vile#4.gif b/sprites/vile]4.gif
similarity index 100%
rename from sprites/vile#4.gif
rename to sprites/vile]4.gif
diff --git a/sprites/vile#5.gif b/sprites/vile]5.gif
similarity index 100%
rename from sprites/vile#5.gif
rename to sprites/vile]5.gif
diff --git a/sprites/vile#6.gif b/sprites/vile]6.gif
similarity index 100%
rename from sprites/vile#6.gif
rename to sprites/vile]6.gif
diff --git a/sprites/vile#7.gif b/sprites/vile]7.gif
similarity index 100%
rename from sprites/vile#7.gif
rename to sprites/vile]7.gif
diff --git a/sprites/vile#8.gif b/sprites/vile]8.gif
similarity index 100%
rename from sprites/vile#8.gif
rename to sprites/vile]8.gif
diff --git a/sprites/vile at 1.gif b/sprites/vile^1.gif
similarity index 100%
rename from sprites/vile at 1.gif
rename to sprites/vile^1.gif
diff --git a/sprites/vile at 2.gif b/sprites/vile^2.gif
similarity index 100%
rename from sprites/vile at 2.gif
rename to sprites/vile^2.gif
diff --git a/sprites/vile at 3.gif b/sprites/vile^3.gif
similarity index 100%
rename from sprites/vile at 3.gif
rename to sprites/vile^3.gif
diff --git a/sprites/vile at 4.gif b/sprites/vile^4.gif
similarity index 100%
rename from sprites/vile at 4.gif
rename to sprites/vile^4.gif
diff --git a/sprites/vile at 5.gif b/sprites/vile^5.gif
similarity index 100%
rename from sprites/vile at 5.gif
rename to sprites/vile^5.gif
diff --git a/sprites/vile at 6.gif b/sprites/vile^6.gif
similarity index 100%
rename from sprites/vile at 6.gif
rename to sprites/vile^6.gif
diff --git a/sprites/vile at 7.gif b/sprites/vile^7.gif
similarity index 100%
rename from sprites/vile at 7.gif
rename to sprites/vile^7.gif
diff --git a/sprites/vile at 8.gif b/sprites/vile^8.gif
similarity index 100%
rename from sprites/vile at 8.gif
rename to sprites/vile^8.gif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freedoom.git
More information about the Pkg-games-commits
mailing list