move the lintian-overrides into the debian directory

diff --git a/debian/apt.dirs b/debian/apt.dirs
index f25e4600b5f794218998852d6b7c918451d23188..2770d79bb630f6c7d50ec7fd1604937465ca4dc2 100644 (file)
--- 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
 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 (file)
index 0000000..49c5ce5
--- /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 fd872b4ce27cddb65711fad8cfcdf94dcf382386..1c5b6d51575576df6e27fe2bee71d221eb7221ff 100755 (executable)
--- 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
 
 
        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
        # 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 \
 
        #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$@
        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 (file)
index 49c5ce5..0000000
--- 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