On Tue, Nov 24, 2009 at 02:02:02AM +0100, Raphael Hertzog wrote:
> On Tue, 24 Nov 2009, Brian May wrote:
> > Next problem:
> >
> > [...]
> > dpkg-source -b heimdal-1.3.1.dfsg.1
> > dpkg-source: info: using source format `3.0 (quilt)'
> > dpkg-source: warning: patches have not been applied, applying them now (use
> > --no-preparation to override)
> > dpkg-source: info: applying all patches with quilt push -q 030_autotools
> > Applying patch 011_sharedlibs
> > Applying patch 020_maintainermode
> > Applying patch 021_debian
> > Applying patch 022_openafs
> > Applying patch 024_rxtelnet
> > Applying patch 025_pthreads
> > Applying patch 027_rsh_use_ktelnet
> > Applying patch 030_autotools
> > Now at patch 030_autotools
> > dpkg-source: info: building heimdal using existing
> > ./heimdal_1.3.1.dfsg.1.orig.tar.gz
> > dpkg-source: error: quilt --quiltrc /dev/null push -q 030_autotools gave
> > error exit status 1
> > dpkg-buildpackage: error: dpkg-source -b heimdal-1.3.1.dfsg.1 gave error
> > exit status 2
>
> You probably have upstream changes that are not under quilt's control
> (they appear in the .diff.gz up to now). And one of your patches
> depends on that change... without it it doesn't apply. Thus the quilt
> series fails to apply on directory with only the upstream tarball
> unpacked.
Ok, I did the following:
1. Extract clean tar ball
2. Copy debian directory from old
3. Ensure all patches are clean and apply
4. run debuild -us -uc -S, which runs dpkg-buildpackage -rfakeroot -d -us -uc -S
=== cut ===
dpkg-buildpackage -rfakeroot -d -us -uc -S
dpkg-buildpackage: set CFLAGS to default value: -g -O2
dpkg-buildpackage: set CPPFLAGS to default value:
dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
dpkg-buildpackage: set FFLAGS to default value: -g -O2
dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
dpkg-buildpackage: source package heimdal
dpkg-buildpackage: source version 1.3.1.dfsg.1-1
dpkg-buildpackage: source changed by Brian May <b...@snoopy.debian.net>
fakeroot debian/rules clean
test -x debian/rules
dh_testroot
/usr/bin/make -C . -k distclean
make[1]: Entering directory `/home/brian/tree/heimdal/heimdal-1.3.1.dfsg.1'
make[1]: *** No rule to make target `distclean'.
make[1]: Leaving directory `/home/brian/tree/heimdal/heimdal-1.3.1.dfsg.1'
make: [makefile-clean] Error 2 (ignored)
rm -f debian/stamp-makefile-build
for i in ./config.guess ./config.sub ; do \
if test -e $i.cdbs-orig ; then \
mv $i.cdbs-orig $i ; \
fi ; \
done
dh_clean
rm -f debian/stamp-autotools-files
/usr/bin/make -f debian/rules reverse-config
make[1]: Entering directory `/home/brian/tree/heimdal/heimdal-1.3.1.dfsg.1'
for i in ./config.guess ./config.sub ; do \
if test -e $i.cdbs-orig ; then \
mv $i.cdbs-orig $i ; \
fi ; \
done
make[1]: Leaving directory `/home/brian/tree/heimdal/heimdal-1.3.1.dfsg.1'
if [ -d "." ]; then \
cd . &&
QUILT_PATCHES=/home/brian/tree/heimdal/heimdal-1.3.1.dfsg.1/debian/patches
quilt --quiltrc /dev/null pop -a -R || test $? = 2 ; \
fi
Removing patch 027_rsh_use_ktelnet
Restoring appl/rsh/rsh.c
Restoring appl/rsh/rsh.1
Removing patch 025_pthreads
Restoring cf/pthreads.m4
Removing patch 024_rxtelnet
Restoring appl/kx/rxtelnet.in
Restoring appl/kx/rxterm.in
Removing patch 022_openafs
Restoring lib/krb5/keytab_keyfile.c
Removing patch 021_debian
Restoring kdc/kdc.8
Restoring doc/setup.texi
Restoring appl/telnet/telnetd/telnetd.h
Removing patch 020_maintainermode
Restoring configure.in
Removing patch 011_sharedlibs
Restoring tools/krb5-config.in
No patches applied
rm -rf ./.pc
rm -f debian/stamp-patch*
# clean files not cleaned by make file
rm -f appl/rsh/login_access.c
rm -f appl/rsh/rsh.cat1
rm -f include/*.h
rm -f include/kadm5/*.h
rm -f include/version.h.in
rm -f krb5/libkrb5.ver
rm -f lib/com_err/Makefile
rm -f lib/com_err/snprintf.c
rm -f lib/com_err/strlcpy.c
rm -f lib/des/Makefile
rm -f lib/editline/Makefile
rm -f lib/krb5/libkrb5.ver
rm -f lib/otp/snprintf.c
rm -f lib/otp/strcasecmp.c
rm -f lib/otp/strlcat.c
rm -f lib/otp/strlcpy.c
rm -f lib/otp/strlwr.c
rm -f lib/otp/strncasecmp.c
rm -f lib/sl/slc-gram.c
rm -f lib/sl/slc-gram.h
rm -f lib/sl/slc-lex.c
rm -f appl/ftp/ftpd/ftpcmd.c
rm -f lib/otp/ndbm_wrap.c
rm -f lib/otp/ndbm_wrap.h
rm -f lib/wind/*.pyc
rm -f doc/heimdal.info
rm -f lib/hx509/sel-gram.c
rm -f lib/roken/roken-glob.h
dpkg-source -b heimdal-1.3.1.dfsg.1
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: warning: patches have not been applied, applying them now (use
--no-preparation to override)
dpkg-source: info: applying all patches with quilt push -q 030_autotools
Applying patch 011_sharedlibs
Applying patch 020_maintainermode
Applying patch 021_debian
Applying patch 022_openafs
Applying patch 024_rxtelnet
Applying patch 025_pthreads
Applying patch 027_rsh_use_ktelnet
Applying patch 030_autotools
9 out of 42 hunks FAILED
Patch 030_autotools does not apply (enforce with -f)
dpkg-source: error: quilt --quiltrc /dev/null push -q 030_autotools gave error
exit status 1
dpkg-buildpackage: error: dpkg-source -b heimdal-1.3.1.dfsg.1 gave error exit
status 2
debuild: fatal error at line 1334:
dpkg-buildpackage -rfakeroot -d -us -uc -S failed
=== cut ===
Which has me really puzzled because that just applied cleanly a moment ago.
Hmm. It never tried to remove patch 030_autotools at the initial step. It was
aplied. Now that is odd. Wonder if maybe that could be related. Maybe I am
somehow getting quilt totally confused.
Got to go to a meeting now, will explore more later.
--
Brian May <b...@snoopy.debian.net>
--
To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
