Unverified Commit dd1b936d authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

Move the patches tweaking the default servers out of d/patches, and inject them through d/rules 



The ctte decided that vendored series files are not allowed in the
Debian archive, see #904302.

Also move the patch files out of d/patches to avoid
patch-file-present-but-not-mentioned-in-series

Closes: #915350
Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent baaa4eaf
Show whitespace changes
Inline Side-by-side
  • Chris Lamb 👀 @lamby ·
    Maintainer

    Hmpf, this is really ugly. :(

  • Mattia Rizzolo @mattia ·
    Author Maintainer

    I've been thinking about how to do this for a long time (since the vendored series file was bothersome to maintain anyway), but that's the best I could come up with… But whatever I can come up with will always be ugly compared to the "descriptiveness" of the vendored series files...

    At least I know upstream had some vague plans (still in vaporware form) to support something natively.

  • Chris Lamb 👀 @lamby ·
    Maintainer

    https://bugs.debian.org/850156#25 Seems like we're not the only ones.....

  • Chris Lamb 👀 @lamby ·
    Maintainer

    Hm, could we write a /usr/share/dpkg/shiver-me-vendor-patches-laddie.mk file that we could include instead...?

  • Mattia Rizzolo @mattia ·
    Author Maintainer

    I don't think it would be worth.

    After all, https://lintian.debian.org/tags/package-uses-vendor-specific-patch-series.html only lists 16 packages, that's very few. For how annoying doing this kind of stuff in d/rules might be, it's completely doable for so few packages.

  • Mike Gabriel @sunweaver ·
    Maintainer

    From what I got from the Ubuntu devs (I guess it was in a post to that techctte bug), the best approach for them is omitting Ubuntu specific things in Debian and upload a delta pkg directly to Ubuntu.

  • Mattia Rizzolo @mattia ·
    Author Maintainer

    Maybe. Or maybe not. As an Ubuntu developer myself (even if not really so active) I'm pretty sure I prefer to have a few messy lines in a d/rules and have the package in sync than having a silly delta that would cause me to do a double upload every time I upload hexchat.

    Now, I'm not bothered (nor bored) enough to read through the ctte bug and see who made such statement, but I'd be happy to rise some comments if my eyes came upon them :)

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment