debian/watch: ``` version=3 opts=repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds| deb)\d*$// \ https://github.com/Kitware/VTK/tags .*/v?(7\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) ``` uscan -v: ``` uscan info: uscan (version 2.16.8ubuntu2) See uscan(1) for help uscan info: Scan watch files in . uscan info: Check debian/watch and debian/changelog in . uscan info: package="vtk7" version="7.1.1-1" (as seen in debian/changelog) uscan info: package="vtk7" version="7.1.1" (no epoch/revision) uscan info: ./debian/changelog sets package="vtk7" version="7.1.1" uscan info: Process ./debian/watch (package=vtk7 version=7.1.1) uscan info: opts: repacksuffix=+dfsg1,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// uscan info: line: https://github.com/Kitware/VTK/tags .*/v?(7\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) uscan info: Parsing repacksuffix=+dfsg1 uscan info: Parsing uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ uscan info: Parsing dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// uscan info: line: https://github.com/Kitware/VTK/tags .*/v?(7\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) uscan info: Last orig.tar.* tarball version (from debian/changelog): 7.1.1 uscan info: Last orig.tar.* tarball version (dversionmangled): 7.1.1 uscan info: Requesting URL: https://github.com/Kitware/VTK/tags uscan info: Matching pattern: (?:(?:https://github.com )?\/Kitware\/VTK\/tags)?.*/v?(7\.\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) uscan info: Found the following matching hrefs on the web page (newest first): /Kitware/VTK/archive/v7.1.1.tar.gz (7.1.1) index=7.1.1-1 /Kitware/VTK/archive/v7.1.0.tar.gz (7.1.0) index=7.1.0-1 /Kitware/VTK/archive/v7.1.0.rc2.tar.gz (7.1.0~rc2) index=7.1.0~rc2-1 /Kitware/VTK/archive/v7.1.0.rc1.tar.gz (7.1.0~rc1) index=7.1.0~rc1-1 /Kitware/VTK/archive/v7.0.0.tar.gz (7.0.0) index=7.0.0-1 /Kitware/VTK/archive/v7.0.0.rc2.tar.gz (7.0.0~rc2) index=7.0.0~rc2-1 /Kitware/VTK/archive/v7.0.0.rc1.tar.gz (7.0.0~rc1) index=7.0.0~rc1-1 uscan info: Matching target for downloadurlmangle: https://github.com/Kitware/VTK/archive/v7.1.1.tar.gz uscan info: Upstream URL (downloadurlmangled): https://github.com/Kitware/VTK/archive/v7.1.1.tar.gz uscan info: Newest upstream tarball version selected for download (uversionmangled): 7.1.1 uscan info: Download filename (filenamemangled): v7.1.1.tar.gz uscan info: Newest version of vtk7 on remote site is 7.1.1, local version is 7.1.1 uscan info: => Package is up to date for from https://github.com/Kitware/VTK/archive/v7.1.1.tar.gz uscan info: Scan finished ``` It finds 7.1.1 alright, and changelog is up-to-date too. Forcing the download works and produces `../vtk7_7.1.1+dfsg1.orig.tar.gz`.
Should I just continue this way? Cheers, Nico On Wed, May 17, 2017 at 4:46 PM Ghislain Vaillant <[email protected]> wrote: > Did you delete the previously downloaded tarballs? > > You can also force uscan to redownload via `uscan --force-download`. > You may also add the `--verbose` option which will output the different > steps uscan is following. Could you paste the content of your d/watch? > > Ghis > > > On Wed, 2017-05-17 at 14:39 +0000, Nico Schlömer wrote: > > Thanks Ghislain for the explanation. > > > > I'm following exactly the steps you mention, but really I don't see a > difference to what I did before. I'm hesitating to push because I'm > thinking something must be wrong again. For example, `uscan` doesn't really > download anything, let alone filter. It just checks for the current version > (7.1.1) and verifies that this is the one in `debian/changelog`. > > > > How can I tell if this time it going right? > > > > Cheers, > > Nico > > > > On Wed, May 17, 2017 at 3:38 PM Ghislain Vaillant <[email protected]> > wrote: > > > You can use the following d/gbp.conf: > > > > > > ``` > > > [DEFAULT] > > > upstream-branch = upstream > > > debian-branch = master > > > upstream-tag = upstream/%(version)s > > > debian-tag = debian/%(version)s > > > sign-tags = True > > > pristine-tar = True > > > ``` > > > > > > which will give you a layout compliant with the d-science policy, and > > > enable signed tags and systematic commit of a pristine-tar tarball on > > > each new import. > > > > > > Ghis > > > > > > > > > On Wed, 2017-05-17 at 13:27 +0000, Nico Schlömer wrote: > > > > Thanks Ghislain for the info. > > > > > > > > Would you be so kind to create the vtk7 repo on alioth so I can > proceed with the instructions? > > > > > > > > Cheers, > > > > Nico > > > > > > > > On Wed, May 17, 2017 at 1:30 PM Ghislain Vaillant < > [email protected]> wrote: > > > > > On Wed, 2017-05-17 at 11:08 +0000, Nico Schlömer wrote: > > > > > > Does this go out to Gert or to me? I'm assuming myself. > > > > > > > > > > > > > Prior to debianizing, did you manage to build VTK 7.x with the > system > > > > > > > libraries locally on your machine? > > > > > > > > > > > > No, I've only ever built it in a clean environment on launchpad. > [1] > > > > > > > > > > Ack. > > > > > > > > > > > > Did you check for dfsg-compliance, vendored dependencies and > licensing > > > > > > > compatibility within the code base? > > > > > > > > > > > > I've manually compared the source trees of VTK6 and VTK7, looked > at the differences and added respective entries to the copyright file. > > > > > > > > > > Good, so once you have the following information recorded in a git > > > > > initialised folder: > > > > > > > > > > - Source package name (d/changelog) > > > > > - Files-Excluded pattern (d/copyright) > > > > > - Remote fetching regexp (d/watch) > > > > > - Repository layout (d/gbp.conf) > > > > > > > > > > You can just run `uscan` followed by `gbp import-orig ../$TARBALL` > and > > > > > your packaging repository is good to go. Beyond this point, all you > > > > > have to do is work on the rest of the debianization in the `master` > > > > > branch. > > > > > > > > > > You should not have to setup the packaging repository ever again > unless > > > > > you screwed up the check-list in my earlier reply. > > > > > > > > > > > Cheers, > > > > > > Nico > > > > > > > > > > > > [1] https://launchpad.net/~nschloe/+archive/ubuntu/vtk7 > > > > > > > > > > > > On Wed, May 17, 2017 at 12:54 PM Ghislain Vaillant < > [email protected]> wrote: > > > > > > > Prior to debianizing, did you manage to build VTK 7.x with the > system > > > > > > > libraries locally on your machine? > > > > > > > > > > > > > > Did you check for dfsg-compliance, vendored dependencies and > licensing > > > > > > > compatibility within the code base? > > > > > > > > > > > > > > Did you complete this check-list? > > > > > > > > > > > > > > Ghis > > > > > > > > > > > > > > > > > > > > > On Wed, 2017-05-17 at 10:05 +0000, Nico Schlömer wrote: > > > > > > > > > I'm afraid you'll have to start over again ... > > > > > > > > > > > > > > > > I have to admit it is really frustrating to start over so > many times. I'm happy to work for free if it's fun or rewarding; this > really is neither. > > > > > > > > > > > > > > > > I packaged using this [1] documentation, and the only > mention of uscan is with > > > > > > > > > > > > > > > > > Using a debian/watch file (recommended) > > > > > > > > > $ gbp import-orig --uscan > > > > > > > > > > > > > > > > Since I didn't use a watch file (but downloaded the sources > manually), I didn't use it. If it's so important, I don't understand why > `--uscan` isn't the default. > > > > > > > > > > > > > > > > Anyhow. > > > > > > > > > > > > > > > > Gert, please recreate the repo on alioth. > > > > > > > > > > > > > > > > Cheers, > > > > > > > > Nico > > > > > > > > > > > > > > > > [1] https://wiki.debian.org/PackagingWithGit > > > > > > > > > > > > > > > > On Wed, May 17, 2017 at 11:41 AM Gert Wollny < > [email protected]> wrote: > > > > > > > > > Am Mittwoch, den 17.05.2017, 08:29 +0000 schrieb Nico > Schlömer: > > > > > > > > > > > I would suggest to remove the whole Win32/ subtree > from the source > > > > > > > > > > code via the debian/copyright files-excluded directive. > > > > > > > > > > > > > > > > > > > > Weirdly, this is already done. > > > > > > > > > > > > > > > > > > I guess you didn't use uscan to download the tarball, only > then it is > > > > > > > > > repackaged removing files. But this also might remove some > embedded > > > > > > > > > libraries you re-added (check the d/copyright file for > excludes). > > > > > > > > > > > > > > > > > > I'm afraid you'll have to start over again ... > > > > > > > > > > > > > > > > > > many thanks, > > > > > > > > > Gert > > > > > > > > > > > > > > > > > > > > > > > > > > > PS: This week I'm a bit tied up, next week I'll be able to > help you a > > > > > > > > > bit more. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ``` > > > > > > > > > > Format: > http://www.debian.org/doc/packaging-manuals/copyright-format/ > > > > > > > > > > 1.0/ > > > > > > > > > > Source: http://www.vtk.org/ > > > > > > > > > > Upstream-Name: Visualization Toolkit > > > > > > > > > > Files-Excluded: > > > > > > > > > > Web/* > > > > > > > > > > Examples/GUI/Win32 > > > > > > > > > > [...] > > > > > > > > > > ``` > > > > > > > > > > I'm not sure why the warnings still show up. Any idea? > > > > > > > > > > > > > > > > > > > > Cheers, > > > > > > > > > > Nico > > > > > > > > > > > > > > > > > > > > On Tue, May 16, 2017 at 5:56 PM Nico Schlömer > <[email protected] > > > > > > > > > > om> wrote: > > > > > > > > > > > > Actually, I git it to build in a clean environment > without that > > > > > > > > > > > > dependency. Why did you add it? > > > > > > > > > > > > > > > > > > > > > > I don't remember now. I've played around with VTK > master for a long > > > > > > > > > > > time before 7.1.1 came out (with fixes I had applied > upstream), so > > > > > > > > > > > it might have been from there. Anyways, good news! > > > > > > > > > > > > > > > > > > > > > > I'll see about the other things you mentioned in your > previous > > > > > > > > > > > mail. > > > > > > > > > > > > > > > > > > > > > > Cheers, > > > > > > > > > > > Nico > > > > > > > > > > > > > > > > > > > > > > On Tue, May 16, 2017 at 5:51 PM Gert Wollny < > [email protected]> > > > > > > > > > > > wrote: > > > > > > > > > > > > Am Dienstag, den 16.05.2017, 15:07 +0200 schrieb > Gert Wollny: > > > > > > > > > > > > > Am Dienstag, den 16.05.2017, 11:25 +0000 schrieb > Nico Schlömer: > > > > > > > > > > > > > > > I had to refresh the quilt patches (I've > pushed the > > > > > > > > > > > > changes), > > > > > > > > > > > > > > > but > > > > > > > > > > > > > > > > > > > > > > > > > > > > now > > > > > > > > > > > > > > > I'm missing a package > "happycoders-libsocket-dev" that > > > > > > > > > > > > doesn't > > > > > > > > > > > > > > > seem > > > > > > > > > > > > > > > > > > > > > > > > > > > > to > > > > > > > > > > > > > > > be available in unstable (but it is in > Ubuntu), so I'm a > > > > > > > > > > > > bit > > > > > > > > > > > > > > > lost. > > > > > > > > > > > > > > > > > > > > > > > > > > > > Aha. I indeed compiled all of it on ubuntu [1]. > Is there a > > > > > > > > > > > > Debian- > > > > > > > > > > > > > > equivalent of libsocket-dev perhaps? > > > > > > > > > > > > > > > > > > > > > > > > Actually, I git it to build in a clean environment > without that > > > > > > > > > > > > dependency. Why did you add it? > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Best, > > > > > > > > > > > > Gert > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >
