Comment 9 for bug 884185

Hi L3on,

Thanks for your work on that merge!

As a general rule, Ubuntu have to respect the patching system in place in Debian and we shouldn't be adding a patch system, except if we feel that the patch is complex and will be there for a long time.
In this case, the changes should be done inline as this is how it's done in Debian

Also, when merging a package from Debian, we should always challenge existing changes, meaning that we need to check if they still make sense or not.
In this case, without having a deep look, I feel like the NO_PKG_MANGLE may not be required anymore (it comes from feisty and is more than 4 years old). If you checked it already, then document it in the merge request.

Also, the changelog should clearly reflect what comes from older versions (under the "remaining changes" section) and what is new, that appear at the same level as the * line, like that:
  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Add support for Ubuntu Oneiric and Precise in config/suites
    - Set NO_PKG_MANGLE while building nested package in helper/Makefile.{in,am}
  * Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS
This makes clearer for next merger what has been introduced and when.
Also, I like to specify what has been dropped and why, so if you dropped the -U_FORTIFY_SOURCE change, an entry like this one make it clearer:
  * Dropped changes:
     - -U-FORTIFY: applied upstream.. (or whatever: I didnd't checked it :-) )

Please attach a new debdiff with those changes.

thanks again for your work!

Fabrice