summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorMichael Vogt <egon@tas>2008-10-31 21:03:19 +0100
committerMichael Vogt <egon@tas>2008-10-31 21:03:19 +0100
commite9120a9931b6914bb7d169dc1e068edf60b03efb (patch)
treed9ef8b4a168726b75385207131082fdaa818f854 /debian/rules
parent708ead3a44ac2f5ea625343c5d1b3404cca8a481 (diff)
parentdac074b0ad8925ea542edea8ffd113736364344e (diff)
* debian/rules:
- Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". - Added 'python-apt' to Suggests, as apt-mark need it for work. - Drop Debian revision from 'doc-base' build dependency, this fixes appropriate lintian warning. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. * debian/{postrm,prerm,preinst}: - Added 'set -e', fixes lintian warnings 'maintainer-script-ignores-error'. * dselect/makefile: - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. * share/lintian-overrides: - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. * cmdline/apt-key: - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' failure when GREP_OPTIONS contains options that modify grep output. (Closes: #428752)
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index 006d2de8a..f6ff3c47a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,8 +125,8 @@ build/build-doc-stamp: build/configure-stamp
clean:
dh_testdir
# dh_testroot
- -$(MAKE) clean
- -$(MAKE) distclean
+ [ -f Makefile ] && $(MAKE) clean
+ [ -f Makefile ] && $(MAKE) distclean
rm -rf build
@@ -217,6 +217,9 @@ apt: build debian/shlibs.local
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
# head -n 500 ChangeLog > debian/ChangeLog
+ # 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