%n dpkg %v 1.4.0 %c * %l * %b * %d * %f * %t dpkg-1.4.0.tgz %w Misc %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N dpkg-1.4.0/Makefile.in dpkg-MCC/Makefile.in --- dpkg-1.4.0/Makefile.in Thu Sep 5 15:29:25 1996 +++ dpkg-MCC/Makefile.in Thu Sep 26 13:22:16 1996 @@ -58,8 +58,8 @@ CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) -LDFLAGS = $(XLDFLAGS) +LDFLAGS = @LDFLAGS@ ALL_CFLAGS = -I../include -I.. @DEFS@ $(CFLAGS) -SUBDIRS = lib main dpkg-deb split md5sum scripts doc include dselect methods +SUBDIRS = lib main dpkg-deb split md5sum scripts include dselect methods PORTABLEDIRS = lib dpkg-deb split md5sum diff -ru2N dpkg-1.4.0/configure dpkg-MCC/configure --- dpkg-1.4.0/configure Tue Aug 27 13:43:56 1996 +++ dpkg-MCC/configure Thu Sep 26 13:21:37 1996 @@ -1748,9 +1748,4 @@ -if test "${GCC-no}" = yes; then - CFLAGS=-O2; OPTCFLAGS=-O3 -else - CFLAGS=-O -fi @@ -2320,5 +2315,5 @@ trap 'rm -fr `echo "Makefile dpkg-deb/Makefile lib/Makefile include/Makefile dselect/Makefile split/Makefile methods/Makefile - md5sum/Makefile main/Makefile doc/Makefile scripts/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + md5sum/Makefile main/Makefile scripts/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff -ru2N dpkg-1.4.0/dpkg-deb/Makefile.in dpkg-MCC/dpkg-deb/Makefile.in --- dpkg-1.4.0/dpkg-deb/Makefile.in Wed Aug 21 23:54:23 1996 +++ dpkg-MCC/dpkg-deb/Makefile.in Thu Sep 26 13:20:23 1996 @@ -36,5 +36,5 @@ CC = @CC@ -CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) +CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) LDFLAGS = $(XLDFLAGS) LIBS = -L../lib -ldpkg $(XLIBS) diff -ru2N dpkg-1.4.0/dselect/Makefile.in dpkg-MCC/dselect/Makefile.in --- dpkg-1.4.0/dselect/Makefile.in Thu Apr 4 01:22:53 1996 +++ dpkg-MCC/dselect/Makefile.in Thu Sep 26 13:22:57 1996 @@ -48,5 +48,5 @@ CPLUSPLUS = @CXX@ -CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) +CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) OPTCFLAGS = @OPTCFLAGS@ LDFLAGS = $(XLDFLAGS) @@ -86,6 +86,6 @@ curkeys.inc: keyoverride mkcurkeys.pl perl mkcurkeys.pl keyoverride \ - `echo '#include ' | \ - $(CC) -E - | grep ncurses | head -1 | \ + `echo '#include ' | \ + $(CC) -E - | grep curses | head -1 | \ sed -e 's/^[^"]*"//; s/".*$$//'` > curkeys.inc.new mv curkeys.inc.new curkeys.inc diff -ru2N dpkg-1.4.0/dselect/basecmds.cc dpkg-MCC/dselect/basecmds.cc --- dpkg-1.4.0/dselect/basecmds.cc Tue May 21 23:29:02 1996 +++ dpkg-MCC/dselect/basecmds.cc Thu Sep 26 13:25:03 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/baselist.cc dpkg-MCC/dselect/baselist.cc --- dpkg-1.4.0/dselect/baselist.cc Tue May 21 23:29:02 1996 +++ dpkg-MCC/dselect/baselist.cc Thu Sep 26 13:25:08 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/basetop.cc dpkg-MCC/dselect/basetop.cc --- dpkg-1.4.0/dselect/basetop.cc Sun Jan 14 17:56:27 1996 +++ dpkg-MCC/dselect/basetop.cc Thu Sep 26 13:25:12 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/bindings.cc dpkg-MCC/dselect/bindings.cc --- dpkg-1.4.0/dselect/bindings.cc Tue May 21 23:45:32 1996 +++ dpkg-MCC/dselect/bindings.cc Thu Sep 26 13:25:16 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/curkeys.cc dpkg-MCC/dselect/curkeys.cc --- dpkg-1.4.0/dselect/curkeys.cc Thu Mar 14 01:25:18 1996 +++ dpkg-MCC/dselect/curkeys.cc Thu Sep 26 13:25:24 1996 @@ -21,5 +21,5 @@ extern "C" { -#include +#include #include "config.h" #include "dpkg.h" diff -ru2N dpkg-1.4.0/dselect/kt.c dpkg-MCC/dselect/kt.c --- dpkg-1.4.0/dselect/kt.c Sun Jan 14 17:56:28 1996 +++ dpkg-MCC/dselect/kt.c Thu Sep 26 13:25:37 1996 @@ -2,5 +2,5 @@ #include #include -#include +#include struct kd { int v; const char *n; } kds[]= { diff -ru2N dpkg-1.4.0/dselect/kt.cc dpkg-MCC/dselect/kt.cc --- dpkg-1.4.0/dselect/kt.cc Sun Jan 14 17:56:28 1996 +++ dpkg-MCC/dselect/kt.cc Thu Sep 26 13:25:44 1996 @@ -2,5 +2,5 @@ #include #include -#include +#include struct kd { int v; const char *n; } kds[]= { diff -ru2N dpkg-1.4.0/dselect/main.cc dpkg-MCC/dselect/main.cc --- dpkg-1.4.0/dselect/main.cc Mon Jul 1 14:42:38 1996 +++ dpkg-MCC/dselect/main.cc Thu Sep 26 13:44:52 1996 @@ -34,5 +34,5 @@ #include -#include +#include #include @@ -100,12 +100,12 @@ extern "C" { - static void helponly(const struct cmdinfo*, const char*) { + void helponly(const struct cmdinfo*, const char*) { usage(); exit(0); } - static void versiononly(const struct cmdinfo*, const char*) { + void versiononly(const struct cmdinfo*, const char*) { printversion(); exit(0); } - static void setdebug(const struct cmdinfo*, const char *v) { + void setdebug(const struct cmdinfo*, const char *v) { debug= fopen(v,"a"); if (!debug) ohshite("couldn't open debug file `%.255s'\n",v); diff -ru2N dpkg-1.4.0/dselect/methkeys.cc dpkg-MCC/dselect/methkeys.cc --- dpkg-1.4.0/dselect/methkeys.cc Tue May 28 02:14:36 1996 +++ dpkg-MCC/dselect/methkeys.cc Thu Sep 26 13:25:58 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/methlist.cc dpkg-MCC/dselect/methlist.cc --- dpkg-1.4.0/dselect/methlist.cc Mon Jun 10 02:50:59 1996 +++ dpkg-MCC/dselect/methlist.cc Thu Sep 26 13:26:02 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/method.cc dpkg-MCC/dselect/method.cc --- dpkg-1.4.0/dselect/method.cc Mon Jan 29 03:26:34 1996 +++ dpkg-MCC/dselect/method.cc Thu Sep 26 13:26:06 1996 @@ -37,5 +37,5 @@ #include -#include +#include extern "C" { diff -ru2N dpkg-1.4.0/dselect/methparse.cc dpkg-MCC/dselect/methparse.cc --- dpkg-1.4.0/dselect/methparse.cc Wed May 15 21:40:19 1996 +++ dpkg-MCC/dselect/methparse.cc Thu Sep 26 13:26:11 1996 @@ -34,5 +34,5 @@ #include -#include +#include extern "C" { File dpkg-1.4.0/dselect/p is a fifo while file dpkg-MCC/dselect/p is a fifo diff -ru2N dpkg-1.4.0/dselect/pkgcmds.cc dpkg-MCC/dselect/pkgcmds.cc --- dpkg-1.4.0/dselect/pkgcmds.cc Thu Aug 22 00:31:50 1996 +++ dpkg-MCC/dselect/pkgcmds.cc Thu Sep 26 13:26:21 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkgdepcon.cc dpkg-MCC/dselect/pkgdepcon.cc --- dpkg-1.4.0/dselect/pkgdepcon.cc Mon Jul 1 02:51:01 1996 +++ dpkg-MCC/dselect/pkgdepcon.cc Thu Sep 26 13:26:25 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include diff -ru2N dpkg-1.4.0/dselect/pkgdisplay.cc dpkg-MCC/dselect/pkgdisplay.cc --- dpkg-1.4.0/dselect/pkgdisplay.cc Mon Jul 1 02:38:39 1996 +++ dpkg-MCC/dselect/pkgdisplay.cc Thu Sep 26 13:26:28 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkginfo.cc dpkg-MCC/dselect/pkginfo.cc --- dpkg-1.4.0/dselect/pkginfo.cc Tue May 21 23:45:32 1996 +++ dpkg-MCC/dselect/pkginfo.cc Thu Sep 26 13:26:32 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkgkeys.cc dpkg-MCC/dselect/pkgkeys.cc --- dpkg-1.4.0/dselect/pkgkeys.cc Tue May 28 02:14:36 1996 +++ dpkg-MCC/dselect/pkgkeys.cc Thu Sep 26 13:26:36 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkglist.cc dpkg-MCC/dselect/pkglist.cc --- dpkg-1.4.0/dselect/pkglist.cc Mon Aug 26 14:10:43 1996 +++ dpkg-MCC/dselect/pkglist.cc Thu Sep 26 13:26:39 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkgsublist.cc dpkg-MCC/dselect/pkgsublist.cc --- dpkg-1.4.0/dselect/pkgsublist.cc Wed May 15 15:16:00 1996 +++ dpkg-MCC/dselect/pkgsublist.cc Thu Sep 26 13:26:43 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/dselect/pkgtop.cc dpkg-MCC/dselect/pkgtop.cc --- dpkg-1.4.0/dselect/pkgtop.cc Sat May 25 17:55:02 1996 +++ dpkg-MCC/dselect/pkgtop.cc Thu Sep 26 13:26:47 1996 @@ -22,5 +22,5 @@ #include #include -#include +#include #include #include diff -ru2N dpkg-1.4.0/lib/Makefile.in dpkg-MCC/lib/Makefile.in --- dpkg-1.4.0/lib/Makefile.in Thu Sep 5 15:29:46 1996 +++ dpkg-MCC/lib/Makefile.in Thu Sep 26 13:20:24 1996 @@ -35,5 +35,5 @@ CC = @CC@ -CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) -g # fixme: remove -g +CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) OPTCFLAGS = @OPTCFLAGS@ LDFLAGS = -s $(XLDFLAGS) diff -ru2N dpkg-1.4.0/main/Makefile.in dpkg-MCC/main/Makefile.in --- dpkg-1.4.0/main/Makefile.in Tue Aug 27 13:50:47 1996 +++ dpkg-MCC/main/Makefile.in Thu Sep 26 13:20:24 1996 @@ -39,5 +39,5 @@ CC = @CC@ -CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) +CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) OPTCFLAGS = @OPTCFLAGS@ LDFLAGS = $(XLDFLAGS) diff -ru2N dpkg-1.4.0/main/filesdb.c dpkg-MCC/main/filesdb.c --- dpkg-1.4.0/main/filesdb.c Wed Apr 10 15:01:15 1996 +++ dpkg-MCC/main/filesdb.c Thu Sep 26 13:20:24 1996 @@ -25,4 +25,5 @@ #include #include +#include #include "config.h" diff -ru2N dpkg-1.4.0/split/Makefile.in dpkg-MCC/split/Makefile.in --- dpkg-1.4.0/split/Makefile.in Thu Apr 4 01:22:51 1996 +++ dpkg-MCC/split/Makefile.in Thu Sep 26 13:20:24 1996 @@ -40,5 +40,5 @@ CC = @CC@ -CFLAGS = @CFLAGS@ @CWARNS@ -g $(XCFLAGS) +CFLAGS = @CFLAGS@ @CWARNS@ $(XCFLAGS) LDFLAGS = $(XLDFLAGS) LIBS = -L../lib -ldpkg $(XLIBS) ENDPATCH env CFLAGS='-O6 -fomit-frame-pointer' LDFLAGS='-Wl,-warn-common' \ INSTALL_PROGRAM='install -s -m 555' INSTALL_DATA='install -m 444' \ ./configure --with-newdeb --prefix=/tmp/Misc/Debian/usr make * rm -rf /tmp/Misc/Debian * make install datadir=/tmp/Misc/Debian/var/lib/dpkg %%