Paul, Your matanza_0.13-3.2.diff.gz applies cleanly against the 0.13 orig.tar.gz but you need to include the matanza_0.13-3.1.diff.gz. Re-edit the files and recreate the -3.2.diff.gz so that the 3.1 changes are incorporated. Your patch fails because it tries to back out some of the -3.1 changes.
Try this one instead. $ patch --dry-run -p1 <../interim.diff patching file debian/changelog patching file debian/rules -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
--- matanza-0.13/debian/changelog 2006-08-06 23:14:55.000000000 +0100 +++ temp/matanza-0.13/debian/changelog 2006-08-06 23:26:38.000000000 +0100 @@ -1,3 +1,21 @@ +matanza (0.13-3.2) unstable; urgency=low + + * Non-maintainer upload fixing lots of bugs (Closes: #335274) + * Use debhelper compatability version 4 + * Revamp and modernize debian/rules, uses debhelper more + * Add homepage to the long description + * Update the manual page and refer users to the README (Closes: #340496) + * Move binaries to /usr/games + * Bump Standards-Version + * Make sure to rebuild matanza.c and ai.c (build-dep on tetex-bin) + * Build-depend on libpng12-dev + * Update copyright information, including FSF address + * Recommend the virtual package telnet-client as well + * Install NEWS/TODO and the example ships, map and config + * Use $(MAKE) instead of make + + -- Paul Wise <[EMAIL PROTECTED]> Mon, 24 Apr 2006 12:28:41 +0800 + matanza (0.13-3.1) unstable; urgency=low * NMU --- matanza-0.13/debian/rules 2006-08-06 23:17:14.000000000 +0100 +++ temp/matanza-0.13/debian/rules 2006-08-06 23:26:38.000000000 +0100 @@ -1,67 +1,60 @@ #!/usr/bin/make -f -package=matanza -tempdir=$(shell pwd)/debian/tmp -insdirs=$(tempdir)/$(package)/DEBIAN \ - $(tempdir)/$(package)/usr/bin \ - $(tempdir)/$(package)/usr/share/doc/$(package) \ - $(tempdir)/$(package)/usr/share/man/man1 \ +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -binary: binary-indep binary-arch - -binary-arch: debian/control checkroot build $(insdirs) - install -m 644 debian/matanza.1 $(tempdir)/$(package)/usr/share/man/man1 - install -m 644 debian/matanza-ai.1 $(tempdir)/$(package)/usr/share/man/man1 - install -s -m 755 matanza $(tempdir)/$(package)/usr/bin - install -s -m 755 matanza-ai $(tempdir)/$(package)/usr/bin - - install -m 644 debian/changelog $(tempdir)/$(package)/usr/share/doc/$(package)/changelog.Debian - find $(tempdir)/$(package)/usr/share/doc -type f | xargs -r gzip -v9 - install -m 644 debian/copyright $(tempdir)/$(package)/usr/share/doc/$(package) - install -m 644 README $(tempdir)/$(package)/usr/share/doc/$(package)/README - install -m 644 debian/README.Debian $(tempdir)/$(package)/usr/share/doc/$(package)/README.Debian - rm -f config.status && rm -f config.log && rm -f config.cache - find $(tempdir)/$(package)/usr/share/man -type f | xargs -r gzip -v9 - dh_fixperms - dh_perl - dh_installdeb -P$(tempdir)/$(package) - dpkg-shlibdeps -p$(package) matanza - dpkg-gencontrol -isp -P$(tempdir)/$(package) -p$(package) - dpkg --build $(tempdir)/$(package) .. - -binary-indep: debian/control checkroot build $(insdirs) - -build: debian/control - ./configure - make - touch build - -checkroot: debian/control - test "root" = "$(shell whoami)" - -clean: debian/control - make -i clean - make -i distclean - for i in build debian/files debian/substvars `find -name "*~"`; do \ - if [ -e $$i ]; then \ - rm -f $$i; \ - fi; \ - done - for i in $(tempdir); do \ - if [ -d $$i ]; then \ - rm -rf $$i; \ - fi; \ - done +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: build-stamp +build-stamp: + dh_testdir + cp -f /usr/share/misc/config.sub . + cp -f /usr/share/misc/config.guess . + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games + $(MAKE) CFLAGS="$(CFLAGS)" + touch build-stamp + +clean: + dh_testdir + dh_testroot + -[ -f Makefile ] && make distclean + rm -f matanza.c ai.c config.sub config.guess build-stamp dh_clean -$(insdirs): - if [ -d $@ ]; then \ - rm -rf $@; \ - fi - install -d -m 755 $@ - chmod g-s $@ +install: build + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) install DESTDIR=$(CURDIR)/debian/matanza + +binary: binary-indep binary-arch +binary-indep: install +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb -.PHONY: binary binary-arch binary-indep checkroot clean +.PHONY: build clean install binary binary-arch binary-indep #Local variables: #mode: makefile
signature.asc
Description: OpenPGP digital signature
