Ok, here's an updated patch with fixed Build-Depends and install
target.

 `dpkg-buildpackage -B' works without mingw32
 `dpkg-buildpackage -b' can be built only when mingw32 is installed.

You also need the upstream patch I sent before.

Thanks!

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
diff -Nur gzip-1.3.12/debian/control gzip-1.3.12.new/debian/control
--- gzip-1.3.12/debian/control	2007-12-28 14:40:32.000000000 +0100
+++ gzip-1.3.12.new/debian/control	2007-12-28 14:42:56.000000000 +0100
@@ -3,6 +3,7 @@
 Priority: required
 Maintainer: Bdale Garbee <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), texinfo
+Build-Depends-Indep: mingw32
 Standards-Version: 3.7.3
 XS-DM-Upload-Allowed: yes
 
@@ -19,3 +20,10 @@
  .
  This package can also decompress '.Z' files created with 'compress'.
 
+Package: gzip-win32
+Architecture: all
+Priority: extra
+Suggests: wine
+Description: The GNU compression utility (win32 build)
+ This is a win32 version of gzip.  It's meant to be used by the win32-loader
+ component of Debian-Installer.
diff -Nur gzip-1.3.12/debian/gzip-win32.dirs gzip-1.3.12.new/debian/gzip-win32.dirs
--- gzip-1.3.12/debian/gzip-win32.dirs	1970-01-01 01:00:00.000000000 +0100
+++ gzip-1.3.12.new/debian/gzip-win32.dirs	2007-12-28 14:42:44.000000000 +0100
@@ -0,0 +1 @@
+usr/share/win32
diff -Nur gzip-1.3.12/debian/rules gzip-1.3.12.new/debian/rules
--- gzip-1.3.12/debian/rules	2007-12-28 14:40:32.000000000 +0100
+++ gzip-1.3.12.new/debian/rules	2007-12-28 16:08:21.000000000 +0100
@@ -21,23 +21,37 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	CFLAGS=$(CFLAGS) ./configure \
+	mkdir -p build
+	cd build && CFLAGS=$(CFLAGS) ../configure \
 		--prefix=/usr --bindir=/bin \
 		--infodir=`pwd`/debian/gzip/usr/share/info \
 		--mandir=`pwd`/debian/gzip/usr/share/man $(CONFARGS)
 	touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
+configure-win32: configure-win32-stamp
+configure-win32-stamp:
 	dh_testdir
-	$(MAKE)
+	mkdir -p build-win32
+	cd build-win32 && ../configure --host=i586-mingw32msvc
+	touch configure-win32-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -C build
 	touch build-stamp
 
+build-win32: build-win32-stamp
+build-win32-stamp: configure-win32-stamp
+	dh_testdir
+	$(MAKE) -C build-win32
+	touch build-win32-stamp
+
 clean:
 	dh_testdir
 	dh_testroot
-	-rm -f build-stamp configure-stamp
-	make distclean || exit 0
+	-rm -f build-stamp build-win32-stamp configure-stamp configure-win32-stamp
+	-rm -rf build build-win32
 	dh_clean
 
 install: build
@@ -46,33 +60,51 @@
 	dh_clean -k
 	dh_installdirs
 
-	make install prefix=debian/gzip/usr bindir=debian/gzip/bin 
+	$(MAKE) -C build install prefix=`pwd`/debian/gzip/usr bindir=`pwd`/debian/gzip/bin 
 	install -o root -g root -m 0644 debian/gzip.lintian \
 		debian/gzip/usr/share/lintian/overrides/gzip
 
-binary-indep:	build install
-
-binary-arch:	build install
+install-win32: build-win32
 	dh_testdir
 	dh_testroot
-	dh_installdocs README* TODO
-	dh_installmanpages
-	dh_installinfo doc/gzip.info
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
+	dh_clean -k
+	dh_installdirs
+
+	install -m 0755 build-win32/gzip.exe debian/gzip-win32/usr/share/win32/
+
+binary-indep:	build-win32 install-win32
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i README* TODO
+	dh_installchangelogs -i ChangeLog
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch:	build install
+	dh_testdir -s
+	dh_testroot -s
+	dh_installdocs -s README* TODO
+	dh_installmanpages -s
+	dh_installinfo -s doc/gzip.info
+	dh_installchangelogs -s ChangeLog
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
 	ln -s gunzip.1.gz debian/gzip/usr/share/man/man1/uncompress.1.gz
 	ln -s zgrep.1.gz debian/gzip/usr/share/man/man1/zegrep.1.gz
 	ln -s zgrep.1.gz debian/gzip/usr/share/man/man1/zfgrep.1.gz
-	dh_fixperms
+	dh_fixperms -s
 	# You may want to make some executables suid here.
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_makeshlibs -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Reply via email to