diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 207 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rw-r--r-- | debian/tests/run-tests | 4 |
6 files changed, 197 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog index ed8f68e43..b48a50f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,37 +1,163 @@ -apt (1.0.4ubuntu4) utopic; urgency=medium +apt (1.0.8ubuntu1) UNRELEASED; urgency=low - * test/integration/test-essential-force-loopbreak: - - fix test on non-amd64 systems + * merged fixes from debian/sid - -- Michael Vogt <mvo@ubuntu.com> Thu, 12 Jun 2014 10:56:09 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 10 Sep 2014 08:12:38 +0200 -apt (1.0.4ubuntu3) utopic; urgency=medium +apt (1.0.8) unstable; urgency=medium - * ensure that test-apt-ftparchive-cachedb-lp1274466, - test-external-dependency-solver-protocol run in the ADT - environment + [ Holger Wansing ] + * German program translation update (Closes: 758837) - -- Michael Vogt <mvo@ubuntu.com> Thu, 12 Jun 2014 08:47:29 +0200 + [ Américo Monteiro ] + * Portuguese manpages translation update (Closes: 759608) -apt (1.0.4ubuntu2) utopic; urgency=medium + [ Warren He ] + * initialize iPolicyBrokenCount in DepCache::Update (Closes: 758397) - * debian/test/control: - - add missing db-util to test dependencies - * debian/tests/run-tests: - - fix path for apt-internal-solver + [ Andreas Oberritter ] + * Avoid yielding blank lines with APT::Cmd::use-format=true - -- Michael Vogt <mvo@ubuntu.com> Wed, 11 Jun 2014 14:51:31 +0200 + [ Michael Vogt ] + * Make Proxy-Auto-Detect check for each host (Closes: #759264) + * Add testcase for apt list --all-versions + * * apt-pkg/deb/dpkgpm.cc: + - update string matching for dpkg I/O errors. (LP: #1363257) + - properly parse the dpkg status line so that package name + is properly set and an apport report is created. Thanks + to Anders Kaseorg for the patch (LP: #1353171) + * Use heap to allocate PatternMatch to avoid potential stack overflow + (Closes: 759612) + * Run autopkgtest tests with "env -i" to avoid pollution from the host env + (Closes: #759655) + * test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: + - use downloadfile() to fix test failure + * Fix incorrect upgradable listing in "apt list" + (thanks to Michael Musenbrock) (Closes: #753297) + * apt-pkg/cachefile.cc: + - ensure we have a Policy in CacheFile.BuildDepCache() + * methods/http.cc: + - Improve Debug::Acquire::http debug output -apt (1.0.4ubuntu1) utopic; urgency=low + [ Dimitri John Ledkov ] + * apt-ftparchive: make Packages & Sources generation optional, + during Generate call - * Merged from debian/sid, remaining changes: - - patch for apt cross-building, see http://bugs.debian.org/666772 - - ubuntu changelog download handling - - apt-key net-update/apt-xapian-index - - git-buildpackage config adjustments - - ubuntu keyring + [ David Kalnischkies ] + * support regular expressions in 'apt search' + * implement --full in apt search + * fix progress report for upgrade and reinstall + * rework PTY magic to fix stair-stepping on kfreebsd (Closes: 759684) + * don't call pager in non-terminals for changelog (Closes: 755040) - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jun 2014 19:00:00 +0200 + -- Michael Vogt <mvo@debian.org> Tue, 09 Sep 2014 20:09:11 +0200 + +apt (1.0.7) unstable; urgency=medium + + [ Michael Vogt ] + * add REAMDE.md + * StringToBool: only act if the entire string is consumed by strtol() + * Use @builddeps@ in the debian/tests/control file + * apt-pkg/acquire-item.cc: make pkgAcqDiffIndex more uniform + * Fix SmartConfigure to ignore ordering of packages that are already valid + * doc/apt.8.xml: fix typo, thanks to Jakub Wilk (Closes: #756056) + * doc/po/pt.po: updated, thanks to Américo Monteir (Closes: #756200) + + [ victory ] + * Update Japanese documentation translation (Closes: #754817) + + [ Trần Ngọc Quân ] + * l10n: vi.po (636t): Update one new string + + [ Julian Andres Klode ] + * Fix debListParser to accept "no" as a value for the Multi-Arch field + (Closes: #759099) + + [ Mert Dirik ] + * Turkish program translation update (Closes: 756710) + + [ Miroslav Kure ] + * Czech program translation update (Closes: 758208) + + [ David Kalnischkies ] + * add dpkg::source-options for dpkg-source invocation (Closes: 757534) + * support versioned provides as implemented by dpkg (Closes: 758153) + + -- Michael Vogt <mvo@debian.org> Wed, 27 Aug 2014 17:11:42 -0700 + +apt (1.0.6) unstable; urgency=medium + + [ Chris Leick ] + * German translation reviewed by Erik Pfannenstein + + [ Michael Vogt ] + * methods/http.cc: use Req.str() in debug output + * Do not try to parse invalid translation files (LP: #756317) + * Do not clean "/" in pkgAcquire::Clean/pkgArchiveCleaner (Closes: #753531) + * Only show packages as upgradable if the have a CandidateVer != 0 + (Closes: #753297) + + [ Trần Ngọc Quân ] + * l10n: vi.po: Update 3 new messages + + [ Joe Hansen ] + * Danish program translation update (Closes: 753979) + + [ David Kalnischkies ] + * handle moved mmap after UniqFindTagWrite call (Closes: #753941) + + [ Michele Orrù ] + * use printf instead of echo in testing framework + + [ Cédric Barboiron ] + * Improve description how to turn off the caches (Closes: #753531) + + [ Guillem Jover ] + * po: Fill or add missing Language field + * po: Remove fuzzy from file msgid header + * po: Fill Project-Id-Version with correct project id and version + * po: Fix Plural-Forms fields + * po: Fix or add missing email addresses + * po: Fix encoding issues + * po: Fix format specifier order in translation + * build: Set the XSL parameter through the command line instead of sed + * build: Convert from DebianDoc SGML to DocBook XML + * doc: Convert from DebianDoc SGML to DocBook XML + * doc: Unfuzzy DocBook translations + + -- Michael Vogt <mvo@debian.org> Thu, 10 Jul 2014 11:46:07 +0200 + +apt (1.0.5) unstable; urgency=low + + [ Michael Vogt ] + * fix autopkgtest tests + * fix test-apt-ftparchive-cachedb-lp1274466 and apt-internal-solver tests + * test/integration/test-essential-force-loopbreak: fix on non-amd64 systems + * Tell the user if no updates are available after apt update (Closes: #751388) + + [ Michele Orrù ] + * Check for gtest's header before building. + + [ Chris Leick ] + * Updated translation of german documentation + + [ Konstantin Manna ] + * fix two german manpage spelling mistakes (Closes: 751635) + * add missing comma in SEE ALSO of apt-secure manpage (Closes: 748506) + + [ Fredrik Fornwall ] + * use P_ instead of ngettext to compiling with --disable-nls (Closes: 751857) + + [ David Kalnischkies ] + * don't send pkg from an unknown architecture via EDSP + * fix SubstVar to be usable as a replace_all method + * show our broken packages message in 'apt' solver + * do not call resolver twice on (dist-)upgrade + + [ Stefano Zacchiroli ] + * EDSP doc: clarify that Install/Remove packages are arch-qualified + + -- Michael Vogt <mvo@debian.org> Wed, 18 Jun 2014 13:35:13 +0200 apt (1.0.4) unstable; urgency=low @@ -74,6 +200,41 @@ apt (1.0.4) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Tue, 10 Jun 2014 14:55:05 +0200 +apt (1.0.4ubuntu4) utopic; urgency=medium + + * test/integration/test-essential-force-loopbreak: + - fix test on non-amd64 systems + + -- Michael Vogt <mvo@ubuntu.com> Thu, 12 Jun 2014 10:56:09 +0200 + +apt (1.0.4ubuntu3) utopic; urgency=medium + + * ensure that test-apt-ftparchive-cachedb-lp1274466, + test-external-dependency-solver-protocol run in the ADT + environment + + -- Michael Vogt <mvo@ubuntu.com> Thu, 12 Jun 2014 08:47:29 +0200 + +apt (1.0.4ubuntu2) utopic; urgency=medium + + * debian/test/control: + - add missing db-util to test dependencies + * debian/tests/run-tests: + - fix path for apt-internal-solver + + -- Michael Vogt <mvo@ubuntu.com> Wed, 11 Jun 2014 14:51:31 +0200 + +apt (1.0.4ubuntu1) utopic; urgency=low + + * Merged from debian/sid, remaining changes: + - patch for apt cross-building, see http://bugs.debian.org/666772 + - ubuntu changelog download handling + - apt-key net-update/apt-xapian-index + - git-buildpackage config adjustments + - ubuntu keyring + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jun 2014 19:00:00 +0200 + apt (1.0.3) unstable; urgency=medium [ Michael Vogt ] diff --git a/debian/control b/debian/control index d0e89825c..299092543 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, zlib1g-dev, libbz2-dev, liblzma-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, libgtest-dev -Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz +Build-Depends-Indep: doxygen, w3m, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git diff --git a/debian/gbp.conf b/debian/gbp.conf index 0b205c1fd..d702799ac 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,3 +3,5 @@ prebuild = ./prepare-release pre-export postbuild = ./prepare-release post-build debian-branch = ubuntu/master debian-tag = %(version)s +export-dir = ../build-area +sign-tags = True
\ No newline at end of file diff --git a/debian/rules b/debian/rules index d89a36cde..085224b15 100755 --- a/debian/rules +++ b/debian/rules @@ -70,7 +70,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build-binary: build/build-binary-stamp -build-debiandoc: build/build-debiandoc-stamp +build-docbook: build/build-docbook-stamp build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak @@ -101,9 +101,9 @@ else endif touch $@ -build/build-debiandoc-stamp: build/configure-stamp +build/build-docbook-stamp: build/configure-stamp # Add here commands to compile the package. - $(MAKE) debiandoc + $(MAKE) docbook touch $@ build/build-manpages-stamp: build/configure-stamp @@ -126,7 +126,7 @@ debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ # Build architecture-independent files here. -libapt-pkg-doc: build-debiandoc +libapt-pkg-doc: build-docbook dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -153,7 +153,7 @@ libapt-pkg-doc: build-debiandoc dh_md5sums -p$@ dh_builddeb -p$@ -apt-doc: build-debiandoc +apt-doc: build-docbook dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -353,7 +353,7 @@ binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-trans binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch build-arch: build-binary -build-indep: build-manpages build-debiandoc +build-indep: build-manpages build-docbook build: build-indep build-arch .PHONY: build clean binary-indep binary-arch binary diff --git a/debian/tests/control b/debian/tests/control index 72e9deef7..f7e47c5f3 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev, db-util +Depends: @, @builddeps@, fakeroot, wget, stunnel4, db-util diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 308031e9d..9d7c484fc 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -8,7 +8,9 @@ if [ ! -e environment.mak ]; then fi make -C test/interactive-helper/ -# run against the installed apt +# run tests against the installed apt, use "env -i" to ensure +# the host env does not pollute our environment +env -i \ APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \ APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \ |