Bug#823350: devscripts: [uupdate] please add --skip-patches to dpkg-source
Herbert Parentes Fortes Neto
hpfn at ig.com.br
Tue May 3 20:16:18 UTC 2016
Package: devscripts
Version: 2.16.4
Severity: important
Tags: patch
Dear Maintainer,
I am doing tests with a new package - smoviecat[0]. You can get
the package from mentors and test.
[0] - https://mentors.debian.net/debian/pool/main/s/smoviecat/smoviecat_2.4.0-1.dsc
The name of the package is smoviecat and the upstream tarball
is SimpleMovieCatalog. The debian/watch:
version=4
opts="unzipopt=-a" \
http://sf.net/smoviecat/SimpleMovieCatalog-(\d\S+)\.zip debian uupdate
Running 'uscan --verbose', the end is:
uscan die: uscan: Failed to Execute user specified script:
uupdate -f --verbose --upstream-version 2.5.0
[...]
uupdate: Old: <version> = 2.4.0
uupdate: New: <version> = 2.5.0
uupdate: -> Copy to smoviecat_2.5.0-1.debian.tar.xz
dpkg-source: info: extracting smoviecat in smoviecat-2.5.0
dpkg-source: info: unpacking smoviecat_2.5.0.orig.tar.gz
dpkg-source: info: unpacking smoviecat_2.5.0-1.debian.tar.xz
dpkg-source: info: applying path_link_utf8_fixes.patch
patching file moviecat.pl
Hunk #1 FAILED at 20.
Hunk #3 FAILED at 49.
Hunk #4 FAILED at 58.
Hunk #5 FAILED at 92.
Hunk #6 succeeded at 132 (offset 7 lines).
Hunk #7 succeeded at 603 (offset 20 lines).
4 out of 7 hunks FAILED
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'path_link_utf8_fixes.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: info: restoring quilt backup files for path_link_utf8_fixes.patch
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/path_link_utf8_fixes.patch/ --reject-file=- < smoviecat-2.5.0/debian/patches/path_link_utf8_fixes.patch gave error exit status 1
uupdate: Error with "dpkg-source --no-copy --no-check -x smoviecat_2.5.0-1.dsc"
uupdate: Remember: Your current directory is changed back to the old source tree!
uupdate: Do a "cd .." to see smoviecat_2.5.0-1.dsc.
Running 'diff', the debian dir from version 2.4.0 and 2.5.0 are
equal. They should not. debian/changelog must be different.
I added a '--skip-patches' to dpkg-source call. And 'diff -d'
returns the correct:
# LANG=C diff -d ../smoviecat-2.4.0/debian/ debian/
diff -d ../smoviecat-2.4.0/debian/changelog debian/changelog
0a1,6
> smoviecat (2.5.0-1) UNRELEASED; urgency=medium
>
> * New upstream release
>
> -- Herbert Parentes Fortes Neto <hpfn at ig.com.br> Tue, 03 May 2016 17:13:27 -0300
>
Common subdirectories: ../smoviecat-2.4.0/debian/man and debian/man
Common subdirectories: ../smoviecat-2.4.0/debian/patches and debian/patches
Common subdirectories: ../smoviecat-2.4.0/debian/source and debian/source
If I missing something, I sorry.
Patch attached.
regards,
Herbert
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
Not present
-- System Information:
Debian Release: stretch/sid
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.5.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages devscripts depends on:
ii dpkg-dev 1.18.4
ii libc6 2.22-7
ii perl 5.22.1-10
pn python3:any <none>
Versions of packages devscripts recommends:
ii apt 1.2.10
ii at 3.1.18-2
ii dctrl-tools 2.24-2
ii debian-keyring 2016.03.22
ii dput 0.9.6.4
ii equivs 2.0.9+nmu1
ii fakeroot 1.20.2-1
ii file 1:5.25-2
ii gnupg 1.4.20-6
ii gnupg2 2.1.11-7
ii libdistro-info-perl 0.14
ii libencode-locale-perl 1.05-1
ii liblwp-protocol-https-perl 6.06-2
ii libsoap-lite-perl 1.19-1
ii liburi-perl 1.71-1
ii libwww-perl 6.15-1
ii lintian 2.5.43
ii man-db 2.7.5-1
ii patch 2.7.5-1
ii patchutils 0.3.4-1
ii python3-debian 0.1.27
ii python3-magic 1:5.25-2
ii sensible-utils 0.0.9
ii strace 4.10-3
ii unzip 6.0-20
ii wdiff 1.2.2-1+b1
ii wget 1.17.1-1+b1
ii xz-utils 5.1.1alpha+20120614-2.1
Versions of packages devscripts suggests:
ii bsd-mailx [mailx] 8.1.2-0.20160123cvs-2
ii build-essential 11.7
pn cvs-buildpackage <none>
pn devscripts-el <none>
pn diffoscope <none>
pn dose-extra <none>
pn gnuplot <none>
ii gpgv 1.4.20-6
ii libauthen-sasl-perl 2.1600-1
ii libfile-desktopentry-perl 0.22-1
ii libnet-smtp-ssl-perl 1.03-1
pn libterm-size-perl <none>
ii libtimedate-perl 2.3000-2
pn libyaml-syck-perl <none>
pn mozilla-devscripts <none>
ii mutt 1.5.24-1+b1
ii openssh-client [ssh-client] 1:7.2p2-4
pn svn-buildpackage <none>
ii w3m 0.5.3-27
-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: uupdate.patch
Type: text/x-diff
Size: 644 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/devscripts-devel/attachments/20160503/9f040741/attachment.patch>
More information about the devscripts-devel
mailing list