diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 10:16:59 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-15 10:16:59 +0200 |
| commit | 5e4d60ae66873924815edb89d533faab7006a46b (patch) | |
| tree | c0e3c05585374c810100ad7bf6a9f283a7b52a3d /debian | |
| parent | 0dc01623882a8a51416e8635e76c941fc302abec (diff) | |
| parent | 1d08f27046533e36849a63c084f51809be484d8c (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.symbols | 1 | ||||
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 18 insertions, 6 deletions
diff --git a/debian/apt.symbols b/debian/apt.symbols index 04e13edd7..932fb1411 100644 --- a/debian/apt.symbols +++ b/debian/apt.symbols @@ -1256,7 +1256,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10 (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 1 (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 1 (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 1 - (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 1 (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4 1 (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 1 diff --git a/debian/changelog b/debian/changelog index cfb4094a6..a620b091b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,28 @@ -apt (0.8.15.2ubuntu1) UNRELEASEDoneiric; urgency=low +apt (0.8.15.2ubuntu1) oneiric; urgency=low + [ Michael Vogt ] * apt-pkg/acquire-item.cc: - improve error message for a expired Release file * apt-pkg/algorithms.cc: - Hold back packages that would enter "policy-broken" state on upgrade when doing a "apt-get upgrade" - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jul 2011 11:22:54 +0200 + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - fallback to memory if file is not writeable even if access() + told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) + * doc/sources.list.5.xml: + - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Jul 2011 10:16:45 +0200 apt (0.8.15.2) unstable; urgency=high diff --git a/debian/rules b/debian/rules index 93fdbd8da..d8e4a88bd 100755 --- a/debian/rules +++ b/debian/rules @@ -123,9 +123,6 @@ libapt-pkg-doc: build-doc # # libapt-pkg-doc install # - # remove doxygen's embedded jquery as we don't use it anyway (#622147) - rm -f $(BLD)/doc/doxygen/html/jquery.js - dh_installdocs -p$@ $(BLD)/docs/design* \ $(BLD)/docs/dpkg-tech* \ $(BLD)/docs/files* \ |