On Tue, Mar 27, 2018 at 01:40:28AM -0500, Kurt Kremitzki wrote: > Ok, I've concluded the next round of work on the package. I recreated the > repo with `gbp import-dscs --debsnap`. I moved my d/watch and > +Files-Excluded d/copyright file but ran into issues with missing files > (e.g. src/Standard file and folders was totally missing) when trying to do > `gbp import-orig --uscan`. I ended up just importing from the .orig.tar.gz > and manually cleaning out the problematic copyright files with `git > filter-branch`. This also required a little patch to remove references to > the deleted samples in the doc build.
Ok, strange, because Files-Excluded usually works really nicely... Maybe a bug in mk-origtargz? Please note that repackaging requires you to suffix the upstream version with "+dfsg" (as we've removed files due to DFSG reasons). I've patched d/changelog and d/watch, MR will follow. Another MR is asking you to add me as Uploader... (Of course only if you want) The advantage is that I could have commited all those fixed directly and have uploaded the package already ;-)) If accepted, please also add me to the repo so that I can directly commit. > I also added things to d/copyright per your review recommendations. > > > - d/changelog.gz / changelog.html.gz > > I decided to remove d/changelog.gz & d/changelog.html.gz as well. > > - d/patches > > - did you check with upstream whether they would accept the patches, > > especially fix-install-dir-references.diff. > > I will work on getting this and the manpage upstreamed. > > - lintian overrides > > I cleaned these up. > > > - script-not-executeable > > You writd in the override:# /usr/share/occt/bin/*.sh are reference > scripts > > Can you expand what you mean? Are they examples? Are they > > needed? For what are they needed? > > One of the scripts references DRAWEXE which is listed > > in d/non-installed > > Yes, part of Draw's purpose is testing and demonstrating OCCT behavior with > tweaked dependencies, so these scripts are a reference for environment > variable tweaks which can be done in a wrapper script around the occt-draw > binary. > > > - test suite > > You write in the lintian override that runs only under Windows with a > > custom occt-draw.. Can you elaborate? What is the difference to the > > occt-draw we ship? > > To be honest, I will need to iterate on the occt-draw package. The upstream > devs mainly use Windows so things don't work perfectly out of the box right > now (although they do work.) Once they do, I will integrate the upstream > test suite (which itself uses occt-draw) into the Debian package. OK, IMHO we can work on it after the initial upload too, no need to have this perfect from the beginning. > > - occt-doc > > Renamed. > > > - the xpm images... > > Where are they from? What is the copyright? > > This is a bit of a tricky question--they are definitely derived from > upstream's logo (see opencascade.com) which is included in the source as > ./src/DrawResources/OCC_logo.png. These .xpm files first appeared in the 6th > revision of the first version packaged for Debian, 6.2-6. However, they are > not explicitly mentioned in the changelog or elsewhere. I believe the files > were made manually by the former maintainer Adam C. Powell IV by modifying > the aforementioned source image (which contains the text "OpenCASCADE") by > cropping most out of the text out and changing filetypes (the .xpm files > just say 'OCC' with the same font as the upstream file. > > So, I'm not sure if they should go in with the debian/* stanza in > d/copyright which includes Mr. Powell, or in the upstream stanza for * > files. Assuming it's a derivative work, albeit a trivial one, I've decided > to lump it in with the debian/* stanza currently. I think this is right. > > - symbol files > > I cleaned things up with c++filt and removed the offending symbols you > mentioned, but this now results in a lintian error--not sure if I should > override it or what. Actually should be fixed in the source, but I guess for now just mark it as "optional" in the symbols file, as this is clearly a private symbol causing this... Sorry, I ran out of time also to provide a patch for this.. > So, hopefully that summarizes what's new in my repo on salsa.d.o. Remember > that I remade the repo so a fresh clone will be needed. Crossing my fingers > that there won't be much more before this package is ready! Unfortuantly without the pristine-tars from debsnap ;-( But I think we can add them manually to the branch later. (I did so, currently pushing to my forked project @ salsa, but I ran out of time and could not test it before.. Please Make sure to test if building is still working before merging it!) -- tobi
