diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/apt-doc.docs | 1 | ||||
-rw-r--r-- | debian/apt.conf.autoremove | 2 | ||||
-rw-r--r-- | debian/apt.install.in | 2 | ||||
-rw-r--r-- | debian/apt.maintscript | 3 | ||||
-rw-r--r-- | debian/changelog | 96 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/libapt-pkg4.13.install.in (renamed from debian/libapt-pkg4.12.install.in) | 0 | ||||
-rw-r--r-- | debian/libapt-pkg4.13.symbols (renamed from debian/libapt-pkg4.12.symbols) | 2 | ||||
-rwxr-xr-x | debian/rules | 2 |
9 files changed, 107 insertions, 5 deletions
diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index 4ec23f55d..df9701123 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1,3 +1,2 @@ README.progress-reporting -README.MultiArch doc/external-dependency-solver-protocol.txt diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index cf69d56c3..fc02350ae 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -22,6 +22,8 @@ APT ".*-modules"; ".*-kernel"; "linux-backports-modules-.*"; + # tools + "linux-tools"; }; Never-MarkAuto-Sections diff --git a/debian/apt.install.in b/debian/apt.install.in index 4ffe43e3b..9c9489572 100644 --- a/debian/apt.install.in +++ b/debian/apt.install.in @@ -3,4 +3,4 @@ bin/apt-* usr/bin/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ usr/share/locale/*/*/apt.mo -bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/
\ No newline at end of file +bin/libapt-private.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/apt.maintscript b/debian/apt.maintscript new file mode 100644 index 000000000..939769355 --- /dev/null +++ b/debian/apt.maintscript @@ -0,0 +1,3 @@ +rm_conffile /etc/apt/apt.conf.d/20changelog 1.0.3 -- "@" + + diff --git a/debian/changelog b/debian/changelog index d3beac0ef..ce57ed639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,99 @@ +apt (1.1~exp1) UNRELEASED; urgency=low + + [ Michael Vogt ] + * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: + - fix invalid InRelease file download checking and add regression + test to server broken files to the buildin test webserver + * stop exporting the accidently exported parsenetrc() symbol + * [ABI-Break] lp:~mvo/apt/source-hashes: + - use sha{512,256,1} for deb-src when available LP: #1098738 + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 07 May 2014 17:48:24 +0200 + +apt (1.0.3) unstable; urgency=medium + + [ Michael Vogt ] + * reduce delta to ubuntu + * provide support for vendor specific config files + * debian/apt-doc.docs: remove README.MultiArch + * Fix missing ScreenWidth check in apt.cc + * Only do openpty() if both stdin/stdout are terminals (Closes: 746434) + + [ David Kalnischkies ] + * add a README for vendor information + * remove outdated README.MultiArch + * build http request in a stringstream + * enforce LFS for partial files in https range requests + * handle pkgnames shorter than modifiers (Closes: 744940) + * allow vendors to install configuration files + + [ John Ogness ] + * properly undo CD-ROM mount in all error cases + + [ Mahyuddin Ramli ] + * add vendor information for BlankOn (Closes: 743595) + + [ Adam Conrad ] + * fix FileFd::Size bitswap on big-endian architectures (Closes: 745866) + + [ Trần Ngọc Quân ] + * l10n: vi.po: Update one new string + + -- Michael Vogt <mvo@debian.org> Mon, 05 May 2014 14:03:15 +0200 + +apt (1.0.2) unstable; urgency=medium + + [ Michael Vogt ] + * fix apt list output for pkgs in dpkg ^rc state + * Notice the user about "apt list -a" when only a single hit if found + * fix test-failure in adt + * apt-private/acqprogress.cc: fix output when ctrl-c is hit during + apt update (LP: #1310548, closes: #744297) + * Fix option name DPkg::Progress-Fancy in apt.8 manpage + (LP: #1310506) + + [ David Kalnischkies ] + * don't double-count seeks in FileFd::Skip for bzip/xz + * deal with umask only if we really need to for mkstemp + * consider priorities only for downloadable pkgs in resolver + * force fancy progressbar redraw on window size change + * clear HitEof flag in FileFd::Seek + * use Google C++ Testing Framework for libapt tests + * support dist-upgrade options in full-upgrade + + [ Trần Ngọc Quân ] + * l10n: vi.po (624t): Update translation + + [ Theppitak Karoonboonyanan ] + * Updated Thai program translation (closes: #745120) + + [ James McCoy ] + * Consistently use Dpkg::Progress* in documentation (Closes: 745452) + + -- Michael Vogt <mvo@debian.org> Fri, 25 Apr 2014 13:15:03 +0200 + +apt (1.0.1) unstable; urgency=medium + + [ Michael Vogt ] + * Fix crash in "apt list" when a sources.list file is unreable + (Closes: 743413) + * make apt search case-insensitive by default + * Fix possible race when stunnel/aptwebserver create their PID files + in the tests + * Fix insecure file permissions when using FileFd with OpenMode::Atomic + (LP: #1304657) + + [ Julian Andres Klode ] + * Version the Breaks/Replaces for sun-java{5,6}-jdk (LP: #1302736) + (Closes: #743616) + * Add versioned openjdk-6-jdk breaks + + [ Josef Vitu ] + * apt: Minor typo in 'apt' man page (closes: #743657) + + -- Michael Vogt <mvo@debian.org> Thu, 10 Apr 2014 09:48:56 +0200 + apt (1.0) unstable; urgency=low The "Happy birthday and 10000b years in the making" release diff --git a/debian/control b/debian/control index c0526d30c..4c795cf30 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, liblzma-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), - autotools-dev, autoconf, automake + autotools-dev, autoconf, automake, libgtest-dev Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git @@ -38,7 +38,7 @@ Description: commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys -Package: libapt-pkg4.12 +Package: libapt-pkg4.13 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.13.install.in index 56bed39d3..56bed39d3 100644 --- a/debian/libapt-pkg4.12.install.in +++ b/debian/libapt-pkg4.13.install.in diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.13.symbols index 5d7b21f10..9b280c040 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.13.symbols @@ -1,4 +1,4 @@ -libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# +libapt-pkg.so.4.13 libapt-pkg4.13 #MINVER# * Build-Depends-Package: libapt-pkg-dev TFRewritePackageOrder@Base 0.8.0 TFRewriteSourceOrder@Base 0.8.0 diff --git a/debian/rules b/debian/rules index eec016607..f8b392986 100755 --- a/debian/rules +++ b/debian/rules @@ -189,6 +189,8 @@ apt: build-binary build-manpages debian/apt.install cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal + # install vendor specific apt confs + find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir |