diff -ruN zlib-1.1.4-14/debian/changelog zlib-1.1.4-14lib64.1/debian/changelog
--- zlib-1.1.4-14/debian/changelog	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/changelog	2003-08-09 18:53:30.000000000 -0400
@@ -1,3 +1,9 @@
+zlib (1:1.1.4-14lib64.1) unstable; urgency=low
+
+  * applied lib64 patches.
+
+ -- Bart Trojanowski <bart@jukie.net>  Sat,  9 Aug 2003 18:52:46 -0400
+
 zlib (1:1.1.4-14) unstable; urgency=low
 
   * Remove the libc5 libraries from the control file.  Apparently the archive
diff -ruN zlib-1.1.4-14/debian/control zlib-1.1.4-14lib64.1/debian/control
--- zlib-1.1.4-14/debian/control	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/control	2003-08-10 15:46:48.000000000 -0400
@@ -45,3 +45,20 @@
  zlib is a library implementing the deflate compression method found
  in gzip and PKZIP.  This minimal package includes the shared library
  for use with the Debian installer.
+
+Package: lib64z1g
+Architecture: amd64 s390x sparc64
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: compression library - 64 bit runtime
+ zlib is a library implementing the deflate compression method found
+ in gzip and PKZIP.  This package includes support for 64 bit binaries.
+
+Package: lib64z1g-dev
+Architecture: amd64 s390x sparc64
+Priority: optional
+Depends: lib64z1g (= ${Source-Version}), zlib1g-dev (= ${Source-Version}), lib64c6-dev
+Description: compression library - 64 bit runtime
+ zlib is a library implementing the deflate compression method found
+ in gzip and PKZIP.  This package includes includes the development
+ support files for 64 bit binaries.
diff -ruN zlib-1.1.4-14/debian/lib64z1g-dev.dirs zlib-1.1.4-14lib64.1/debian/lib64z1g-dev.dirs
--- zlib-1.1.4-14/debian/lib64z1g-dev.dirs	1969-12-31 19:00:00.000000000 -0500
+++ zlib-1.1.4-14lib64.1/debian/lib64z1g-dev.dirs	2003-08-10 16:03:53.000000000 -0400
@@ -0,0 +1,2 @@
+./${libdir}
+usr/share/doc/lib64z1g-dev/examples
diff -ruN zlib-1.1.4-14/debian/lib64z1g.dirs zlib-1.1.4-14lib64.1/debian/lib64z1g.dirs
--- zlib-1.1.4-14/debian/lib64z1g.dirs	1969-12-31 19:00:00.000000000 -0500
+++ zlib-1.1.4-14lib64.1/debian/lib64z1g.dirs	2003-08-10 16:49:46.000000000 -0400
@@ -0,0 +1 @@
+./${libdir}
diff -ruN zlib-1.1.4-14/debian/rules zlib-1.1.4-14lib64.1/debian/rules
--- zlib-1.1.4-14/debian/rules	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/rules	2003-08-10 16:08:56.000000000 -0400
@@ -21,6 +21,16 @@
 DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE)
 DH_OPTIONS=
 
+libname=$(shell /usr/bin/dpkg-libinfo -qDEB_LIBNAME)
+libdir=$(shell /usr/bin/dpkg-libinfo -qDEB_LIBDIR)
+lib64_arch=$(shell /usr/bin/dpkg-libinfo -qDEB_LIB64_ARCH)
+
+ifeq ($(lib64_arch),1)
+zlib1g_pkg=lib64z1g
+else
+zlib1g_pkg=zlib1g
+endif
+
 COMPAT-ARCHS=
 ifneq (,$(findstring $(DEB_HOST_ARCH), $(COMPAT-ARCHS)))
 DOBUILDCOMPAT	:= $(STAMP_DIR)/build-libc5
@@ -43,6 +53,7 @@
 	dh_clean
 	rm -rf debian/libc5-tmp
 	rm -rf debian/nopic-tmp
+	rm -rf debian/zlib1g debian/lib64z1g
 
 $(STAMP_DIR)/source.make:
 	$(MAKE) -f debian/sys-build.mk source.make
@@ -50,7 +61,7 @@
 build: $(STAMP_DIR)/build
 $(STAMP_DIR)/build: $(STAMP_DIR)/source.make $(DOBUILDCOMPAT)
 	dh_testdir
-	cd $(BUILD_TREE) && ./configure --shared
+	cd $(BUILD_TREE) && ./configure --shared --libdir=\$${exec_prefix}/$(libname)
 	$(MAKE) -C $(BUILD_TREE) all libz.a test
 	$(MAKE) -C $(BUILD_TREE)/contrib/minizip
 	touch $@
@@ -58,12 +69,12 @@
 $(STAMP_DIR)/build-nopic: $(STAMP_DIR)/source.make
 	dh_testdir
 	mkdir -p debian/nopic-tmp
-	cd $(BUILD_TREE) && ./configure
+	cd $(BUILD_TREE) && ./configure --libdir=\$${exec_prefix}/$(libname)
 	$(MAKE) -C $(BUILD_TREE) clean
 	$(MAKE) -C $(BUILD_TREE) all libz.a
 	$(MAKE) -C $(BUILD_TREE) test
 	$(MAKE) -C $(BUILD_TREE) install prefix=$(CURDIR)/debian/nopic-tmp
-	install -m 644 $(BUILD_TREE)/libz.a debian/nopic-tmp/lib/libz.a
+	install -m 644 $(BUILD_TREE)/libz.a debian/nopic-tmp/$(libname)/libz.a
 	$(MAKE) -C $(BUILD_TREE) clean
 	touch $@
 
@@ -81,28 +92,31 @@
 
 binary-indep:
 
-binary-arch: binary-zlib1g-udeb binary-zlib1g binary-zlib1g-dev binary-zlib-bin $(DOBINARYCOMPAT)
+binary-arch: binary-zlib1g-udeb binary-$(zlib1g_pkg) binary-$(zlib1g_pkg)-dev binary-zlib-bin $(DOBINARYCOMPAT)
 
 pkg = $(patsubst binary-%,%,$@)
 
 middle-binary-zlib1: tmpdir = $(CURDIR)/debian/zlib1
 middle-binary-zlib1-altdev: tmpdir = $(CURDIR)/debian/zlib1-altdev
-middle-binary-zlib1g-dev: tmpdir = $(CURDIR)/debian/zlib1g-dev
+middle-binary-$(zlib1g_pkg)-dev: tmpdir = $(CURDIR)/debian/$(zlib1g_pkg)-dev
 middle-binary-zlib-bin: tmpdir = $(CURDIR)/debian/zlib-bin
+middle-binary-lib64z1g: tmpdir = $(CURDIR)/debian/$(zlib1g_pkg)
 middle-binary-zlib1g: tmpdir = $(CURDIR)/debian/tmp
 middle-binary-zlib1g-udeb: tmpdir = $(CURDIR)/debian/zlib1g-udeb
 #post-binary-zlib1: tmpdir = $(CURDIR)/debian/zlib1
 #post-binary-zlib1-altdev: tmpdir = $(CURDIR)/debian/zlib1-altdev
-post-binary-zlib1g-dev: tmpdir = $(CURDIR)/debian/zlib1g-dev
+post-binary-$(zlib1g_pkg)-dev: tmpdir = $(CURDIR)/debian/$(zlib1g_pkg)-dev
 post-binary-zlib-bin: tmpdir = $(CURDIR)/debian/zlib-bin
 #post-binary-zlib1g: tmpdir = $(CURDIR)/debian/tmp
 
-post-binary-zlib1g: changelog = $(BUILD_TREE)/ChangeLog
-post-binary-zlib1g: docs = $(BUILD_TREE)/README
+post-binary-$(zlib1g_pkg): changelog = $(BUILD_TREE)/ChangeLog
+post-binary-$(zlib1g_pkg): docs = $(BUILD_TREE)/README
+
+post-binary-$(zlib1g_pkg)-dev: docs = $(BUILD_TREE)/FAQ $(BUILD_TREE)/README $(BUILD_TREE)/algorithm.txt
+post-binary-$(zlib1g_pkg)-dev: examples = $(BUILD_TREE)/example.c $(BUILD_TREE)/minigzip.c
+post-binary-$(zlib1g_pkg)-dev: changelog = $(BUILD_TREE)/ChangeLog
 
-post-binary-zlib1g-dev: docs = $(BUILD_TREE)/FAQ $(BUILD_TREE)/README $(BUILD_TREE)/algorithm.txt
-post-binary-zlib1g-dev: examples = $(BUILD_TREE)/example.c $(BUILD_TREE)/minigzip.c
-post-binary-zlib1g-dev: changelog = $(BUILD_TREE)/ChangeLog
+# manpage goes only into the 32bit deb
 post-binary-zlib1g-dev: manpages3 = $(BUILD_TREE)/zlib.3
 
 post-binary-zlib-bin: docs = $(BUILD_TREE)/contrib/minizip/readme.txt
@@ -112,8 +126,8 @@
 post-binary-zlib1: docs = $(BUILD_TREE)/README
 post-binary-zlib1: changelog = $(BUILD_TREE)/ChangeLog
 
-allpkgs = zlib1 zlib1-altdev zlib1g-dev zlib1g zlib-bin
-$(patsubst %,binary-%,$(allpkgs)): DH_OPTIONS += -p $(pkg)
+allpkgs = zlib1 zlib1-altdev $(zlib1g_pkg)-dev $(zlib1g_pkg) zlib-bin
+$(patsubst %,binary-%,$(allpkgs)): DH_OPTIONS += -p$(pkg)
 
 $(patsubst %,binary-%,$(allpkgs)): binary-%: pre-binary-%
 $(patsubst %,binary-%,$(allpkgs)): binary-%: middle-binary-%
@@ -168,20 +182,27 @@
 	dpkg-distaddfile $(UFILENAME) debian-installer optional
 	dh_builddeb $(DH_OPTIONS) --filename=$(UFILENAME)
 
-middle-binary-zlib1g: $(STAMP_DIR)/build
-	install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION) $(tmpdir)/usr/lib/libz.so.$(VERSION)
-	ln -s libz.so.$(VERSION) $(tmpdir)/usr/lib/libz.so.$(SONAME)
+middle-binary-${zlib1g_pkg}: $(STAMP_DIR)/build
+	install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION) $(tmpdir)/${libdir}/libz.so.$(VERSION)
+	ln -s libz.so.$(VERSION) $(tmpdir)/${libdir}/libz.so.$(SONAME)
 
 middle-binary-zlib1g-udeb: $(STAMP_DIR)/build
-	install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION) $(tmpdir)/usr/lib/libz.so.$(VERSION)
-	ln -s libz.so.$(VERSION) $(tmpdir)/usr/lib/libz.so.$(SONAME)
+	install -m 644 -s $(BUILD_TREE)/libz.so.$(VERSION) $(tmpdir)/${libdir}/libz.so.$(VERSION)
+	ln -s libz.so.$(VERSION) $(tmpdir)/${libdir}/libz.so.$(SONAME)
 
+# NOTE: the 32bit deb will contain the include files + manpage
 middle-binary-zlib1g-dev: $(STAMP_DIR)/build-nopic
-	install -m 644 debian/nopic-tmp/lib/libz.a \
-		$(tmpdir)/usr/lib/libz.a
-	ln -s libz.so.1 $(tmpdir)/usr/lib/libz.so
+	install -m 644 debian/nopic-tmp/${libname}/libz.a \
+		$(tmpdir)/${libdir}/libz.a
+	ln -s libz.so.1 $(tmpdir)/${libdir}/libz.so
 	install -m 644 $(BUILD_TREE)/zlib.h $(BUILD_TREE)/zconf.h $(tmpdir)/usr/include/
-	tar cf $(tmpdir)/usr/share/doc/zlib1g-dev/examples/contrib.tar --force-local -C $(BUILD_TREE)/contrib .
+	tar cf $(tmpdir)/usr/share/doc/$(zlib1g_pkg)-dev/examples/contrib.tar --force-local -C $(BUILD_TREE)/contrib .
+
+# NOTE: the 64bit deb depends on the include + manpage from the 32bit deb
+middle-binary-lib64z1g-dev: $(STAMP_DIR)/build-nopic
+	install -m 644 debian/nopic-tmp/${libname}/libz.a \
+		$(tmpdir)/${libdir}/libz.a
+	ln -s libz.so.1 $(tmpdir)/${libdir}/libz.so
 
 middle-binary-zlib-bin: $(STAMP_DIR)/build
 	install -m 755 $(BUILD_TREE)/contrib/minizip/minizip $(tmpdir)/usr/bin/
diff -ruN zlib-1.1.4-14/debian/zlib1g-dev.dirs zlib-1.1.4-14lib64.1/debian/zlib1g-dev.dirs
--- zlib-1.1.4-14/debian/zlib1g-dev.dirs	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/zlib1g-dev.dirs	2003-08-10 16:49:49.000000000 -0400
@@ -1,4 +1,4 @@
-usr/lib
+./${libdir}
 usr/include
 usr/share/doc/zlib1g-dev/examples
 usr/share/man/man3
diff -ruN zlib-1.1.4-14/debian/zlib1g.dirs zlib-1.1.4-14lib64.1/debian/zlib1g.dirs
--- zlib-1.1.4-14/debian/zlib1g.dirs	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/zlib1g.dirs	2003-08-09 19:42:58.000000000 -0400
@@ -1 +1 @@
-usr/lib
+./${libdir}
diff -ruN zlib-1.1.4-14/debian/zlib1g-udeb.dirs zlib-1.1.4-14lib64.1/debian/zlib1g-udeb.dirs
--- zlib-1.1.4-14/debian/zlib1g-udeb.dirs	2003-08-09 17:29:29.000000000 -0400
+++ zlib-1.1.4-14lib64.1/debian/zlib1g-udeb.dirs	2003-08-09 19:42:33.000000000 -0400
@@ -1 +1 @@
-/usr/lib
+/${libdir}
