From 16dc726ccb49d94def51487486bf81958620e81d Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 16 Jun 2011 23:14:14 +0000 Subject: Add AM_SILENT_RULES macro for terser build output. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2350 --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index dbb48777..5768c2d3 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,7 @@ AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) dnl Automake v1.8.0 is required, please upgrade! AM_INIT_AUTOMAKE([1.8.0]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION.0 | sed 's/\./, /g' ` -- cgit v1.2.3 From 736082f2c07aec39311b8356e474f447c06abcd3 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 21 Jul 2011 14:21:57 +0000 Subject: Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub Lach). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2354 --- data/Makefile.am | 4 ++-- src/Makefile.am | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index dccb51a3..05951cb0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,8 +14,8 @@ icons_DATA = @PROGRAM_PREFIX@doom.png \ @PROGRAM_PREFIX@setup.png @PROGRAM_PREFIX@doom.png : doom.png - cp $^ $@ + cp $< $@ @PROGRAM_PREFIX@setup.png : setup.png - cp $^ $@ + cp $< $@ diff --git a/src/Makefile.am b/src/Makefile.am index 24c6e2b2..40be7787 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -187,26 +187,26 @@ appdir = $(prefix)/share/applications app_DATA = @PROGRAM_PREFIX@doom.desktop @PROGRAM_PREFIX@doom.desktop : doom.desktop - cp $^ $@ + cp $< $@ screensaverdir = $(prefix)/share/applications/screensavers screensaver_DATA = @PROGRAM_PREFIX@doom-screensaver.desktop @PROGRAM_PREFIX@doom-screensaver.desktop: doom-screensaver.desktop - cp $^ $@ + cp $< $@ .rc.o: - $(WINDRES) $^ -o $@ + $(WINDRES) $< -o $@ %.o : %.rc - $(WINDRES) $^ -o $@ + $(WINDRES) $< -o $@ if HAVE_PYTHON icon.c : ../data/doom8.ico - ../data/convert-icon $^ $@ + ../data/convert-icon $< $@ endif midiread : midifile.c - $(CC) -DTEST $(CFLAGS) @LDFLAGS@ $^ -o $@ + $(CC) -DTEST $(CFLAGS) @LDFLAGS@ $< -o $@ -- cgit v1.2.3 From 99a208bc6e29988813c04512183268570e9436a5 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 24 Jul 2011 20:55:27 +0000 Subject: Fix default mouse buttons in setup tool (Thanks Alexandre Xavier). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2355 --- setup/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/mouse.c b/setup/mouse.c index 16984721..7931e79e 100644 --- a/setup/mouse.c +++ b/setup/mouse.c @@ -38,8 +38,8 @@ int mouse_threshold = 10; int grabmouse = 1; int mousebfire = 0; -int mousebforward = 1; -int mousebstrafe = 2; +int mousebforward = 2; +int mousebstrafe = 1; int mousebstrafeleft = -1; int mousebstraferight = -1; int mousebbackward = -1; -- cgit v1.2.3 From aa621807015f56e451432fe1d9cdd05fcdeb92cf Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 20 Aug 2011 18:10:23 +0000 Subject: Fix gnome-screensaver .desktop file (thanks Rahul Sundaram). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2356 --- NEWS | 3 +++ src/doom-screensaver.desktop.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index e3194203..fe654dad 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ + + * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram). + 1.6.0 (2011-05-17): * The instructions in the INSTALL file are now customized for diff --git a/src/doom-screensaver.desktop.in b/src/doom-screensaver.desktop.in index 178575a2..315f964c 100644 --- a/src/doom-screensaver.desktop.in +++ b/src/doom-screensaver.desktop.in @@ -1,6 +1,5 @@ [Desktop Entry] -Encoding=UTF-8 Name=@PACKAGE_NAME@ Comment=@PACKAGE_SHORTDESC@ TryExec=@PROGRAM_PREFIX@doom @@ -8,5 +7,6 @@ Exec=@PROGRAM_PREFIX@doom StartupNotify=false Terminal=false Type=Application -Categories=Screensaver +OnlyShowIn=GNOME; +Categories=Screensaver; -- cgit v1.2.3 From fb9fb072def85312bfd4ad8670a31d0a85bfe37a Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 20 Aug 2011 18:20:43 +0000 Subject: Update COPYING to latest version of GPL2 with new address of FSF (thanks Rahul Sundaram). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2357 --- COPYING | 41 ++++++++++++++++++++--------------------- NEWS | 2 ++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index d60c31a9..d159169d 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. 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, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/NEWS b/NEWS index fe654dad..e2d95b7d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram). + * Updated COPYING to current version of GPL2 (thanks Rahul + Sundaram). 1.6.0 (2011-05-17): -- cgit v1.2.3 From 2e67fde263924a1f3f3b792dbd38bd58b7a3b948 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 22 Aug 2011 18:40:26 +0000 Subject: Add clarification note about icon copyright status (thanks to Chris Metcalf for clarification by email). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2358 --- data/README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/README b/data/README index 82fac17e..c3be61a6 100644 --- a/data/README +++ b/data/README @@ -3,6 +3,10 @@ The Chocolate Doom icon is based on an image by Chris Metcalf http://www.flickr.com/photos/laffy4k/448920776/ +Chris has kindly agreed that the Chocolate Doom icon may be used under +the GNU GPL, so the copyright status of the icon is the same as that of +the rest of the project. + The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files contain full 32-bit versions, scaled to different sizes and with proper alpha masks (as well as the 8-bit versions). The 8-bit versions are -- cgit v1.2.3 From 358db83778b46427fe267f86532d3a84d25a50ac Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 29 Aug 2011 20:37:26 +0000 Subject: Fix bug with detection of IWAD type by filename (thanks mether). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2359 --- NEWS | 1 + src/d_iwad.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index e2d95b7d..425da376 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ * Fixed gnome-screensaver desktop file (thanks Rahul Sundaram). * Updated COPYING to current version of GPL2 (thanks Rahul Sundaram). + * Fix bug with detection of IWAD type by filename (thanks mether). 1.6.0 (2011-05-17): diff --git a/src/d_iwad.c b/src/d_iwad.c index c0d33707..be5a3880 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -430,22 +430,24 @@ static char *SearchDirectoryForIWAD(char *dir) static void IdentifyIWADByName(char *name) { size_t i; + char *p; - gamemission = none; - - for (i=0; i