[SCM] deutex: composition tool for doom-style WAD files branch, master, updated. upstream/4.4.902-12-gf54c780

[Jon Dowland]

The following commit has been merged in the master branch:
commit 195cdb738dd3b40af953c16677e2ef7ceedf2c34
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Jul 20 12:16:32 2012 +0100

    Revert "bump standards version"
    
    This reverts commit e1d013017eebb38048fa382904b61edefc307b4c.
    
    The patch was too gratuitous.
    
    bump standards version

diff --git a/configure b/configure
index aef2088..c8642cb 100755
--- a/configure
+++ b/configure
@@ -466,7 +466,7 @@ echo "build directory is $BUILDDIR"
 #
 if expr "$PREFIX" : '//*usr/*$' >/dev/null
 then
-  BINDIR=/usr/games
+  BINDIR=/usr/bin		# FHS-ly correct is /usr/games
   ETCDIR=/etc/$APPNAME/%v
   ETCDIRNV=/etc/$APPNAME
   MANDIR=/usr/share/man
@@ -509,17 +509,17 @@ echo generating Makefile
   echo "# DO NOT EDIT -- generated by ./configure"
   echo
   echo "AWK               = $AWK"
-  echo "BINDIR            = \$(DESTDIR)/$BINDIR"
+  echo "BINDIR            = $BINDIR"
   echo "CC                = $CC"
   echo "CFLAGS            = $CFLAGS"
-  echo "ETCDIR            = \$(DESTDIR)/$ETCDIR" | sed "s/%v/$VERSION/g"
-  echo "ETCDIRNV          = \$(DESTDIR)/$ETCDIRNV"
+  echo "ETCDIR            = $ETCDIR" | sed "s/%v/$VERSION/g"
+  echo "ETCDIRNV          = $ETCDIRNV"
   echo "HAVE_INTTYPES     = $HAVE_INTTYPES"
   echo "HAVE_SNPRINTF     = $HAVE_SNPRINTF"
   echo "LDFLAGS           = $LDFLAGS"
-  echo "MANDIR            = \$(DESTDIR)/$MANDIR"
-  echo "SHAREDIR          = \$(DESTDIR)/$SHAREDIR" | sed "s/%v/$VERSION/g"
-  echo "SHAREDIRNV        = \$(DESTDIR)/$SHAREDIRNV"
+  echo "MANDIR            = $MANDIR"
+  echo "SHAREDIR          = $SHAREDIR" | sed "s/%v/$VERSION/g"
+  echo "SHAREDIRNV        = $SHAREDIRNV"
   echo
   cat Makefile.in
 ) >Makefile
diff --git a/deutex.6 b/deutex.6
index 7f95b36..9818dd3 100644
--- a/deutex.6
+++ b/deutex.6
@@ -3,8 +3,8 @@
 .\" DeuTex incorporates code derived from DEU 5.21 that was put in the
 .\" public domain in 1994 by Raphaël Quinet and Brendon Wyber.
 .\" 
-.\" DeuTex is Copyright \(co 1994-1995 Olivier Montanuy,
-.\"           Copyright \(co 1999-2005 Andr\o"\(aae" Majorel.
+.\" DeuTex is Copyright © 1994-1995 Olivier Montanuy,
+.\"           Copyright © 1999-2005 André Majorel.
 .\" 
 .\" This program is free software; you can redistribute it and/or modify it
 .\" under the terms of the GNU General Public License as published by the
@@ -533,7 +533,7 @@ overridden by \fB\-main\fP, \fB\-doom\fP and friends.
 .SH BUGS
 See \fBTODO\fP.
 .SH LEGAL
-DeuTex is copyright \(co 1994-1995 Olivier Montanuy, copyright \(co 1999-2005 Andr\o"\(aae"
+DeuTex is copyright © 1994-1995 Olivier Montanuy, copyright © 1999-2005 André
 Majorel.
 .PP
 Most of this program is GPL'd but some of it is available under other licenses.
@@ -551,7 +551,7 @@ Allansson <c91peral=und+ida+liu+se>, James Bonfield
 <mark.mathews=channel1+com> and Chuck Rossi.
 The original manual was written by Kevin McGrail <hevkev=sfo+com>.
 .PP
-As of version 4 (1999), the maintainer is Andr\o"\(aae" Majorel
+As of version 4 (1999), the maintainer is André Majorel
 <URL:http://www.teaser.fr/~amajorel/>.
 .PP
 Questions and bug reports should be sent to the current maintainer, \fInot\fP
diff --git a/src/deutex.c b/src/deutex.c
index 20d8a50..ddf6210 100644
--- a/src/deutex.c
+++ b/src/deutex.c
@@ -1118,17 +1118,6 @@ int main (int argc, char *argv_non_const[])
 	 }
        }
        if (! gotit)
-       {
-	 for (w = wads; *w != NULL; w++)
-	 {
-	   if (MakeFileName (MainWAD, "/usr/share/games/doom", "", "", *w, "wad") == TRUE)
-	   {
-	     gotit = 1;
-	     break;
-	   }
-	 }
-       }
-       if (! gotit)
 	  ProgError ("AA18",
 	      "Can't find any of doom.wad, doom2.wad, doompres.wad,"
 	      " heretic.wad, hexen.wad, strife1.wad");
diff --git a/src/log.c b/src/log.c
index bbf0fc8..795c03a 100644
--- a/src/log.c
+++ b/src/log.c
@@ -40,10 +40,10 @@ int lopen (void)
 {
   if (logfp == &nolog)
     return 1;
-  if (logfp == NULL || logfp == &nolog)
+  if (logfp == NULL)
   {
     logfp = fopen (logfile, "w");
-    if (logfp == NULL || logfp == &nolog)
+    if (logfp == NULL)
     {
       /* Can't use Warning(), we would loop. */
       fflush (stdout);
@@ -65,7 +65,7 @@ int lopen (void)
  */
 void lputc (char c)
 {
-  if (logfp == NULL || logfp == &nolog)
+  if (logfp == NULL)
     return;
   fputc (c, logfp);
   fflush (logfp);  /* We don't want a segfault to truncate the log */
@@ -77,7 +77,7 @@ void lputc (char c)
  */
 void lputs (const char *str)
 {
-  if (logfp == NULL || logfp == &nolog)
+  if (logfp == NULL)
     return;
   fputs (str, logfp);
   fflush (logfp);  /* We don't want a segfault to truncate the log */
@@ -91,7 +91,7 @@ void lprintf (const char *fmt, ...)
 {
   va_list list;
 
-  if (logfp == NULL || logfp == &nolog)
+  if (logfp == NULL)
     return;
   va_start (list, fmt);
   vlprintf (fmt, list);
@@ -104,7 +104,7 @@ void lprintf (const char *fmt, ...)
  */
 void vlprintf (const char *fmt, va_list list)
 {
-  if (logfp == NULL || logfp == &nolog)
+  if (logfp == NULL)
     return;
   vfprintf (logfp, fmt, list);
   fflush (logfp);  /* We don't want a segfault to truncate the log */

-- 
deutex: composition tool for doom-style WAD files