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.

8 files changed, 1 insertions, 13 deletions

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 <debian-dpkg@lists.debian.org>
 Uploaders: Guillem Jover <guillem@debian.org>
-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