Hi Russell, I think you just need to delete the empty line between License and 
Files-Excluded, it's supposed to be part of the first stanza.

You probably also want to add a 
dversionmangle=s/\+dfsg\d*$//,repacksuffix=+dfsg1, to the options list in 
debian/watch.

X

Russell Sim:
> Hi Ximin,
> 
> I can't figure out how this feature works.  Despite applying the patch I
> have attached, it seems that it doesn't actually strip the files I expect
> it to.  Do you have any suggestions?\
> 
> $ uscan --download-current-version --verbose
> uscan info: uscan (version 2.17.5) See uscan(1) for help
> uscan info: Scan watch files in .
> uscan info: Check debian/watch and debian/changelog in ./.git/refs/tags
> uscan info: Check debian/watch and debian/changelog in .
> uscan info: package="libgit2" version="0.25.1-1" (as seen in
> debian/changelog)
> uscan info: package="libgit2" version="0.25.1" (no epoch/revision)
> uscan info: ./debian/changelog sets package="libgit2" version="0.25.1"
> uscan info: Process ./debian/watch (package=libgit2 version=0.25.1)
> uscan info: opts:
> compression=xz,repack,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libgit2-$1\.tar\.gz/
> uscan info: line: https://github.com/libgit2/libgit2/releases
> .*/v?([\d.]*)\.tar\.gz
> uscan info: Parsing compression=xz
> uscan info: Parsing repack
> uscan info: Parsing
> filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libgit2-$1\.tar\.gz/
> uscan info: line: https://github.com/libgit2/libgit2/releases
> .*/v?([\d.]*)\.tar\.gz
> uscan info: Last orig.tar.* tarball version (from debian/changelog): 0.25.1
> uscan info: Download the --download-current-version specified version:
> 0.25.1
> uscan info: Requesting URL:
>    https://github.com/libgit2/libgit2/releases
> uscan info: Matching pattern:
>    (?:(?:https://github.com
> )?\/libgit2\/libgit2\/releases)?.*/v?([\d.]*)\.tar\.gz
> uscan info: Found the following matching hrefs on the web page (newest
> first):
>    /libgit2/libgit2/archive/v0.25.1.tar.gz (0.25.1) index=0.25.1-1 matched
> with the download version
>    /libgit2/libgit2/archive/v0.25.0.tar.gz (0.25.0) index=0.25.0-1
>    /libgit2/libgit2/archive/v0.24.6.tar.gz (0.24.6) index=0.24.6-1
>    /libgit2/libgit2/archive/v0.24.5.tar.gz (0.24.5) index=0.24.5-1
>    /libgit2/libgit2/archive/v0.24.4.tar.gz (0.24.4) index=0.24.4-1
>    /libgit2/libgit2/archive/v0.24.3.tar.gz (0.24.3) index=0.24.3-1
>    /libgit2/libgit2/archive/v0.24.2.tar.gz (0.24.2) index=0.24.2-1
>    /libgit2/libgit2/archive/v0.24.1.tar.gz (0.24.1) index=0.24.1-1
> uscan info: Matching target for downloadurlmangle:
> https://github.com/libgit2/libgit2/archive/v0.25.1.tar.gz
> uscan info: Upstream URL (downloadurlmangled):
>    https://github.com/libgit2/libgit2/archive/v0.25.1.tar.gz
> uscan info: Newest upstream tarball version selected for download
> (uversionmangled): 0.25.1
> uscan info: Matching target for filenamemangle:
> /libgit2/libgit2/archive/v0.25.1.tar.gz
> uscan info: Download filename (filenamemangled): libgit2-0.25.1.tar.gz
> uscan: Newest version of libgit2 on remote site is 0.25.1, specified
> download version is 0.25.1
> uscan info: Not downloading, using existing file: libgit2-0.25.1.tar.gz
> uscan info: Start checking for common possible upstream OpenPGP signature
> files
> uscan info: End checking for common possible upstream OpenPGP signature
> files
> uscan info: Missing OpenPGP signature.
> uscan info: New orig.tar.* tarball version (oversionmangled): 0.25.1
> uscan info: Executing internal command:
>    mk-origtargz --package libgit2 --version 0.25.1 --repack --compression
> xz --directory .. --copyright-file debian/copyright ../libgit2-0.25.1.tar.gz
> uscan info: New orig.tar.* tarball version (after mk-origtargz): 0.25.1
> uscan info: Successfully repacked ../libgit2-0.25.1.tar.gz as
> ../libgit2_0.25.1.orig.tar.xz.
> uscan info: Scan finished
> 
> $ tar tJf ../libgit2_0.25.1.orig.tar.xz | grep deps
> libgit2-0.25.1/deps/
> libgit2-0.25.1/deps/http-parser/
> libgit2-0.25.1/deps/http-parser/LICENSE-MIT
> libgit2-0.25.1/deps/http-parser/http_parser.c
> libgit2-0.25.1/deps/http-parser/http_parser.h
> libgit2-0.25.1/deps/regex/
> libgit2-0.25.1/deps/regex/config.h
> libgit2-0.25.1/deps/regex/regcomp.c
> libgit2-0.25.1/deps/regex/regex.c
> libgit2-0.25.1/deps/regex/regex.h
> libgit2-0.25.1/deps/regex/regex_internal.c
> libgit2-0.25.1/deps/regex/regex_internal.h
> libgit2-0.25.1/deps/regex/regexec.c
> libgit2-0.25.1/deps/winhttp/
> libgit2-0.25.1/deps/winhttp/urlmon.h
> libgit2-0.25.1/deps/winhttp/winhttp.def
> libgit2-0.25.1/deps/winhttp/winhttp.h
> libgit2-0.25.1/deps/winhttp/winhttp64.def
> libgit2-0.25.1/deps/zlib/
> libgit2-0.25.1/deps/zlib/adler32.c
> libgit2-0.25.1/deps/zlib/crc32.c
> libgit2-0.25.1/deps/zlib/crc32.h
> libgit2-0.25.1/deps/zlib/deflate.c
> libgit2-0.25.1/deps/zlib/deflate.h
> libgit2-0.25.1/deps/zlib/infback.c
> libgit2-0.25.1/deps/zlib/inffast.c
> libgit2-0.25.1/deps/zlib/inffast.h
> libgit2-0.25.1/deps/zlib/inffixed.h
> libgit2-0.25.1/deps/zlib/inflate.c
> libgit2-0.25.1/deps/zlib/inflate.h
> libgit2-0.25.1/deps/zlib/inftrees.c
> libgit2-0.25.1/deps/zlib/inftrees.h
> libgit2-0.25.1/deps/zlib/trees.c
> libgit2-0.25.1/deps/zlib/trees.h
> libgit2-0.25.1/deps/zlib/zconf.h
> libgit2-0.25.1/deps/zlib/zlib.h
> libgit2-0.25.1/deps/zlib/zutil.c
> libgit2-0.25.1/deps/zlib/zutil.h
> libgit2-0.25.1/script/install-deps-osx.sh
> 
> 
> On 3 May 2017 at 16:24, Ximin Luo <infini...@debian.org> wrote:
> 
>> Source: libgit2
>> Version: 0.24.5-1
>> Severity: minor
>>
>> Dear Maintainer,
>>
>> The source package embeds third-party dependencies in deps/. This appears
>> not
>> to be necessary: I installed the Build-Depends, deleted deps/*, ran
>> `debian/rules build`, and it still worked.
>>
>> You can remove this in the next upstream release by adding some
>> Files-Excluded:
>> entries to d/copyright and adjusting d/watch accordingly; see `man uscan`
>> for
>> details and/or ask me for help.
>>
>> After this is done, one can also remove the corresponding entries in
>> d/copyright.
>>
>> At the moment the situation is a bit confusing because it looks like the
>> package requires these embebbed libraries, but they're not actually used.
>>
>> Ximin
>>
>> -- System Information:
>> Debian Release: 9.0
>>   APT prefers testing
>>   APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
>> 'testing-debug'), (300, 'unstable'), (200, 'experimental'), (1,
>> 'experimental-debug')
>> Architecture: amd64
>>  (x86_64)
>> Foreign Architectures: i386
>>
>> Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
>> Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
>> Shell: /bin/sh linked to /bin/dash
>> Init: systemd (via /run/systemd/system)
>>
> 
> 
> 


-- 
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git

Reply via email to