From: Michael Vogt Date: Tue, 28 Mar 2006 18:36:42 +0000 (+0200) Subject: * merged with mainline X-Git-Tag: 0.7.24ubuntu1~262 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/980380b06f67db21af59fb5014d9bc9304bace9c * merged with mainline --- 980380b06f67db21af59fb5014d9bc9304bace9c diff --cc debian/changelog index 89d418572,c8a3271de..98d5b0f6b --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,28 +1,58 @@@ - apt (0.6.43.2ubuntu2) dapper; urgency=low -apt (0.6.43.4) unstable; urgency=low ++apt (0.6.43.3ubuntu1) dapper; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large - -- Michael Vogt Tue, 28 Mar 2006 19:16:23 +0200 - -- ++ -- Michael Vogt Tue, 28 Mar 2006 20:34:46 +0200 + + apt (0.6.43.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 ++ * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings ++ * LINGUAS: Add Welsh ++ * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 - * zh_CN.po: Completed to 512t. Closes: #353936 - * it.po: Completed to 512t. Closes: #352803 - * pt_BR.po: Completed to 512t. Closes: #352419 ++ * apt-pkg/deb/deblistparser.cc: ++ - don't explode on a DepCompareOp in a Provides line, but warn about ++ it and ignore it otherwise (thanks to James Troup for reporting it) ++ * cmdline/apt-get.cc: ++ - don't lock the lists directory in DoInstall, breaks --print-uri ++ (thanks to James Troup for reporting it) ++ * debian/apt.dirs: create /etc/apt/sources.list.d ++ * make apt-cache madison work without deb-src entries (#352583) ++ * cmdline/apt-get.cc: only run the list-cleaner if a update was ++ successfull ++ * apt-get update errors are only warnings nowdays ++ * be more careful with the signature file on network failures ++ ++ -- Michael Vogt Wed, 22 Feb 2006 10:13:04 +0100 + +apt (0.6.43.2ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings * LINGUAS: Add Welsh * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 * apt-pkg/deb/deblistparser.cc: - don't explode on a DepCompareOp in a Provides line, but warn about it and ignore it otherwise (thanks to James Troup for reporting it) diff --cc debian/rules index 34c947c69,ebd3740fe..92931b6f8 --- a/debian/rules +++ b/debian/rules @@@ -340,6 -336,6 +341,6 @@@ cvs-mkul arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) - baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER) + tar -c --exclude=arch-build -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)