summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/NEWS10
-rw-r--r--debian/apt-daily-upgrade.service11
-rw-r--r--debian/apt-daily-upgrade.timer11
-rw-r--r--debian/apt-daily.service6
-rw-r--r--debian/apt-daily.timer3
-rw-r--r--debian/apt.auto-removal.sh7
-rwxr-xr-xdebian/apt.postinst2
-rwxr-xr-xdebian/apt.systemd.daily170
-rw-r--r--debian/changelog267
l---------debian/copyright1
-rw-r--r--debian/gbp.conf2
-rw-r--r--debian/libapt-pkg5.0.symbols6
-rwxr-xr-xdebian/rules7
13 files changed, 402 insertions, 101 deletions
diff --git a/debian/NEWS b/debian/NEWS
index 67275f6e4..bff3621bc 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+apt (1.4.2) unstable; urgency=medium
+
+ If periodic updates and unattended upgrades are enabled, the start of
+ periodic updates are now distributed over 24 hour intervals (as in 1.2
+ to 1.4), whereas starting unattended-upgrade has been restricted to a
+ time between 6 and 7 am. This only affects systems using systemd, other
+ systems still use the classical hourly cron job.
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 04 May 2017 22:54:02 +0200
+
apt (1.4~beta1) unstable; urgency=medium
Support for GPG signatures using the SHA1 or RIPE-MD/160 hash
diff --git a/debian/apt-daily-upgrade.service b/debian/apt-daily-upgrade.service
new file mode 100644
index 000000000..9652f58fe
--- /dev/null
+++ b/debian/apt-daily-upgrade.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+Documentation=man:apt(8)
+ConditionACPower=true
+After=apt-daily.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/apt/apt.systemd.daily install
+KillMode=process
+TimeoutStopSec=900
diff --git a/debian/apt-daily-upgrade.timer b/debian/apt-daily-upgrade.timer
new file mode 100644
index 000000000..79caf3b5c
--- /dev/null
+++ b/debian/apt-daily-upgrade.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+After=apt-daily.timer
+
+[Timer]
+OnCalendar=*-*-* 6:00
+RandomizedDelaySec=60m
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/debian/apt-daily.service b/debian/apt-daily.service
index 904ed5d51..09389c71b 100644
--- a/debian/apt-daily.service
+++ b/debian/apt-daily.service
@@ -1,9 +1,11 @@
[Unit]
-Description=Daily apt activities
+Description=Daily apt download activities
Documentation=man:apt(8)
ConditionACPower=true
+After=network-online.target
+Wants=network-online.target
[Service]
Type=oneshot
-ExecStart=/usr/lib/apt/apt.systemd.daily
+ExecStart=/usr/lib/apt/apt.systemd.daily update
diff --git a/debian/apt-daily.timer b/debian/apt-daily.timer
index a8e182c85..3b5796217 100644
--- a/debian/apt-daily.timer
+++ b/debian/apt-daily.timer
@@ -1,10 +1,9 @@
[Unit]
-Description=Daily apt activities
+Description=Daily apt download activities
[Timer]
OnCalendar=*-*-* 6,18:00
RandomizedDelaySec=12h
-AccuracySec=1h
Persistent=true
[Install]
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index df9048cd6..2c32b0c9d 100644
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -29,6 +29,11 @@ unamer="$(uname -r | tr '[A-Z]' '[a-z]')"
if [ -n "$unamer" ]; then
running_version="$(echo "$list" | awk "\$1 == \"$unamer\" { print \$2;exit; }")"
fi
+# ignore the currently running version if attempting a reproducible build
+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
+ unamer=""
+ running_version=""
+fi
latest_version="$(echo "$debverlist" | sed -n 1p)"
previous_version="$(echo "$debverlist" | sed -n 2p)"
@@ -62,7 +67,7 @@ $list
# list of different kernel versions:
$debverlist
# Installing kernel: $installed_version ($1)
-# Running kernel: $running_version ($unamer)
+# Running kernel: ${running_version:-ignored} (${unamer:-ignored})
# Last kernel: $latest_version
# Previous kernel: $previous_version
# Kernel versions list to keep:
diff --git a/debian/apt.postinst b/debian/apt.postinst
index 1f98fcece..8d1cdb1b3 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -54,7 +54,7 @@ case "$1" in
chown -R root:root /var/lib/apt/lists /var/cache/apt/archives || true
fi
- # ensure tighter permissons on the logs, see LP: #975199
+ # ensure tighter permissions on the logs, see LP: #975199
if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then
# ensure permissions are right
chmod -f 0640 /var/log/apt/term.log* || true
diff --git a/debian/apt.systemd.daily b/debian/apt.systemd.daily
index 03d41bae5..49af931bd 100755
--- a/debian/apt.systemd.daily
+++ b/debian/apt.systemd.daily
@@ -291,6 +291,23 @@ debug_echo()
}
# ------------------------ main ----------------------------
+if [ "$1" = "lock_is_held" ]; then
+ shift
+else
+ # Maintain a lock on fd 3, so we can't run the script twice at the same
+ # time.
+ eval $(apt-config shell StateDir Dir::State/d)
+ exec 3>${StateDir}/daily_lock
+ if ! flock -w 3600 3; then
+ echo "E: Could not acquire lock" >&2
+ exit 1
+ fi
+
+ # We hold the lock. Rerun this script as a child process, which
+ # can run without propagating an extra fd to all of its children.
+ "$0" lock_is_held "$@" 3>&-
+ exit $?
+fi
if test -r /var/lib/apt/extended_states; then
# Backup the 7 last versions of APT's extended_states file
@@ -384,97 +401,112 @@ if [ $UpdateInterval -eq 0 ] &&
exit 0
fi
-# deal with BackupArchiveInterval
-do_cache_backup $BackupArchiveInterval
+if [ "$1" = "update" -o -z "$1" ] ; then
+ # deal with BackupArchiveInterval
+ do_cache_backup $BackupArchiveInterval
-# include default system language so that "apt-get update" will
-# fetch the right translated package descriptions
-if [ -r /etc/default/locale ]; then
- . /etc/default/locale
- export LANG LANGUAGE LC_MESSAGES LC_ALL
-fi
+ # include default system language so that "apt-get update" will
+ # fetch the right translated package descriptions
+ if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE LC_MESSAGES LC_ALL
+ fi
-# update package lists
-UPDATED=0
-UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
-if check_stamp $UPDATE_STAMP $UpdateInterval; then
- if eval apt-get $XAPTOPT -y update $XSTDERR; then
- debug_echo "download updated metadata (success)."
- if which dbus-send >/dev/null 2>&1 && pidof dbus-daemon >/dev/null 2>&1; then
- if dbus-send --system / app.apt.dbus.updated boolean:true ; then
- debug_echo "send dbus signal (success)"
+ # update package lists
+ UPDATED=0
+ UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
+ if check_stamp $UPDATE_STAMP $UpdateInterval; then
+ if eval apt-get $XAPTOPT -y update $XSTDERR; then
+ debug_echo "download updated metadata (success)."
+ if which dbus-send >/dev/null 2>&1 && pidof dbus-daemon >/dev/null 2>&1; then
+ if dbus-send --system / app.apt.dbus.updated boolean:true ; then
+ debug_echo "send dbus signal (success)"
+ else
+ debug_echo "send dbus signal (error)"
+ fi
else
- debug_echo "send dbus signal (error)"
+ debug_echo "dbus signal not send (command not available)"
fi
+ update_stamp $UPDATE_STAMP
+ UPDATED=1
else
- debug_echo "dbus signal not send (command not available)"
+ debug_echo "download updated metadata (error)"
fi
- update_stamp $UPDATE_STAMP
- UPDATED=1
else
- debug_echo "download updated metadata (error)"
+ debug_echo "download updated metadata (not run)."
fi
-else
- debug_echo "download updated metadata (not run)."
-fi
-
-# download all upgradeable packages (if it is requested)
-DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp
-if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
- if [ $Debdelta -eq 1 ]; then
- debdelta-upgrade >/dev/null 2>&1 || true
+
+ # download all upgradeable packages (if it is requested)
+ DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp
+ if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
+ if [ $Debdelta -eq 1 ]; then
+ debdelta-upgrade >/dev/null 2>&1 || true
+ fi
+ if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then
+ update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
+ debug_echo "download upgradable (success)"
+ else
+ debug_echo "download upgradable (error)"
+ fi
+ else
+ debug_echo "download upgradable (not run)"
fi
- if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then
- update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
- debug_echo "download upgradable (success)"
+
+ if which unattended-upgrade >/dev/null 2>&1 && unattended-upgrade --help | grep -q download-only && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $UnattendedUpgradeInterval; then
+ if unattended-upgrade --download-only $XUUPOPT; then
+ update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
+ debug_echo "unattended-upgrade -d (success)"
+ else
+ debug_echo "unattended-upgrade -d (error)"
+ fi
else
- debug_echo "download upgradable (error)"
+ debug_echo "unattended-upgrade -d (not run)"
fi
-else
- debug_echo "download upgradable (not run)"
fi
-# auto upgrade all upgradeable packages
-UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
-if which unattended-upgrade >/dev/null 2>&1 && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
- if unattended-upgrade $XUUPOPT; then
- update_stamp $UPGRADE_STAMP
- debug_echo "unattended-upgrade (success)"
+if [ "$1" = "install" -o -z "$1" ] ; then
+ # auto upgrade all upgradeable packages
+ UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
+ if which unattended-upgrade >/dev/null 2>&1 && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+ if unattended-upgrade $XUUPOPT; then
+ update_stamp $UPGRADE_STAMP
+ debug_echo "unattended-upgrade (success)"
+ else
+ debug_echo "unattended-upgrade (error)"
+ fi
else
- debug_echo "unattended-upgrade (error)"
+ debug_echo "unattended-upgrade (not run)"
fi
-else
- debug_echo "unattended-upgrade (not run)"
-fi
-# clean package archive
-CLEAN_STAMP=/var/lib/apt/periodic/clean-stamp
-if check_stamp $CLEAN_STAMP $CleanInterval; then
- if eval apt-get $XAPTOPT -y clean $XSTDERR; then
- debug_echo "clean (success)."
- update_stamp $CLEAN_STAMP
+ # clean package archive
+ CLEAN_STAMP=/var/lib/apt/periodic/clean-stamp
+ if check_stamp $CLEAN_STAMP $CleanInterval; then
+ if eval apt-get $XAPTOPT -y clean $XSTDERR; then
+ debug_echo "clean (success)."
+ update_stamp $CLEAN_STAMP
+ else
+ debug_echo "clean (error)"
+ fi
else
- debug_echo "clean (error)"
+ debug_echo "clean (not run)"
fi
-else
- debug_echo "clean (not run)"
-fi
-# autoclean package archive
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
- if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then
- debug_echo "autoclean (success)."
- update_stamp $AUTOCLEAN_STAMP
+ # autoclean package archive
+ AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+ if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then
+ debug_echo "autoclean (success)."
+ update_stamp $AUTOCLEAN_STAMP
+ else
+ debug_echo "autoclean (error)"
+ fi
else
- debug_echo "autoclean (error)"
+ debug_echo "autoclean (not run)"
fi
-else
- debug_echo "autoclean (not run)"
-fi
-# check cache size
-check_size_constraints
+ # check cache size
+ check_size_constraints
+fi
#
# vim: set sts=4 ai :
diff --git a/debian/changelog b/debian/changelog
index 9cfdcaa45..b43c8f1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,224 @@
+apt (1.4.8) stretch; urgency=medium
+
+ [ Balint Reczey ]
+ * Gracefully terminate process when stopping apt-daily-upgrade (LP: #1690980)
+
+ [ David Kalnischkies ]
+ * don't ask an uninit _system for supported archs, this
+ crashes the mirror method (LP: #1613184)
+
+ [ Julian Andres Klode ]
+ * Do not warn about duplicate "legacy" targets (Closes: #839259)
+ (LP: #1697120)
+ * apt-daily: Pull in network-online.target in service, not timer
+ - this can cause a severe boot performance regression / hang
+ (LP: #1716973)
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 13 Sep 2017 18:47:33 +0200
+
+apt (1.4.7) stretch; urgency=medium
+
+ * New release with important fixes up to 1.5~beta1; also see LP: #1702326
+
+ [ Robert Luberda ]
+ * fix a "critical" typo in old changelog entry (Closes: 866358)
+
+ [ David Kalnischkies ]
+ * test suite/travis CI: ignore profiling warning in progress lines
+ * use port from SRV record instead of initial port
+
+ [ Julian Andres Klode ]
+ * Reset failure reason when connection was successful, so later errors are
+ reported as such and not as "connection failure" warnings.
+ * debian/gbp.conf: Set debian-branch to 1.4.y
+ * http: A response with Content-Length: 0 has no content, so don't try to
+ read it - it will either timeout or the server closes the connection.
+ * travis CI: Migrate to Docker
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 13 Jul 2017 23:45:39 +0200
+
+apt (1.4.6) unstable; urgency=medium
+
+ * apt.systemd.daily: Do not pass -d to unattended-upgrade for the download
+ job. This actually enables debugging. Instead check if unattended-upgrade
+ supports an option --download-only (which is yet to be implemented) and use
+ that (Closes: #863859)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 01 Jun 2017 10:50:26 +0200
+
+apt (1.4.5) unstable; urgency=medium
+
+ * Fix parsing of or groups in build-deps with ignored packages (LP: #1694697)
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 31 May 2017 14:52:25 +0200
+
+apt (1.4.4) unstable; urgency=medium
+
+ [ Alan Jenkins ]
+ * apt.systemd.daily: fix error from locking code (Closes: #862567)
+
+ -- Julian Andres Klode <jak@debian.org> Tue, 16 May 2017 23:19:50 +0200
+
+apt (1.4.3) unstable; urgency=medium
+
+ [ Julian Andres Klode ]
+ * Do not try to (re)start timers outside 'apt' package (Closes: #862001)
+
+ [ Miroslav Kure ]
+ * Updated Czech translation of apt (Closes: #861943)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 11 May 2017 14:46:28 +0200
+
+apt (1.4.2) unstable; urgency=medium
+
+ [ Julian Andres Klode ]
+ * Run unattended-upgrade -d in download part
+ * apt.systemd.daily: Add locking
+ * Split apt-daily timer into two (LP: #1686470)
+
+ [ Matt Kraai ]
+ * bash-completion: Fix spelling of autoclean (Closes: #861846)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 04 May 2017 22:52:10 +0200
+
+apt (1.4.1) unstable; urgency=medium
+
+ [ Julian Andres Klode ]
+ * systemd: Rework timing and add After=network-online (LP: #1615482)
+ * debian/rules: Actually invoke dh_clean in override_dh_clean
+
+ [ Unit 193 ]
+ * apt-ftparchive: Support '.ddeb' dbgsym packages
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 24 Apr 2017 18:47:55 +0200
+
+apt (1.4) unstable; urgency=medium
+
+ * The April Fools' Release
+
+ [ Julian Andres Klode ]
+ * Ignore \.ucf-[a-z]+$ like we do for \.dpkg-[a-z]+$
+ * Fix mistake in CHANGEPATH comment example
+
+ [ Chris Lamb ]
+ * auto-removal: Ignore running kernel if attempting a reproducible build
+ (Closes: #857632)
+
+ [ Joe Dalton ]
+ * Danish program translation update (Closes: #856723)
+
+ [ David Kalnischkies ]
+ * Fix and avoid quoting in CommandLine::AsString (LP: #1672710)
+ * Ignore AutomaticRemove conffile option in upgrade (Closes: #855891)
+
+ -- Julian Andres Klode <jak@debian.org> Sat, 01 Apr 2017 21:39:37 +0200
+
+apt (1.4~rc2) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * add Auto-Built-Package to tagfile-order
+ * don't test with "too early for 32bit" years
+
+ [ Julian Andres Klode ]
+ * Do not lowercase package names representing .dsc/.deb/... files (Closes: #854794)
+ * shippable: Perform CI on Debian stretch instead of Ubuntu xenial
+ * Don't use -1 fd and AT_SYMLINK_NOFOLLOW for faccessat()
+ Thanks to James Clarke for debugging these issues
+ * CMake: Install statvfs.h to include/sys, not just include/
+ * debian: Generate debian/copyright during clean
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 22 Feb 2017 16:02:10 +0100
+
+apt (1.4~rc1) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * don't show update stats if cache generation is disabled
+ * don't lock dpkg in 'apt-get clean'
+ * don't lock dpkg in update commands
+ * avoid validate/delete/load race in cache generation
+ * fix 'install --no-download' mode
+ * remove 'old' FAILED files in the next acquire call (Closes: 846476)
+ * stop rred from leaking debug messages on recovered errors (Closes: #850759)
+ * make the moo reproducible.
+ Thanks to Chris Lamb for initial patch and guru meditation (Closes: #848721)
+ * update release mappings in documentation
+ * avoid malloc if option whitelist is disabled (default)
+
+ [ Julian Andres Klode ]
+ * basehttp: Only read Content-Range on 416 and 206 responses (LP: #1657567)
+ * test suite: Do not exit 0 in trap for QUIT
+ * Only merge acquire items with the same meta key (Closes: #838441)
+
+ [ Zhou Mo ]
+ * po: update Simplified Chinese program translation
+
+ [ Jean-Pierre Giraud ]
+ * French manpages translation update (Closes: 852460)
+
+ [ victory ]
+ * Japanese manpages & program translation update
+
+ [ Frans Spiesschaert ]
+ * Dutch program translation update (Closes: #853761)
+ * Dutch manpage translation update (Closes: #853762)
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 06 Feb 2017 14:41:23 +0100
+
+apt (1.4~beta4) unstable; urgency=medium
+
+ * Read dpkg tables to handle architecture wildcards.
+ Thanks to James Clarke <jrtc27@jrtc27.com> for the initial patch
+ (Closes: #748936)
+ * https: Quote path in URL before passing it to curl (LP: #1651923)
+ * Update symbols file for changes in 1.3.1, 1.4~beta{1,3,4}
+
+ -- Julian Andres Klode <jak@debian.org> Tue, 17 Jan 2017 15:18:27 +0100
+
+apt (1.4~beta3) unstable; urgency=medium
+
+ [ Lukasz Kawczynski ]
+ * Honour Acquire::ForceIPv4/6 in the https transport
+
+ [ David Kalnischkies ]
+ * reword "Can't drop priv" warning message (Closes: #813786) (LP: #1522675)
+ * let {dsc,tar,diff}-only implicitly enable download-only
+ * remove needless fork() in apt-get source
+ * default to --no-check for dpkg-source call (Closes: 724744)
+ * warn if clearsigned file has ignored content parts
+ * ensure generation of valid EDSP error stanzas
+ * add --indep-only for build-dep command (Closes: #845775)
+ * allow default build-essentials to be overridden
+ * expand -f to --fix-broken in error messages.
+ Thanks to Kristian Glass for initial patch! (Closes: #709092)
+ * separating state variables regarding server/request (Closes: #440057)
+ * fix minimum pkgs option for dpkg --recursive usage
+ * allow warning generation for non-whitelisted options
+
+ [ Oriol Debian ]
+ * Catalan program translation update (Closes: #846514)
+
+ [ Frans Spiesschaert ]
+ * Dutch manpages translation update (Closes: #849235)
+
+ [ Niels Thykier ]
+ * ParseDepends: Support passing the desired architecture (Closes: #845969)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 05 Jan 2017 20:50:01 +0100
+
+apt (1.4~beta2) unstable; urgency=high
+
+ [ John R. Lenton ]
+ * bash-completion: Only complete understood file paths for install
+ (LP: #1645815)
+
+ [ Julian Andres Klode ]
+ * SECURITY UPDATE: gpgv: Check for errors when splitting files (CVE-2016-1252)
+ Thanks to Jann Horn, Google Project Zero for reporting the issue
+ (LP: #1647467)
+ * gpgv: Flush the files before checking for errors
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 08 Dec 2016 15:21:16 +0100
+
apt (1.4~beta1) unstable; urgency=medium
[ Chris Leick ]
@@ -1409,7 +1630,7 @@ apt (1.1~exp9) experimental; urgency=medium
* Make auto-remove and auto-clean aliases for the versions without -
(Closes: #274159)
* apt: Add autoremove and auto-remove commands
- * changelog: Replace spelling reenable by re-enable everywhere.
+ * changelog: Replace spelling typo for re-enable everywhere.
Thanks to Lintian
* debian/control: Replace debian by Debian.
Thanks to Lintian
@@ -1552,7 +1773,7 @@ apt (1.1~exp4) experimental; urgency=medium
Do not download more data in the mehotds than expected if we know
the size. For the InRelease/Release/Release.gpg add new
Acquire::MaxReleaseFileSize that defaults to 10Mb for now
- * Verify the the hashes of the downloaded compressed files early
+ * Verify the hashes of the downloaded compressed files early
* Only load unauthenticated data into our parsers when the user
explicitly asked for it via --allow-insecure-repositories
(Acquire::AllowInsecureRepositories)
@@ -1583,7 +1804,7 @@ apt (1.1~exp4) experimental; urgency=medium
(Closes: 733028)
* use apt-key adv (+ gnupg) instead of gpgv for verify
* support gnupg2 as drop-in replacement for gnupg
- * allow to specify fingerprints in 'apt-key del'
+ * allows one to specify fingerprints in 'apt-key del'
* use only one --keyring in gpg interactions
* add and use 'apt-key verify' which prefers gpgv over gpg
* remove empty keyrings in trusted.gpg.d on upgrade
@@ -2613,7 +2834,7 @@ apt (0.9.13~exp1) experimental; urgency=low
* Improve the API for APT::Upgrade::Upgrade()
* Re-add "Calculating upgrade..." message
- * move upgrade releated code into upgrade.{cc,h}
+ * move upgrade related code into upgrade.{cc,h}
* Move ListUpdate/AcquireUpdate into update.{cc,h}
* Add new apt-pkg/install-progress.h with APT::Progress::PackageManager
progress reporting classes
@@ -2834,7 +3055,7 @@ apt (0.9.10) unstable; urgency=low
* exclude config.{sub,guess} from source package
* update the symbol files to reflect current state
* unset LANGUAGE for showing [Y/n] answer hints
- * fix some unitialized data members
+ * fix some uninitialized data members
* specific pins below 1000 cause downgrades (Closes: 543966)
* use pkgTagFile to parse "header" of Release files
* fix: --print-uris removes authentication (Closes: 719263)
@@ -2996,7 +3217,7 @@ apt (0.9.8.1) unstable; urgency=low
[ Michael Vogt ]
* moved source to http://git.debian.org/apt/apt.git
* updated gbp.conf to match what bzr-buildpackage is doing
- * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf)
+ * remove .bzr-buildpackage/default.conf (superseded by gbp.conf)
-- Michael Vogt <mvo@debian.org> Thu, 16 May 2013 14:50:43 +0200
@@ -3148,7 +3369,7 @@ apt (0.9.7.9~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 22 Mar 2013 21:57:08 +0100
-apt (0.9.7.8) unstable; urgency=criticial
+apt (0.9.7.8) unstable; urgency=critical
* SECURITY UPDATE: InRelease verification bypass
- CVE-2013-1051
@@ -4114,7 +4335,7 @@ apt (0.8.16~exp8) experimental; urgency=low
- show a debug why a package was kept by ResolveByKeep()
* apt-pkg/packagemanager.cc:
- do not fail on unpacked packages in SmartUnPack, just don't
- shedule them for unpack, but do all checks and configure them
+ schedule them for unpack, but do all checks and configure them
- do not enter an endless loop for (essential) pre-dependency loops
* apt-pkg/contrib/sha2_internal.cc:
- use a pointer-union to peace gcc strict-aliasing warning
@@ -4982,9 +5203,9 @@ apt (0.8.12) unstable; urgency=low
- honor Dpkg::Chroot-Directory in the RunScripts*() methods
* apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}:
- deal with missing FSTAB_DIR when using libudev to discover cdrom
- - add experimental APT::cdrom::CdromOnly option (on by default).
+ - add experimental APT::cdrom::CdromOnly option (on by default).
When this is set to false apt-cdrom will handle any removable
- deivce (like a usb-stick) as a "cdrom/dvd" source
+ device (like a usb-stick) as a "cdrom/dvd" source
[ Christian Perrier ]
* Fix error in French translation of manpages (apt_preferences(5)).
@@ -5407,7 +5628,7 @@ apt (0.8.5) unstable; urgency=low
* apt-pkg/deb/deblistparser.cc:
- overrule NotAutomatic in case of ButAutomaticUpgrades
* debian/apt.cron.daily:
- - handle absolut directory paths correctly by loading directories
+ - handle absolute directory paths correctly by loading directories
directly instead of building the paths on our own (Closes: #596421)
* debian/control:
- build-depend on docbook-xml to ensure that the xml DTDs are always
@@ -5659,7 +5880,7 @@ apt (0.7.26~exp11) experimental; urgency=low
- handle "circular" conflicts for "all" packages correctly
* cmdline/apt-cache.cc:
- be able to omit dependency types in (r)depends (Closes: #319006)
- - show in (r)depends the canidate per default instead of newest
+ - show in (r)depends the candidate per default instead of newest
- share the (r)depends code instead of codecopy
* apt-pkg/cacheset.cc:
- move them back to the library as they look stable now
@@ -5779,7 +6000,7 @@ apt (0.7.26~exp8) experimental; urgency=low
- add another round of const& madness as the previous round accidentally
NOT overrides the virtual GetCandidateVer() method (Closes: #587725)
* apt-pkg/pkgcachegen.{cc,h}:
- - make the used MMap moveable (and therefore dynamic resizeable) by
+ - make the used MMap moveable (and therefore dynamic resizable) by
applying (some) mad pointer magic (Closes: #195018)
[ Michael Vogt ]
@@ -6569,7 +6790,7 @@ apt (0.7.23.1) unstable; urgency=low
[ Michael Vogt ]
* apt-pkg/pkgcache.cc:
- - do not set internel "needs-configure" state for packages in
+ - do not set internal "needs-configure" state for packages in
triggers-pending state. dpkg will deal with the trigger and
it if does it before we trigger it, dpkg will error out
(LP: #414631)
@@ -6758,7 +6979,7 @@ apt (0.7.22) unstable; urgency=low
* doc/apt.conf.5.xml:
- merged patch from Aurélien Couderc to improve the text
(thanks!)
- * [ABI] merged the libudev-dlopen branch, this allows to pass
+ * [ABI] merged the libudev-dlopen branch, this allows one to pass
"apt-udev-auto" to Acquire::Cdrom::mount and the cdrom method will
dynamically find/mount the cdrom device (if libhal is available)
@@ -7288,7 +7509,7 @@ apt (0.7.12) unstable; urgency=low
so that it can correct any missing dependencies
* debian/apt.cron.daily:
- sleep random amount of time (default within 0-30min) before
- starting the upate to hit the mirrors less hard
+ starting the update to hit the mirrors less hard
* doc/apt_preferences.5.xml:
- fix typo
* added debian/README.source
@@ -7779,7 +8000,7 @@ apt (0.6.46.4) unstable; urgency=high
- added "Dpkg::StopOnError" variable that controls if apt
will abort on errors from dpkg
* apt-pkg/deb/debsrcrecords.{cc,h}:
- - make the Buffer grow dynmaically (closes: #400874)
+ - make the Buffer grow dynamically (closes: #400874)
* Merged from Christian Perrier bzr branch:
- uk.po: New Ukrainian translation: 483t28f3u
- el.po: Update to 503t9f2u
@@ -9386,7 +9607,7 @@ apt (0.5.5) unstable; urgency=low
* When matching regexs always print a message. Change regex activation
charset. Closes: #147817
* Don't die if lines in sources.list are too long. Closes: #146846
- * Show file name on apt-extracttemplate error messges. Closes: #151835
+ * Show file name on apt-extracttemplate error messages. Closes: #151835
* i18n gettext stuff, based on work from Michael Piefel: Closes: #95933
* Some highly unlikely memory faults. Closes: #155842
* C++ stuff for G++3.2. Closes: #162617, #165515,
@@ -9504,7 +9725,7 @@ apt (0.5.4) unstable; urgency=low
* Various changes to the locking metholodgy for --print-uris.
Closes: #100590
* Lame LD_LIBRARY_PATH thing. Closes: #98928
- * apt-cache search searchs provide names too now. Closes: #98695
+ * apt-cache search searches provide names too now. Closes: #98695
* Checksum and long lines problem. Closes: #106591
* .aptignr and empty files are just a warning. Closes: #97364
@@ -9614,7 +9835,7 @@ apt (0.5.0) unstable; urgency=low
* Caching can be turned off by setting the cache file names blank.
* Ignores arches it does not know about when autocleaning. Closes: #72862
* New function in apt-config to return dirs, files, bools and integers.
- * Fixed an odd litle bug in MarkInstall and fixed it up to handle
+ * Fixed an odd little bug in MarkInstall and fixed it up to handle
complex cases involving OR groups and provides.
68754 describes confusing messages which are the result of this..
Closes: #63149, #69394, #68754, #77683, #66806, #81486, #78712
@@ -9664,7 +9885,7 @@ apt (0.3.19) frozen unstable; urgency=low
* Fixed Jay's relative path bug
* Allowed source only CDs. Closes: #58952
* Space check is suppressed if --print-uris is given. Closes: #58965
- * Clarified the documenation examples for non-us. Closes: #58646
+ * Clarified the documentation examples for non-us. Closes: #58646
* Typo in the package description. Closes: #60230
* Man Page typo. Closes: #60347
* Typo in Algorithms.cc. Closes: #63577
@@ -9715,7 +9936,7 @@ apt (0.3.16) unstable; urgency=low
* Now compiles on OpenBSD, Solaris and HP-UX
* Clarify segfault errors
* More debhelper fixes. Closes: #52662, #54566, #52090, #53531, #54769
- * Fix for Joel's discovery of glibc removal behavoir.
+ * Fix for Joel's discovery of glibc removal behavior.
* Fix for Ben Collins file: uri from slink upgrade.
* Fixed resume code in FTP. Closes: #54323
* Take more precautions to prevent the corruption Joey Hess saw.
@@ -9841,7 +10062,7 @@ apt (0.3.7) unstable; urgency=low
* Added a check for an empty cache directory. Closes: #37963
* Return a failure code if -d is given and packages fail to download.
Closes: #38127
- * Arranged for an ftp proxy specifing an http server to work. See the
+ * Arranged for an ftp proxy specifying an http server to work. See the
important note in the sources.list man page.
* Accounted for resumed files in the cps calculation. Closes: #36787
* Deal with duplicate same version different packages. Closes: #30237
diff --git a/debian/copyright b/debian/copyright
deleted file mode 120000
index 012065c85..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1 +0,0 @@
-../COPYING \ No newline at end of file
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a5e885896..610efb0c3 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,7 +3,7 @@
;preexport = ./prepare-release pre-export
prebuild = ./prepare-release pre-build
postbuild = ./prepare-release post-build
-debian-branch = master
+debian-branch = 1.4.y
debian-tag = %(version)s
export-dir = ../build-area
sign-tags = True
diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols
index da52e4825..2f625d2e1 100644
--- a/debian/libapt-pkg5.0.symbols
+++ b/debian/libapt-pkg5.0.symbols
@@ -1488,3 +1488,9 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
(c++)"void std::vector<pkgDPkgPM::Item, std::allocator<pkgDPkgPM::Item> >::emplace_back<pkgDPkgPM::Item::Ops, pkgCache::PkgIterator&>(pkgDPkgPM::Item::Ops&&, pkgCache::PkgIterator&)@APTPKG_5.0" 1.3~rc2
(c++)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.3~rc2
(c++)"void std::vector<std::pair<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::emplace_back<pkgDPkgPM::Item*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(pkgDPkgPM::Item*&&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)@APTPKG_5.0" 1.3~rc2
+ (c++)"AddCRC16Byte(unsigned short, unsigned char)@APTPKG_5.0" 1.4~beta1
+ (c++)"APT::String::Join(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.4~beta4
+ (c++)"debListParser::ParseDepends(char const*, char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 1.4~beta3
+ (c++)"pkgTagHash(char const*, unsigned long)@APTPKG_5.0" 1.4~beta1
+ (c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode, bool)@APTPKG_5.0" 1.3.1
+ (c++|optional=std)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<char const (&) [4]>(char const (&) [4])@APTPKG_5.0" 1.4~beta4
diff --git a/debian/rules b/debian/rules
index 62d913f0a..ede9591d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ export CTEST_OUTPUT_ON_FAILURE=1
%:
dh $@
+override_dh_clean:
+ cp COPYING debian/copyright
+ dh_clean
+
override_dh_install-indep:
dh_install --list-missing
@@ -33,7 +37,8 @@ override_dh_systemd_start:
# Do not restart "apt-daily.service" because this script runs
# unattended-upgrades. So if apt itself is upgraded as part of
# an unattended-upgrades run it would kill itself
- dh_systemd_start apt-daily.timer
+ dh_systemd_start -papt apt-daily.timer apt-daily-upgrade.timer
+ dh_systemd_start --remaining-packages
override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
override_dh_auto_configure-indep: flags=-DWITH_DOC=ON
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 20:57:43 +0000