JoeyH's dpkg::preconfig not working.

Author: jgg
Date: 2001-03-05 21:09:12 GMT
JoeyH's dpkg::preconfig not working.

diff --git a/AUTHORS b/AUTHORS
index 05358e3dd126d5c70454aa746239d02bb527cd58..d8c341f9e3dac91ba2a74765d575528e3c13b1d9 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 The project hierachy stands at:
 
 CVS:jgg Jason Gunthorpe <jgg@debian.org>
-- Project leader
+- The Mad Cow incarnate
 
 CVS:che Ben Gertzfield <che@debian.org>
 - Packaging and Releases
@@ -9,6 +9,9 @@ CVS:che Ben Gertzfield <che@debian.org>
 CVS:bod Brendan O'Dea <bod@debian.org>
 - Perl Bindings
 
+CVS:tausq Randolph Chung <tausq@debian.org>
+- Patches, Fixes, Debugging, GUIs and Releases
+
 Past Contributures:
 
 Brian White <bcwhite@verisim.com> - Project originator

diff --git a/README.make b/README.make
index 7fd6ae5e8aff0355eecfe2c852dcdc9b2088a594..c043f10f6792b676cbc22a17196ab6f9bc5053e4 100644 (file)
--- a/README.make
+++ b/README.make
@@ -26,12 +26,12 @@ and configure substitutions across build makefiles is not used at all.
 
 Furthermore, the make system runs with a current directory equal to the
 source directory irregardless of the destination directory. This means
-#include "" and #include <> work as epected and more importantly
+#include "" and #include <> work as expected and more importantly
 running 'make' in the source directory will work as expected. The
-environment variable or make parameter 'BUILD' set the build directory.
+environment variable or make parameter 'BUILD' sets the build directory.
 It may be an absolute path or a path relative to the top level directory.
-By default build/ will be used with a fall back to ./ This means
-you can get all the advantages of a build directory without having to
+By default build-arch/ then build/ will be used with a fall back to ./ This 
+means you can get all the advantages of a build directory without having to
 cd into it to edit your source code!
 
 The make system also performs dependency generation on the fly as the
@@ -49,10 +49,8 @@ the source directory but is logically divided in the following manner
      examples/
    include/
      apt-pkg/
-     deity/
    obj/
      apt-pkg/
-     deity/
      cmndline/
      [...]
 Only .o and .d files are placed in the obj/ subdirectory. The final compiled

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 81521590a6fb4f9d29933d50366a87d21133e8f6..e15bc67ca1fce7998dafa7378957edbaa3d1e337 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: configuration.cc,v 1.17 2001/03/04 00:44:35 jgg Exp $
+// $Id: configuration.cc,v 1.18 2001/03/05 21:09:12 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -582,7 +582,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional,
                  Word = Tag;
                  Tag = "";
               }
-              NoWord = true;
+              else
+                 NoWord = true;
            }
            if (strlen(Pos) != 0)
               return _error->Error(_("Syntax error %s:%u: Extra junk after value"),FName.c_str(),CurLine);

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 35a3e71de25a4ae4079b43def29b39b4c8c41a13..37ee9f830d4a284e5b85970988159bb6d0354b87 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -82,7 +82,7 @@ YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
 SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
 
-include $(BUILD)/environment.mak
+include $(wildcard $(BUILD)/environment.*mak)
 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index 756565f40dca63d6041d2a1b7ca0b5e1702111d4..ec7cdd63a98bf17a35b0e6491b79af1e357ec3d2 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc:
 .PHONY: maintainer-clean dist-clean pristine sanity distclean
 maintainer-clean dist-clean pristine sanity distclean:
        -rm -rf $(DIRS)
-       -rm -f config.cache config.log config.status environment.mak makefile
+       -rm -f config.cache config.log config.status environment.*mak makefile
        
 # Create the required directories and build the shims
 # The configure script fills in below, and then we do the right things..

diff --git a/configure.in b/configure.in
index 95ff0176e94460e5ed6fac7fd781b09e4cc5d988..1c4857191669be6dfc2d5ed732ed27b882398cf1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,8 @@ dnl configure.in correctly and can be run at any time
 
 AC_INIT(configure.in)
 AC_CONFIG_AUX_DIR(buildlib)
-AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
+AC_CONFIG_HEADER(include/config.h:buildlib/core/config.h.in include/apti18n.h:buildlib/core/apti18n.h.in)
+CONFIG_STATUS=config.status.apt
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_DEFINE_UNQUOTED(VERSION,"0.5.1")
@@ -128,6 +129,7 @@ if test x"$c9x_ints" = x"no"; then
   
    HAVE_C9X=
    AC_SUBST(HAVE_C9X)
+   AC_OUTPUT_COMMANDS([echo Have c9x $HAVE_C9X],[HAVE_C9X=$HAVE_C9X])
 fi
 
 dnl HP-UX sux..
@@ -162,4 +164,4 @@ ah_NUM_PROCS
 ah_GLIBC_VER
 ah_LIBSTDCPP_VER
 
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/core/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)

diff --git a/debian/changelog b/debian/changelog
index f6470cdff36e89166a689e99f177801f95231ec0..ef9bf82683ee7732dba0dc7c2a9d7344f3234c44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.5.3) unstable; urgency=low
+
+  * JoeyH's dpkg::preconfig not working.
+  
+ -- Jason Gunthorpe <jgg@debian.org>  Sun,  4 Mar 2001 15:39:43 -0700
+
 apt (0.5.2) unstable; urgency=low
 
   * Fixed mention of /usr/doc in the long description