Browse Source

JoeyH's dpkg::preconfig not working.

Author: jgg
Date: 2001-03-05 21:09:12 GMT
JoeyH's dpkg::preconfig not working.
debian/1.8.y
Arch Librarian 18 years ago
parent
commit
4ae405e914
  1. 5
      AUTHORS
  2. 10
      README.make
  3. 5
      apt-pkg/contrib/configuration.cc
  4. 2
      buildlib/defaults.mak
  5. 2
      buildlib/makefile.in
  6. 6
      configure.in
  7. 6
      debian/changelog

5
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

10
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

5
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);

2
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

2
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..

6
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)

6
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

Loading…
Cancel
Save