From eda1bb3c93661da4640026153d371c474f720d28 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Apr 2006 09:48:52 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to mdz) * debian/changelog: updated * debian/rules: invoke tar with --no-recursion to avoid cruft in the tarbal * po/apt-all.pot: updated --- debian/changelog | 8 +++++--- debian/rules | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd391c972..07cebb23c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ apt (0.6.43.4) unstable; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large - * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + * apt-pkg/deb/dpkgpm.cc: + - wording fixes (thanks to Matt Zimmerman) + - fix error in dpkg interaction (closes: #364513, + thanks to Martin Dickopp) * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: * bg.po: Added, complete to 512t. Closes: #360262 - - -- + -- Michael Vogt Tue, 25 Apr 2006 09:34:20 +0200 apt (0.6.43.3) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 5647ebd23..a8bf88762 100755 --- a/debian/rules +++ b/debian/rules @@ -336,6 +336,6 @@ cvs-mkul: arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) - tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) + tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) -- cgit v1.2.3