This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=0badaf9f58cf40c06180d2d511ebd1795682dd54 commit 0badaf9f58cf40c06180d2d511ebd1795682dd54 Author: Guillem Jover <[email protected]> AuthorDate: Fri Feb 22 01:42:47 2019 +0100 debian: Remove Origin and Bugs fields from control file These fields have been there mostly to showcase their usage, which should instead be dynamically added at build-time, and as a reminder that this should be done. But there is already a bug filed as a reminder (see #511160), they are also now documented in the deb-src-control(5) man page, they are actually wrong in many cases when present on a downstream, and they generate nagging lintian warnings to boot. --- Makefile.am | 5 ----- debian/changelog | 1 + debian/control | 2 -- debian/dpkg-dev.lintian-overrides | 2 -- debian/dpkg.lintian-overrides | 2 -- debian/dselect.lintian-overrides | 2 -- debian/libdpkg-dev.lintian-overrides | 2 -- debian/libdpkg-perl.lintian-overrides | 2 -- debian/source/lintian-overrides | 1 - 9 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index b78bb6f5b..d77292da7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,6 @@ EXTRA_DIST = \ debian/dpkg-dev.docs \ debian/dpkg-dev.install \ debian/dpkg-dev.manpages \ - debian/dpkg-dev.lintian-overrides \ debian/dpkg.alternatives.logrotate \ debian/dpkg.cfg \ debian/dpkg.cron.daily \ @@ -67,14 +66,10 @@ EXTRA_DIST = \ debian/dselect.docs \ debian/dselect.install \ debian/dselect.manpages \ - debian/dselect.lintian-overrides \ debian/libdpkg-dev.docs \ debian/libdpkg-dev.install \ - debian/libdpkg-dev.lintian-overrides \ debian/libdpkg-perl.docs \ debian/libdpkg-perl.install \ - debian/libdpkg-perl.lintian-overrides \ - debian/source/lintian-overrides \ debian/source/format \ debian/usertags \ debian/rules \ diff --git a/debian/changelog b/debian/changelog index ea8435f91..0ceef6a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium - Bump Standards-Version to 4.3.0 (no changes required). - Remove now unused assert usertag description. - Remove trailing whitespace from changelog. + - Remove Origin and Bugs fields from control file. [ Updated programs translations ] * German (Sven Joachim). diff --git a/debian/control b/debian/control index d00e834ed..949df2566 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,6 @@ Section: admin Priority: required Maintainer: Dpkg Developers <[email protected]> Uploaders: Guillem Jover <[email protected]> -Origin: debian -Bugs: debbugs://bugs.debian.org Homepage: https://wiki.debian.org/Teams/Dpkg Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git diff --git a/debian/dpkg-dev.lintian-overrides b/debian/dpkg-dev.lintian-overrides deleted file mode 100644 index f6fcd08c5..000000000 --- a/debian/dpkg-dev.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -dpkg-dev: redundant-origin-field -dpkg-dev: redundant-bugs-field diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides index 66f96247a..2ee72d62a 100644 --- a/debian/dpkg.lintian-overrides +++ b/debian/dpkg.lintian-overrides @@ -1,3 +1 @@ -dpkg: redundant-origin-field -dpkg: redundant-bugs-field dpkg: arch-dep-package-has-big-usr-share diff --git a/debian/dselect.lintian-overrides b/debian/dselect.lintian-overrides deleted file mode 100644 index 2243de2cd..000000000 --- a/debian/dselect.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -dselect: redundant-origin-field -dselect: redundant-bugs-field diff --git a/debian/libdpkg-dev.lintian-overrides b/debian/libdpkg-dev.lintian-overrides deleted file mode 100644 index 83ff3f4e6..000000000 --- a/debian/libdpkg-dev.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libdpkg-dev: redundant-origin-field -libdpkg-dev: redundant-bugs-field diff --git a/debian/libdpkg-perl.lintian-overrides b/debian/libdpkg-perl.lintian-overrides deleted file mode 100644 index d7cd8a07b..000000000 --- a/debian/libdpkg-perl.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libdpkg-perl: redundant-origin-field -libdpkg-perl: redundant-bugs-field diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index 30cef6ffd..000000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -dpkg source: redundant-origin-field -- Dpkg.Org's dpkg
