From 063a17d7a9f9f6195067df46220be02c4f5f5d32 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 15 Jan 2011 23:08:22 +0100 Subject: move the lintian-overrides into the debian directory --- debian/apt.dirs | 1 - debian/apt.lintian-overrides | 3 +++ debian/rules | 4 +--- share/lintian-overrides | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 debian/apt.lintian-overrides delete mode 100644 share/lintian-overrides diff --git a/debian/apt.dirs b/debian/apt.dirs index f25e4600b..2770d79bb 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -13,4 +13,3 @@ var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt -usr/share/lintian/overrides diff --git a/debian/apt.lintian-overrides b/debian/apt.lintian-overrides new file mode 100644 index 000000000..49c5ce53c --- /dev/null +++ b/debian/apt.lintian-overrides @@ -0,0 +1,3 @@ +# apt-mark is rarely used auxiliary script, we don't want to depend on +# python-apt only for it. +apt binary: python-script-but-no-python-dep ./usr/bin/apt-mark diff --git a/debian/rules b/debian/rules index fd872b4ce..1c5b6d515 100755 --- a/debian/rules +++ b/debian/rules @@ -193,9 +193,6 @@ apt: build build-doc cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove - # copy lintian override - cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt - # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir rm -f build/po/*.pot @@ -205,6 +202,7 @@ apt: build build-doc #mv debian/$@/usr/bin/apt-report-mirror-failure \ # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ diff --git a/share/lintian-overrides b/share/lintian-overrides deleted file mode 100644 index 49c5ce53c..000000000 --- a/share/lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# apt-mark is rarely used auxiliary script, we don't want to depend on -# python-apt only for it. -apt binary: python-script-but-no-python-dep ./usr/bin/apt-mark -- cgit v1.2.3