diff options
| author | Michael Vogt <egon@bottom> | 2006-04-26 12:55:06 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-04-26 12:55:06 +0200 |
| commit | 2268ad65d9f36433f2b3d46e05e8782285641ee3 (patch) | |
| tree | c810ed490287038312ab32f8ced18e783aab8309 /debian | |
| parent | ce95a6f99ffa7bcb225bd9dd28dd73ee77553eb5 (diff) | |
| parent | 432b168ce4ec7a7c2caef44c0c8470c7197d58b3 (diff) | |
* merged with mainline
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9a7ee7213..65dc1e862 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.43.4) unstable; urgency=low +apt (0.6.44) unstable; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 @@ -7,6 +7,12 @@ apt (0.6.43.4) unstable; urgency=low (thanks to Anthony Towns) * apt pdiff support from experimental merged * 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) + * apt-pkg/tagfile.{cc,h}: + - use MMap to read the entries (thanks to Zephaniah E. Hull for the + patch) Closes: #350025 * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: * bg.po: Added, complete to 512t. Closes: #360262 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)) |