Merge lp://qastaging/~noskcaj/ubuntu/trusty/libbsd/merge into lp://qastaging/ubuntu/trusty/libbsd
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/libbsd/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/libbsd |
| Diff against target: |
422 lines (+306/-26) 8 files modified
debian/README.Debian (+0/-8) debian/changelog (+29/-4) debian/control (+5/-6) debian/copyright (+0/-3) debian/libbsd-dev.postinst (+157/-4) debian/source/options (+0/-1) debian/upstream/signing-key.asc (+114/-0) debian/watch (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/libbsd/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. Fixes conflict with libelf-dev + packaging improvements
Unmerged revisions
- 17. By Jackson Doak
-
update-maintainer
- 16. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Use dh-autoreconf to update config files.
- Don't run the tests for cross builds.
* Take over standalone maintainership.
<https://lists. debian. org/debian- bsd/2013/ 10/msg00227. html>.
* Now using Standards-Version 3.9.5 (no changes needed).
* Do not set source compression to xz, it's now the default.
* Remove packaging history from debian/copyright.
* Add signature checking support to debian/watch, and ship upstream
signing keys in debian/upstream/ signing- key.asc, exported with
pgp-clean (signing-party) to avoid useless bloat.
* Only restore /usr/include/nlist.h if it's missing, or if it contains
a libbsd instance of the header. And use the matching header from the
replaced package, which should now be ABI-compatible. (Closes: #724747)
* Remove debian/README. Debian, which contains information provided in the
package description.
* Re-enable libbsd-udeb package on all architectures, as rdate-udeb
* Restrict the udeb package to kfreebsd-*, as requested by Otavio Salvador.
* Improve package descriptions.
Thanks. Uploaded.