Thanks, a lot of good work there. This is not the easiest merge to do, with many old Ubuntu changes in awkward places. Just a style matter though, please make the changelog: "Merge from Debian unstable (LP: #153572), remaining changes:". For the maintainer field see <https://wiki.ubuntu.com/DebianMaintainerField>.
The 09-autoconf.patch issue is a little tricky, and please someone correct me if I get this wrong in the following guesswork: autoconf will use aclocal.m4 while generating configure from configure.in. The Debian packager will usually run autoconf (through autoreconf) to generate configure after applying patches and before building diff.gz. Usually when building the package in Ubuntu one does not rerun autoreconf, so the Ubuntu debdiff should contain (inline) the generated changes to configure. If you need Ubuntu changes in configure, you should therefore edit configure.in (and aclocal.m4) and rerun autoreconf. Or is there a prettier way to do it? Just edit configure and not touch configure.in since autoreconf will not be run again anyway? I have some more questions, not that something necessarily is wrong, but I don't get it: 1. What is the bzip2 archive in question? 2. Do we need the get-orig-source in the Ubuntu delta - it should rather be in Debian, right? 3. 08-lpi.patch has the "launchpad-integration" line twice? I can see this in 09-autoconf.patch also. 4. Why do we need --maintainer-mode if Debian doesn't? -- Merge 2.10.8-1 from debian unstable https://bugs.launchpad.net/bugs/153572 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
