Hello Hilko, I've pushed the merge result to the debian/master-merged branch. Can you review it?
If the review pass, the package already can be uploaded to unstable, we don't need to fix all lintian warnings in one iteration. Best wishes, Aleksey. On Fri, Jan 11, 2019 at 3:47 PM Aleksey Kravchenko <[email protected]> wrote: > Hello Hilko, > > we worked in parallel on libewf, sorry on that. I see today your upload to > experimental. > > We should constructively resolve this, before getting frozen :) > > I think we must merge now debian/experimental and debian/master branches > and discuss the differences, here is the full list of them: > > 1. d/changelog > * yours contains 20140608-6.1 upload > * changelog entries - I think we can leave your entries for the same > changes > 2. d/compat - 11 vs 12 > 3. d/control: > * b-depends: dh-python > * libewf-dev Multi-Arch,Conflicts,Replaces > * python-libewf: package renamed, Pre-Depends > 4. d/copyright > * Upstream*, Files* > * Removed unused common/memwatch.[ch] and GPL-2 section > 5. d/libewf3.symbols > * Build-Depends-Package: > * optional libc symbols > 6. d/not-installed vs dh_install -X.la -X/pyewf.a > 7. d/patches: > * fix of tests 0001-Fix-TEST_PREFIX-variable.patch vs > 01_fix_test_scripts.patch > * 02-fix-FTBS-libodraw_cue_parser-return-value.patch, > 03-fix-spelling-errors* patches > 8. python*-ewf.install vs python*-libewf.install > 9. d/rules - big difference > 10. d/upstream/signing-key.asc > 11. d/watch > (see git diff -u origin/debian/master origin/debian/experimental ) > > What do you think is the best option for merging? > (1) I do the merge in a separate branches and you review. > (2) You do the merge (with or without a review from me) > (3) I do the merge and ask for review on the list (if you lack the time) > (4) other??? > > I propose > 1. take d/compat: 12 > 2. take python*-ewf (without 'lib') package names > 3. take my d/patches/01_fix* > 4. more closelly discuss d/rules > What do you think? > > With best wishes, > Aleksey. > >
