Merge ~paelzer/ubuntu/+source/vblade:merge into ~ubuntu-server-dev/ubuntu/+source/vblade:ubuntu/devel
Status: | Merged |
---|---|
Merged at revision: | 7a87c990ad695b7af589a9c518516915ab7855ea |
Proposed branch: | ~paelzer/ubuntu/+source/vblade:merge |
Merge into: | ~ubuntu-server-dev/ubuntu/+source/vblade:ubuntu/devel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robie Basak | Approve | ||
Review via email:
|
Description of the change
vblade (22-1ubuntu1) xenial; urgency=medium
* Merge from Debian
* Drop changes:
- Init scripts
- vblade-persist depencency change from recommended to suggested
(this was missing as delta in former changelogs, now behaves as in Debian)
* Remaining changes:
- Update maintainer according to spec.
* init script and its config are conffiles, so dropping them requires
cleaning them up via d/vblade.
- this is a prep step to be able convert the package to a sync in the next
upgrade
* d/vblade.NEWS contains some extra pointers how to handle the transition
for former users of the conffiles
-- Christian Ehrhardt <email address hidden> Mon, 15 Feb 2016 15:19:13 +0100
vblade (22-1) unstable; urgency=low
* New upstream release:
- Add big-endian support.
- Buffer boundary cleanups.
- FreeBSD BPF and MTU fixes.
- New offset and size options.
* Moved to 3.0 (quilt) format.
* debian/control:
- Bumped Standards-Version to 3.9.6 (no changes).
- Added Vcs-Browser/
* debian/patches:
- no_hyphens_
- hardening_ldflags: New, to add CFLAGS/
* debian/watch: Added.
* debian/rules: Moved it to dh and simplified a lot, while adding hardening.
* debian/compat: Bumped to 9 to benefit among others of dpkg-buildflags.
* debian/copyright: Moved it to DEP5 format.
Looks good, thanks!
A couple of really minor suggestions to debian/changelog: https:/ /git.launchpad. net/~racb/ ubuntu/ +source/ vblade/ log/?h= merge
1. Document why we're causing users inconvenience
2. No need to document update-maintainer change (this is implied in all Ubuntu merges - I guess this got carried forward all the way from before we had settled on this)
If this looks good to you, I'll upload.