Check all Description fields for correct use of dbus (package name) vs. D-Bus (project name), and override lintian false-positivesdebian/1.4.12-4

6 files changed, 13 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 72e7af24..2a7809d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dbus (1.4.12-4) unstable; urgency=low
 
   * Override missing-pre-dependency-on-multiarch-support for the -dev
     package, ftp-master doesn't have lintian 2.5.1 yet
+  * Check all Description fields for correct use of dbus (package name)
+    vs. D-Bus (project name), and override lintian false-positives
 
  -- Simon McVittie <smcv@debian.org>  Fri, 01 Jul 2011 07:55:01 +0100
 
diff --git a/debian/dbus-1-dbg.lintian-overrides b/debian/dbus-1-dbg.lintian-overrides
new file mode 100644
index 00000000..4281e3e2
--- /dev/null
+++ b/debian/dbus-1-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-1-dbg: capitalization-error-in-description dbus D-Bus
diff --git a/debian/dbus-1-doc.lintian-overrides b/debian/dbus-1-doc.lintian-overrides
new file mode 100644
index 00000000..b8fb8251
--- /dev/null
+++ b/debian/dbus-1-doc.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-1-doc: capitalization-error-in-description dbus D-Bus
diff --git a/debian/dbus-x11.lintian-overrides b/debian/dbus-x11.lintian-overrides
new file mode 100644
index 00000000..af6061fa
--- /dev/null
+++ b/debian/dbus-x11.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-x11: capitalization-error-in-description dbus D-Bus
diff --git a/debian/libdbus-1-3.lintian-overrides b/debian/libdbus-1-3.lintian-overrides
new file mode 100644
index 00000000..30ebce0a
--- /dev/null
+++ b/debian/libdbus-1-3.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+libdbus-1-3: capitalization-error-in-description dbus D-Bus
diff --git a/debian/libdbus-1-dev.lintian-overrides b/debian/libdbus-1-dev.lintian-overrides
index 40b89218..891b7215 100644
--- a/debian/libdbus-1-dev.lintian-overrides
+++ b/debian/libdbus-1-dev.lintian-overrides
@@ -1,3 +1,6 @@
 # false positive, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629648
 # remove this override when the ftp-masters install lintian 2.5.1
 libdbus-1-dev: missing-pre-dependency-on-multiarch-support
+
+# false positive: we only say dbus when talking about a package name
+libdbus-1-dev: capitalization-error-in-description dbus D-Bus