Hi, On Tue, Feb 14, 2023 at 6:18 PM Bastian Germann <[email protected]> wrote: > > Please see the changes in https://salsa.debian.org/debian/genparse by Boyuan > Yang and integrate yours there. > I am then going to sponsor what comes out of that. thanks.
Now I have fixed the issue left by Boyuan: ``` ... To access further information about this package, please visit the following URL: https://mentors.debian.net/package/genparse/ Alternatively, you can download the package with 'dget' using this command: dget -x https://mentors.debian.net/debian/pool/main/g/genparse/genparse_0.9.3-1.dsc Changes since the last upload: genparse (0.9.3-1) unstable; urgency=medium . * QA upload. . [Boyuan Yang] * New upstream version 0.9.3. * debian/: Apply wrap-and-sort -abst. * Bump debhelper compat to v13. * debian/control: Use correct Vcs-* fields. * debian/control: Drop unnecessay dependency on dpkg. * Add new build-dependency autoconf-archive to use obsolete autoconf macro AC_CHECK_CLASS. * debian/rules: Modernize. * debian/rules: Use c++14 standard to avoid FTBFS caused by C++17 disallowing dynamic exception specification. (Closes: #984149) * debian/genparse.install: Rename from genparse.files. * debian/patches: Drop all old patches, merged upstream. . [Bo YU] * debian/patches: Add c+=14 flag for test file to pass test. * Remove debian/genparse.install file * Remove debian/genparse.lintian-overrides ``` The trouble is how to push these commit. Because there is 0.9.2-2 version on Debian archive : https://deb.debian.org/debian/pool/main/g/genparse/genparse_0.9.2-2.dsc, so everything became harder. I have to put `0.9.2-2` entry into changelog in order. 1. I git reset all commits from Boyuan; 2. gbp import-dsc 0.9.2-2.dsc 3. try to build 0.9.2-2, ok, expect to fail due to #984149 4. cherry-pick commits from Boyuan then. 5. Add my change here. So basically we can here: ``` On branch master Your branch and 'origin/master' have diverged, and have 20 and 13 different commits each, respectively. (use "git pull" to merge the remote branch into yours) ``` I think here I have to push these commits with force options, right? It should be safe. Here is my tree log: https://paste.debian.net/1270834/ The oldest commit is 482956963da. BR, Bo
