Syncing with the current Debian package.

2 files changed, 128 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index a998285..47ad0ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+gnumach (1:1.2-2) unstable; urgency=low
+
+  * Snapshot from CVS 19990907.
+  * Reenable all network interfaces, because the problem is fixed.
+  * Gzip gnumach binary.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Wed,  8 Sep 1999 00:15:39 +0200
+
+gnumach (1:1.2-1) unstable; urgency=low
+
+  * Snapshot from CVS 19990725.
+  * Start from official 1.2 release.
+  * Remove some network card drivers that seems to have no autodetection in
+    order to get a maximum set of cards enabled that allows GNU Mach to detect
+    at least one.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Mon, 26 Jul 1999 01:31:31 +0200
+
+gnumach (1:1.1.92-5) unstable; urgency=low
+
+  * Snapshot from CVS 19990616.
+  * Marks dummy network driver still there.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Thu, 17 Jun 1999 16:53:50 +0200
+
+gnumach (1:1.1.92-4) unstable; urgency=low
+
+  * Snapshot from CVS 19990602.
+  * Marks dummy network driver still there.
+  * Replaced linux/dev/drivers/block/genhd.c to avoid a bug.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Sat,  5 Jun 1999 00:59:43 +0200
+
+gnumach (1:1.1.92-2) unstable; urgency=low
+
+  * Snapshot from CVS 19990524.
+  * Applied Marks dummy network driver.
+  * Enabled thousands more devices.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Mon, 24 May 1999 18:00:19 +0200
+
+gnumach (1:1.1.92-1) unstable; urgency=low
+
+  * Snapshot from CVS 19990507.
+
+ -- Marcus Brinkmann <brinkmd@debian.org>  Fri,  7 May 1999 20:46:06 +0200
+
 gnumach (1:1.1.90-2) unstable; urgency=low
 
   * Fix package administration information to reflect that maintainership
diff --git a/debian/rules b/debian/rules
index a530806..938e8b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,24 +53,87 @@ configure: stamp-configure
 stamp-configure:
 	$(checkdir)
 	-mkdir build
+	# disabled:
+	# ncr5380, ncr53c400, ncr53c8xx, ncr53c406a
+	# hpj2577, hpj2573, hp27248b, hp2585, atp
 	cd build && ../configure \
-	--enable-com --enable-floppy --enable-ide --enable-lpr \
-	--enable-advansys --enable-buslogic --enable-u1434f --enable-ultrastor \
-	--enable-aha152x --enable-aha1542 --enable-aha1740 --enable-aic7xxx \
-	--enable-futuredomain --enable-in2000 \
-	--enable-ne2000 --enable-3c503 --enable-el2 \
-	--enable-3c509 --enable-el3 --enable-wd80x3 --enable-3c501 --enable-el1 \
-	--enable-ul --enable-hplanplus --enable-hplan --enable-3c59x --enable-vortex \
-	--enable-seeq8005 --enable-hp100 --enable-hpj2577 --enable-hpj2573 \
-	--enable-hp27248b --enable-hp2585 --enable-ac3200 --enable-e2100 \
-	--enable-at1700 --enable-eth16i --enable-eth32 --enable-znet --enable-znote \
-	--enable-eexpress --enable-eexpresspro --enable-depca --enable-de100 \
-	--enable-de101 --enable-de200 --enable-de201 --enable-de202 --enable-de210 \
-	--enable-de422 --enable-ewrk3 --enable-de203 --enable-de204 --enable-de205 \
-	--enable-de4x5 --enable-de425 --enable-de434 --enable-de500 --enable-apricot \
-	--enable-wavelan --enable-3c507 --enable-el16 --enable-3c505 --enable-elplus \
-	--enable-de600 --enable-de620 --enable-skg16 --enable-ni52 --enable-ni65 \
-	--enable-atp --enable-kmsg --build=$(BUILDARCH) --host=$(HOSTARCH)
+	--enable-com \
+	--enable-floppy \
+	--enable-ide \
+	--enable-lpr \
+	\
+	--enable-advansys \
+	--enable-buslogic \
+	--enable-u1434f \
+	--enable-ultrastor \
+	--enable-aha152x --enable-aha2825 \
+	--enable-aha1542 \
+	--enable-aha1740 \
+	--enable-aic7xxx \
+	--enable-futuredomain \
+	--enable-in2000 \
+	--enable-pas16 \
+	--enable-seagate \
+	--enable-t128 --enable-t128f --enable-t228 \
+	--enable-ncr53c7xx \
+	--enable-eatadma \
+	--enable-eatapio \
+	--enable-wd7000 \
+	--enable-eata \
+	--enable-am53c974 --enable-am79c974 \
+	--enable-dtc3280 --enable-dtc3180 \
+	--enable-dc390w --enable-dc390u --enable-dc390f \
+	--enable-dc390t --enable-dc390 \
+	--enable-ppa \
+	--enable-qlogicfas \
+	--enable-qlogicisp \
+	--enable-gdth \
+	\
+	--enable-de4x5 --enable-de425 --enable-de434 --enable-de435 --enable-de450 --enable-de500 \
+	--enable-eexpresspro100 \
+	--enable-epic100 \
+	--enable-hp100 \
+	--enable-ne2kpci \
+	--enable-pcnet32 \
+	--enable-rtl8139 --enable-rtl8129 \
+	--enable-viarhine \
+	--enable-elcp --enable-tulip \
+	--enable-yellowfin \
+	\
+	--enable-ac3200 \
+	--enable-ul32 \
+	\
+	--enable-at1700 \
+	--enable-ul \
+	--enable-epic \
+	--enable-wd80x3 \
+	--enable-3c503 --enable-el2 \
+	--enable-hplan --enable-hplanplus \
+	--enable-seeq8005 \
+	--enable-e2100 \
+	--enable-ne2000 --enable-ne1000 \
+	--enable-at1500 --enable-ne2100 \
+	--enable-fmv18x \
+	--enable-eth16i --enable-eth32 \
+	--enable-el3 --enable-3c509 --enable-3c579 \
+	--enable-vortex --enable-3c59x --enable-3c90x \
+	--enable-3c515 \
+	--enable-znet --enable-znote \
+	--enable-eexpress --enable-eexpresspro  \
+	--enable-depca --enable-de100 --enable-de101 --enable-de200 \
+	--enable-de201 --enable-de202 --enable-de210 --enable-de422 \
+	--enable-ewrk3 --enable-de203 --enable-de204 --enable-de205 \
+	--enable-apricot \
+	--enable-el1 --enable-3c501 \
+	--enable-wavelan \
+	--enable-el16 --enable-3c507 \
+	--enable-elplus --enable-3c505 \
+	--enable-de600 --enable-de620 \
+	--enable-skg16 \
+	--enable-ni52 --enable-ni65 \
+	--enable-lance \
+	--enable-tlan \
+	--enable-kmsg --build=$(BUILDARCH) --host=$(HOSTARCH)
 	touch stamp-configure
 
 all build: stamp-build
@@ -79,16 +142,9 @@ stamp-build: configure
 	cd build && $(MAKE)
 	touch stamp-build
 
-#--enable-ncr5380 --enable-ncr53c400 --enable-ncr53c406a  --enable-ncr53c7xx \
-#--enable-ncr53c8xx
-#--enable-qlogic --enable-pas16 --enable-seagate --enable-t128 \
-#--enable-eatadma --enable-eatapio --enable-wd7000 \
-#--enable-eata --enable-am53c974
-
 clean:
 	$(checkdir)
 	-rm -rf build
-	-mv BAR device-drivers.h
 	-rm -f  $(FILES_TO_CLEAN) $(STAMPS_TO_CLEAN)
 	-rm -rf $(DIRS_TO_CLEAN)
 	-rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
@@ -132,6 +188,7 @@ binary-arch: build
 
 	pfx=`cd debian/tmp && pwd` && cd build && $(MAKE) install-kernel prefix=$$pfx
 	strip --strip-all	debian/tmp/boot/gnumach
+	gzip -9fq		debian/tmp/boot/gnumach
 	-find debian/tmp -type d | xargs chmod g-w
 
 	$(install_file)		README debian/tmp$(DOCDIR)