Package: dpkg-dev; Maintainer for dpkg-dev is Dpkg Developers <[email protected]>; Source for dpkg-dev is src:dpkg (PTS, buildd, popcon).
Reported by: Ian Jackson <[email protected]>
Date: Sun, 18 Dec 2016 22:45:05 UTC
Severity: normal
Found in version dpkg/1.18.12
Reply or subscribe to this bug.
View this report as an mbox folder, status mbox, maintainer mbox
Report forwarded
to [email protected], Dpkg Developers <[email protected]>
:
Bug#848611
; Package dpkg-dev
.
(Sun, 18 Dec 2016 22:45:07 GMT) (full text, mbox, link).
Acknowledgement sent
to Ian Jackson <[email protected]>
:
New Bug report received and forwarded. Copy sent to Dpkg Developers <[email protected]>
.
(Sun, 18 Dec 2016 22:45:07 GMT) (full text, mbox, link).
Message #5 received at [email protected] (full text, mbox, reply):
Package: dpkg-dev Version: 1.18.12 See the transcript below, where I get this message: dpkg-source: error: diff 'glibc-2.23/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff' patches files multiple times; split the diff in multiple files or merge the hunks into a single one This only happens if this difficulty applies to the first unapplied patch. This causes dgit import-dsc to fail on this .dsc. (#848391) Since I want dgit to work on previous versions of Debian, where this bug will probably not be fixed in dpkg, I propose to work around it as follows: Every time dgit uses dpkg-source --before-build in this way, it will generate a spurious patch which creates a spurious file that dgit will remove again. (Also, I discover that if I make a patch that does absolutely, nothing, dpkg-source --before-build does this: dpkg-source: warning: diff 'glibc-2.23/debian/patches/dgit-omg-wtf' doesn't contain any patch and *fails to apply the rest of the series*!) Ian. zealot:848391> dget -d http://snapshot.debian.org/archive/debian/20160704T045211Z/pool/main/g/glibc/glibc_2.23-1.dsc dget: retrieving http://snapshot.debian.org/archive/debian/20160704T045211Z/pool/main/g/glibc/glibc_2.23-1.dsc % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 8256 100 8256 0 0 101k 0 --:--:-- --:--:-- --:--:-- 102k dget: retrieving http://snapshot.debian.org/archive/debian/20160704T045211Z/pool/main/g/glibc/glibc_2.23.orig.tar.xz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 13.2M 0 13.2M 0 0 874k 0 --:--:-- 0:00:15 --:--:-- 1546k dget: retrieving http://snapshot.debian.org/archive/debian/20160704T045211Z/pool/main/g/glibc/glibc_2.23-1.debian.tar.xz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 1166k 100 1166k 0 0 1652k 0 --:--:-- --:--:-- --:--:-- 1651k glibc_2.23-1.dsc: Good signature found validating glibc_2.23.orig.tar.xz validating glibc_2.23-1.debian.tar.xz All files validated successfully. zealot:848391> dpkg-source -x --skip-patches glibc_2.23-1.dsc dpkg-source: info: extracting glibc in glibc-2.23 dpkg-source: info: unpacking glibc_2.23.orig.tar.xz dpkg-source: info: unpacking glibc_2.23-1.debian.tar.xz zealot:848391> cd glibc-2.23/ zealot:glibc-2.23> cp debian/patches/series ../ zealot:glibc-2.23> ed debian/patches/series 7014 /cvs-IPV6_PKTINFO hurd-i386/cvs-IPV6_PKTINFO.diff .,$d w 4795 q zealot:glibc-2.23> dpkg-source --before-build . dpkg-source: info: using options from glibc-2.23/debian/source/options: --compression=xz dpkg-source: info: applying git-updates.diff dpkg-source: info: applying locale/check-unknown-symbols.diff dpkg-source: info: applying locale/fix-LC_COLLATE-rules.diff dpkg-source: info: applying locale/preprocessor-collate-uli-sucks.diff dpkg-source: info: applying locale/preprocessor-collate.diff dpkg-source: info: applying locale/locale-print-LANGUAGE.diff dpkg-source: info: applying locale/LC_IDENTIFICATION-optional-fields.diff dpkg-source: info: applying locale/LC_COLLATE-keywords-ordering.diff dpkg-source: info: applying localedata/local-all-no-archive.diff dpkg-source: info: applying localedata/sort-UTF8-first.diff dpkg-source: info: applying localedata/supported.diff dpkg-source: info: applying localedata/locale-eo_EO.diff dpkg-source: info: applying localedata/locale-eu_FR.diff dpkg-source: info: applying localedata/new-valencian-locale.diff dpkg-source: info: applying localedata/locale-ku_TR.diff dpkg-source: info: applying localedata/tl_PH-yesexpr.diff dpkg-source: info: applying localedata/fo_FO-date_fmt.diff dpkg-source: info: applying localedata/locales_CH.diff dpkg-source: info: applying localedata/locales-fr.diff dpkg-source: info: applying localedata/locale-en_DK.diff dpkg-source: info: applying localedata/locale-csb_PL.diff dpkg-source: info: applying localedata/locale-zh_TW.diff dpkg-source: info: applying localedata/locale-se_NO.diff dpkg-source: info: applying localedata/tailor-iso14651_t1.diff dpkg-source: info: applying localedata/locale-hsb_DE.diff dpkg-source: info: applying localedata/tailor-iso14651_t1-common.diff dpkg-source: info: applying localedata/fr_CH-first_weekday.diff dpkg-source: info: applying localedata/locale-de_LI.diff dpkg-source: info: applying localedata/submitted-bz9725-locale-sv_SE.diff dpkg-source: info: applying localedata/first_weekday.diff dpkg-source: info: applying localedata/locale-C.diff dpkg-source: info: applying localedata/submitted-en_AU-date_fmt.diff dpkg-source: info: applying localedata/submitted-es_MX-decimal_point.diff dpkg-source: info: applying localedata/submitted-it_IT-thousands_sep.diff dpkg-source: info: applying alpha/local-gcc4.1.diff dpkg-source: info: applying alpha/submitted-dl-support.diff dpkg-source: info: applying alpha/local-string-functions.diff dpkg-source: info: applying alpha/submitted-fegetenv-namespace.diff dpkg-source: info: applying alpha/submitted-termios_h.diff dpkg-source: info: applying alpha/submitted-fts64.diff dpkg-source: info: applying alpha/submitted-trunc.diff dpkg-source: info: applying amd64/local-blacklist-for-Intel-TSX.diff dpkg-source: info: applying arm/local-sigaction.diff dpkg-source: info: applying arm/unsubmitted-ldconfig-cache-abi.diff dpkg-source: info: applying arm/unsubmitted-ldso-abi-check.diff dpkg-source: info: applying arm/local-soname-hack.diff dpkg-source: info: applying arm/local-vfp-sysdeps.diff dpkg-source: info: applying arm/unsubmitted-ldso-multilib.diff dpkg-source: info: applying arm/local-arm-futex.diff dpkg-source: info: applying hppa/local-inlining.diff dpkg-source: info: applying hppa/local-stack-grows-up.diff dpkg-source: info: applying hppa/local-elf-make-cflags.diff dpkg-source: info: applying hppa/local-shmlba.diff dpkg-source: info: applying hppa/local-fptr-table-size.diff dpkg-source: info: applying hppa/submitted-gmon-start.diff dpkg-source: info: applying hppa/submitted-dladdr.diff dpkg-source: info: applying hppa/submitted-libm-test-ulps.diff dpkg-source: info: applying hurd-i386/local-enable-ldconfig.diff dpkg-source: info: applying hurd-i386/tg-context_functions.diff dpkg-source: info: applying hurd-i386/tg-tls.diff dpkg-source: info: applying hurd-i386/tg-tls-threadvar.diff dpkg-source: info: applying hurd-i386/tg-tlsdesc.sym.diff dpkg-source: info: applying hurd-i386/tg-sysvshm.diff dpkg-source: info: applying hurd-i386/tg-extern_inline.diff dpkg-source: info: applying hurd-i386/tg-_dl_random.diff dpkg-source: info: applying hurd-i386/tg-thread-cancel.diff dpkg-source: info: applying hurd-i386/tg-bigmem.diff dpkg-source: info: applying hurd-i386/local-disable-ioctls.diff dpkg-source: info: applying hurd-i386/tg-locarchive.diff dpkg-source: info: applying hurd-i386/tg-no-hp-timing.diff dpkg-source: info: applying hurd-i386/tg-sendmsg-SCM_RIGHTS.diff dpkg-source: info: applying hurd-i386/tg-sendmsg-SCM_CREDS.diff dpkg-source: info: applying hurd-i386/tg-grantpt.diff dpkg-source: info: applying hurd-i386/submitted-add-needed.diff dpkg-source: info: applying hurd-i386/local-ED.diff dpkg-source: info: applying hurd-i386/tg-posix_thread.diff dpkg-source: info: applying hurd-i386/tg-gai_misc.diff dpkg-source: info: applying hurd-i386/local-madvise_warn.diff dpkg-source: info: applying hurd-i386/tg-hurdsig-fixes.diff dpkg-source: info: applying hurd-i386/tg-hurdsig-global-dispositions.diff dpkg-source: info: applying hurd-i386/local-hurdsig-global-dispositions-version.diff dpkg-source: info: applying hurd-i386/tg-hurdsig-SA_SIGINFO.diff dpkg-source: info: applying hurd-i386/tg-hurdsig-fixes-2.diff dpkg-source: info: applying hurd-i386/tg-hooks.diff dpkg-source: info: applying hurd-i386/cvs-libpthread.diff dpkg-source: info: applying hurd-i386/cvs-libpthread-2.23.diff dpkg-source: info: applying hurd-i386/libpthread_spin-lock.diff dpkg-source: info: applying hurd-i386/libpthread_build.diff dpkg-source: info: applying hurd-i386/libpthread_sigmask.diff dpkg-source: info: applying hurd-i386/libpthread_clean.diff dpkg-source: info: applying hurd-i386/cvs-libpthread_clean2.diff dpkg-source: info: applying hurd-i386/cvs-libpthread_build.diff dpkg-source: info: applying hurd-i386/tg-libpthread_depends.diff dpkg-source: info: applying hurd-i386/libpthread_version.diff dpkg-source: info: applying hurd-i386/submitted-exec_filename.diff dpkg-source: info: applying hurd-i386/unsubmitted-gnumach.defs.diff dpkg-source: info: applying hurd-i386/tg-hurdsig-boot-fix.diff dpkg-source: info: applying hurd-i386/tg-single-select-timeout.diff dpkg-source: info: applying hurd-i386/tg-setitimer.diff dpkg-source: info: applying hurd-i386/tg-pie-sbrk.diff dpkg-source: info: applying hurd-i386/tg-ifaddrs_v6.diff dpkg-source: info: applying hurd-i386/tg-remap_getcwd.diff dpkg-source: info: applying hurd-i386/tg-exec-static.diff dpkg-source: info: applying hurd-i386/tg-EIEIO-fr.diff dpkg-source: info: applying hurd-i386/tg-io_select_timeout.diff dpkg-source: info: applying hurd-i386/tg-poll_errors_fixes.diff dpkg-source: info: applying hurd-i386/unsubmitted-clock_t_centiseconds.diff dpkg-source: info: applying hurd-i386/submitted-path_mounted.diff dpkg-source: info: applying hurd-i386/unsubmitted-NO_HIDDEN.diff dpkg-source: info: applying hurd-i386/tg-socket_flags.diff dpkg-source: info: applying hurd-i386/tg-socketpair_flags.diff dpkg-source: info: applying hurd-i386/tg-pipe2.diff dpkg-source: info: applying hurd-i386/tg-libc_getspecific.diff dpkg-source: info: applying hurd-i386/tg-futimens.diff dpkg-source: info: applying hurd-i386/tg-sigstate_thread_reference.diff dpkg-source: info: applying hurd-i386/tg-tls_thread_leak.diff dpkg-source: info: applying hurd-i386/submitted-bind_umask2.diff dpkg-source: info: applying hurd-i386/local-libpthread-stacksize.diff dpkg-source: info: applying hurd-i386/tg-WRLCK-upgrade.diff dpkg-source: info: applying hurd-i386/tg-reboot-startup.diff dpkg-source: info: applying hurd-i386/libpthread-versions.diff dpkg-source: info: applying hurd-i386/cvs-revert-gnu-gnu-cleanup.diff dpkg-source: info: applying hurd-i386/unsubmitted-libc_alloca_cutoff.diff dpkg-source: info: applying hurd-i386/libpthread_pthread_types.diff dpkg-source: info: applying hurd-i386/unsubmitted-libpthread-semaphore.h.diff dpkg-source: info: applying hurd-i386/local-bootstrap.diff dpkg-source: info: applying hurd-i386/local-mach_print.diff dpkg-source: info: applying hurd-i386/cvs-hidden.diff dpkg-source: info: applying hurd-i386/cvs-libpthread-api.diff dpkg-source: info: applying hurd-i386/cvs-libpthread-sigstate.diff dpkg-source: info: applying hurd-i386/submitted-hurd-abilist.diff dpkg-source: info: applying hurd-i386/cvs-openat.diff dpkg-source: info: applying hurd-i386/cvs-gai_sigqueue.diff dpkg-source: info: applying hurd-i386/cvs-aio_sigqueue.diff dpkg-source: info: applying hurd-i386/cvs-pt-kill.diff dpkg-source: info: applying hurd-i386/cvs-open.diff dpkg-source: info: applying hurd-i386/cvs-c++-types.diff dpkg-source: info: applying hurd-i386/cvs-errnos.d.diff dpkg-source: info: applying hurd-i386/cvs-mach-syscalls.mk.diff dpkg-source: info: applying hurd-i386/local-versions.diff dpkg-source: info: applying hurd-i386/cvs-auxv.diff dpkg-source: info: applying hurd-i386/cvs-gprof-tick.diff zealot:glibc-2.23> cp ../series debian/patches/ zealot:glibc-2.23> dpkg-source --before-build . dpkg-source: info: using options from glibc-2.23/debian/source/options: --compression=xz dpkg-source: error: diff 'glibc-2.23/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff' patches files multiple times; split the diff in multiple files or merge the hunks into a single one zealot:glibc-2.23> -- Ian Jackson <[email protected]> These opinions are my own. If I emailed you from an address @fyvzl.net or @evade.org.uk, that is a private address which bypasses my fierce spamfilter.
Send a report that this bug log contains spam.
Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.
Copyright © 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson, 2005-2017 Don Armstrong, and many other contributors.