> Applied-Upstream: 3.6.10
suggests it would be in any >=3.6.10 but you have fixes for B/C/D/E which means that can't be true.
It should be upstream or at least acknowledged in Debian to fix it this way to not become a long term maintenance Debt.
Please add a ref to a Debian bug to the headers once you created one.
"Origin: backport" also suggests this is upstream somewhere, but you'd need to append the URL like
"Origin: backport, <url-to-original-git-commit>
The "not needed if author is present" isn't true in most cases - best practice - always add such an URL
Please find how this was fixed upstream (if it was) and update the two tags as mentioned above.
The situation is that the version number is being set in their own release machinery. We're using basically the same sed command but need to apply it in a makefile. So, while we're doing the same thing as upstream, the patch itself needs to live in our delta (or Debian's rather -- see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908690.) Since it was provided by a community member, then looking at DEP3 requirements it looks like it should be listed as from 'other', and marked as not for upstream.
You may have already seen on the bug report, but the original packager is looking into those questions (see below).
When I looked at it initially, I got the impression the prepare-dist route would be appropriate only when creating the orig tarball, so Alvin's approach looked cleaner if done as a packaging patch. But can wait and see what upstream says.
"""
Hi Bryce,
I looked into the Makefile and it seems that prepare-dist target is used when producing the erlang plugin archives (.ez files) and not when building the package itself. Based on the build server documentation[1], all is the default target that is why I used that fix. There's a difference between the sed commands though, the fix replaces the version inline the rabbitmqadmin file itself but for prepare-dist it's generating a new file.
Sorry just to be clear, upstream is the rabbitmq-server repository itself right? I haven't approach them about this problem and whether it's a good fix. I'll do that and get back to you.
Thanks for the info Bryce, TBH I haven't checked the bug updates before now.
I think it is fine to wait for what Debian is doing.
The only thing I wonder is if we should/could set the MPs (4) to "work in progress" or "rejected" for now. Once available again you can refresh them as needed and set them back.
That way they would be out of our overview as long as they are not actionable.
New changelog entries:
* Resolve issues with startup of RabbitMQ with erlang provided
epmd daemon (LP: #1808766):
- d/rabbitmq-server.service: Wants/After epmd.socket, aligning
with services actually provided by erlang in Ubuntu.
- d/control: Bump minimum erlang-* package versions to ensure
compatibility with epmd.socket configuration.
New changelog entries:
[ Corey Bryant ]
* d/gbp.conf: Update gbp configuration file.
* d/control: Update Vcs-* links and maintainers.
* d/control: Set minimum erlang dependencies to 1:21.1.1, according to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909941#32.
[ James Page ]
* d/control,rules: Switch to using Python 3.
1fee780...
by
Thomas Goirand <email address hidden>
Import patches-unapplied version 3.7.8-4 to debian/sid
New changelog entries:
[ Daniel Baumann ]
* Updating vcs fields.
* Updating copyright format url.
* Updating maintainer field.
* Running wrap-and-sort -bast.
* Updating standards version to 4.0.0.
* Removing gbp.conf, not used anymore or should be specified in the
developers dotfiles.
* Correcting permissions in debian packaging files.
* Updating standards version to 4.0.1.
* Deprecating priority extra as per policy 4.0.1.
* Updating standards version to 4.1.0.
[ Ondřej Nový ]
* d/control: Set Vcs-* to salsa.debian.org
* d/changelog: Remove trailing whitespaces
* d/control: Use <email address hidden> as maintainer
[ Thomas Goirand ]
* New upstream release:
- Fix FTBFS with newer Erlang (Closes: #910623).
* Fix the way to calculate upstream VERSION in debian/rules.
* Switched rabbitmq-server.service to type notify, and other minor changes
in this file (Closes: #812342), do not wait for timeout on shutdown either
(Closes: #902136).
* Updated debian/control for this release.
* Bumped debhelper to 10.
* Standards-Version is now 4.2.1.
* Add patch to accept Elixir 1.6.5.
* Also package manpages.
be2ea2d...
by
Thomas Goirand <email address hidden>
Import patches-unapplied version 3.6.10-1 to debian/sid
New changelog entries:
[ Ondřej Nový ]
* Team upload.
* New upstream release (Closes: #849849, CVE-2016-9877)
* d/copyright: Fixed for new release
* d/ocf: Removed, use upstream one
87c099d...
by
Thomas Goirand <email address hidden>
Import patches-unapplied version 3.6.5-1 to debian/sid
New changelog entries:
[ James Page ]
* New upstream release (Closes: #812377):
- Builds fine with the new erlang (Closes: #837241).
* [fa2d29e] Update watch file for upstream xz compression. (Closes: #813628).
* [b008e08] Imported Upstream version 3.6.0.
* [d0dc477] Update gbp configuration for dch use.
[ Thomas Goirand ]
* Also packaging the rabbitmqadmin cli.
* Do not do dh_auto_clean, as it removes all the deps folder.
* Disabled tests, as they download from github.
* Replaced git-core transition package by git in build-depends.
* Added rsync as build-depends-indep.
* Fix DESTDIR=$(DEB_DESTDIR) PREFIX=/usr as upstream Makefile changed.
* Added python-all and dh-python as build-depends.
* Update of debian/copyright for the new deps/* path from upstream, updated
debian/* info and fixed order.
* Copy some stuff from the upstream pacakging in debian/rules.
* Runtime depends on lsb-base.
* Overrides lintian false positive error js source missing.
[ Ondřej Nový ]
* Fixed VCS URLs (https).
* Fixed python shebang.
* Standards-Version is 3.9.8 now (no change).
> Applied-Upstream: 3.6.10
suggests it would be in any >=3.6.10 but you have fixes for B/C/D/E which means that can't be true.
It should be upstream or at least acknowledged in Debian to fix it this way to not become a long term maintenance Debt.
Please add a ref to a Debian bug to the headers once you created one.
"Origin: backport" also suggests this is upstream somewhere, but you'd need to append the URL like original- git-commit>
"Origin: backport, <url-to-
The "not needed if author is present" isn't true in most cases - best practice - always add such an URL
Please find how this was fixed upstream (if it was) and update the two tags as mentioned above.