From 788a8f42c1ec146c812550d076e5fb720e83ae52 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Mon, 15 Dec 2008 21:17:39 +0200 Subject: Make apt proxy options have the highest priority, unified proxy determining code. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 90be66400..304e0fb2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,12 @@ apt (0.7.20) unstable; urgency=low - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - Mentioned '/* ... */' comments. (Closes: #507601) + * methods/{http,https,ftp}, doc/apt.conf.5.xml: + - Changed and unified the code that determines which proxy to use. Now + 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, + and '{http,ftp}_proxy' environment variables are used only if options + mentioned above are not specified. + (Closes: #445985, #157759, #320184, #365880, #479617) [ Michael Vogt ] * make "apt-get build-dep" installed packages marked automatic -- cgit v1.2.3-70-g09d2 From 1d39ef1994ae82f5f6d78e2be75ce0afb498aae8 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Mon, 15 Dec 2008 23:49:08 +0200 Subject: debian/changelog: updated date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 5b57c96a3..fa3ecf018 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ apt (0.7.20) unstable; urgency=low * Translations: - Finnish updated. Closes: #508449 - -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 + -- Eugene V. Lyubimkin Mon, 15 Dec 2008 23:48:46 +0200 apt (0.7.20~exp2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 4343b16d476ba388fa3475c96627e2a14a2d0f6d Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 18 Dec 2008 00:28:03 +0200 Subject: Fixed typo in changelog. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index fa3ecf018..285c11922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ apt (0.7.20) unstable; urgency=low * buildlib/config.{sub,guess}: - Renewed. This fixes lintian errors. * doc/apt.conf.5.xml, debian/apt-transport-https: - - Documented briefly 'APT::https' group of options. (Closes: #507398) + - Documented briefly 'Acquire::https' group of options. (Closes: #507398) - Applied patch from Daniel Burrows to document 'Debug' group of options. (Closes: #457265) - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. -- cgit v1.2.3-70-g09d2 From bbf55f8c66325fd0d9262730fb7af25fa25d2c5f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 21 Dec 2008 16:01:31 +0200 Subject: Actualized COPYING file. --- COPYING | 151 ++++++------------------------------------------------- debian/changelog | 3 ++ 2 files changed, 19 insertions(+), 135 deletions(-) (limited to 'debian/changelog') diff --git a/COPYING b/COPYING index 3baf9ac5a..bba1b752b 100644 --- a/COPYING +++ b/COPYING @@ -1,142 +1,23 @@ Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. +Apt is currently developed by APT Development Team . -Apt is licensed under the terms of the GNU General Public License (GPL), -version 2.0 or later, as published by the Free Software Foundation. See -the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or - for the terms of the latest version -of the GNU General Public License. - -In addition, prior to November 15th, 2000, apt may be distributed under -terms identical to the above with the following addition: - -Works using apt may link against the GUI library "libqt", copyright by -Troll Tech AS, Norway, provided that: - -1. The version of "libqt" is licensed under the terms of the "Qt Free Edition - License" published by Troll Tech AS. The license terms identified as - the Qt Free Edition License below are the only such terms under which - distribution of works derived from both apt and "libqt" are permitted; - -and - -2. The source code of the version of "libqt" used is - - a) Distributed with the binary version; - - or - - b) Downloadable by anyone, without fee, using a publicly-announced - URL on the Internet, for a duration of at least three years - starting with distribution of the binary version. - -On and after November 15th, 2000, the above additional terms lose all -force, and apt will be licensed only under the terms of the GNU General -Public License, version 2.0 or later. - - _______________________________________________________________ - -The following text, up to the text of the Qt Free Edition License, is -informational and not part of the license terms on apt. - -Modifications to apt in either source or compiled form must be licensed -under the terms of the GNU General Public License, version 2.0 (or later), -but need not include the above clause permitting usage of the "libqt" -library under the Qt Free Edition License. Note that removal of this -clause will result in software which is not licensed for binary -redistribution linked against software governed by the Qt Free Edition -License. In the event that a version of "libqt" is released that is -licensed under terms that do not conflict with the GPL, the additional -clause above is not required to grant permission for distribution of works -that are derived from both apt and "libqt". - -No part of apt is licensed under the Qt Free Edition License. The terms -below are provided to help identify the circumstances under which the -"libqt" library may be used with apt (or a work derived from both). The -terms below are copied from the LICENSE file of the qt-1.44 distribution, -as of November 10th, 1999. - - _______________________________________________________________ - - QT FREE EDITION LICENSE +License: GPLv2+ -Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This is the license for Qt Free Edition version 1.44; it covers private use, -use of third-party application programs based on Qt, and development of -free software for the free software community. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - COPYRIGHT AND RESTRICTIONS - -The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited -to use with the X Window System. - -You may copy this version of the Qt Free Edition provided that the entire -archive is distributed unchanged and as a whole, including this notice. - -You may use this version of the Qt Free Edition to compile, link and run -application programs legally developed by third parties. - -You may use the Qt Free Edition to create application programs -provided that: - - You accept this license. - Your software does not require modifications to Qt Free Edition. - You satisfy ONE of the following three requirements - EITHER - Users of your software can freely obtain source code for the - software, freely modify the source code (possibly with - restrictions on copyright notices, attributions and legal - responsibility), and freely redistribute original or modified - versions of the software. - OR - Your software is distributed under the GNU GENERAL - PUBLIC LICENSE, version 2 or later, as defined by the - Free Software Foundation. - OR - Your software is distributed under the GNU LIBRARY - GENERAL PUBLIC LICENSE, version 2 or later, as - defined by the Free Software Foundation. - -If you are paid to develop something with Qt Free Edition or it is a part of -your job the following conditions also apply: - - Your software must not require libraries, programs, data or - documentation that are not available outside your organization in - order to compile or use. - If and when your organization starts using the software, you must - notify Troll Tech AS of the following: - Your organization's name and purpose. - The software's name and purpose. - The software's license. - That your organization considers the software to be free - software. - -You may also use the Qt Free Edition to create reusable components -(such as libraries) provided that you accept the terms above, and in -addition that: - - Your components' license includes the following text: - - [Your package] requires the Qt library, which is - copyright Troll Tech AS. Freely distributable - programs may generally use Qt Free Edition free of - charge, see [README.QT] for details. - - README.QT is distributed along with your components. - Qt Free Edition is not distributed as an integral part of your - components. - - LIMITATIONS OF LIABILITY - -Troll Tech AS makes no obligation under this license to support or -upgrade Qt Free Edition, or assist in the use of Qt Free Edition. - -In no event shall Troll Tech AS be liable for any lost revenue or profits or -other direct, indirect, special, incidental or consequential damages, even -if Troll Tech has been advised of the possibility of such damages. +See /usr/share/common-licenses/GPL-2, or + for the terms of the latest version +of the GNU General Public License. -QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, -INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. - _______________________________________________________________ diff --git a/debian/changelog b/debian/changelog index 0adbbac1b..758d7a4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ apt (0.7.20) unstable; urgency=low and '{http,ftp}_proxy' environment variables are used only if options mentioned above are not specified. (Closes: #445985, #157759, #320184, #365880, #479617) + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) [ Michael Vogt ] * add option to "apt-get build-dep" to mark the needed -- cgit v1.2.3-70-g09d2 From 8dfb8a0ab2c2a06e319678701c144e5156d7e869 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jul 2009 15:28:21 +0200 Subject: * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) --- cmdline/apt-get.cc | 4 ++-- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 27e16d3f3..2693bd968 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1260,7 +1260,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look in the archive for a source package of the same name. */ - if (_config->FindB("APT::Get::Only-Source") == false) + bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); + if (MatchSrcOnly == false) { if (Pkg.end() == false) { @@ -1278,7 +1279,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, unsigned long Offset = 0; string Version; bool IsMatch = false; - bool MatchSrcOnly = false; // No source package name.. if (Src.empty() == true) diff --git a/debian/changelog b/debian/changelog index 2fb53972d..59a88ca21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.22) unstable; urgency=low + + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem) + + -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + apt (0.7.21) UNRELEASED; urgency=low [ Osamu Aoki ] -- cgit v1.2.3-70-g09d2 From fa1d338f0c8770d574db4f3728ef4357765185f7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jul 2009 18:14:01 +0200 Subject: fix extra , at the end of the changelog line --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index d39bf3d2f..cb5e74cb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,7 +121,7 @@ apt (0.7.22) unstable; urgency=low [ Osamu Aoki ] * Updated cron script to support backups by hardlinks and verbose levels. All features turned off by default. - * Added more error handlings. Closes: #438803, #462734, #454989, + * Added more error handlings. Closes: #438803, #462734, #454989 * Documented all cron script related configuration items in configure-index. -- cgit v1.2.3-70-g09d2 From 9da165db08e69a0a5a467b4d02d414006590308e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 2 Aug 2009 19:37:05 +0200 Subject: * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). --- apt-pkg/contrib/mmap.cc | 2 +- debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa52b4c30..4d5fcf71e 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String, but why we should not at least try to grow it before we give up? */ bool DynamicMMap::Grow() { -#ifdef _POSIX_MAPPED_FILES +#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) unsigned long newSize = WorkSpace + 1024*1024; if(Fd != 0) diff --git a/debian/changelog b/debian/changelog index cb5e74cb6..4e3177efe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ apt (0.7.23) unstable; urgency=low + [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) - -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on + non-Linux architectures (as it uses mremap). + + -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 67793cf3c90c40941d5445335345cf4042d44206 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:02:14 +0200 Subject: * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). --- apt-pkg/sourcelist.cc | 9 ++++++--- debian/changelog | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'debian/changelog') diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 47a08ad90..4b3abe918 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -157,15 +157,18 @@ bool pkgSourceList::ReadMainList() // CNC:2003-11-28 - Entries in sources.list have priority over // entries in sources.list.d. string Main = _config->FindFile("Dir::Etc::sourcelist"); + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Main) == true) Res &= ReadAppend(Main); - else + else if (FileExists(Parts) == false) + // Only warn if there are no sources.list.d. _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); - string Parts = _config->FindDir("Dir::Etc::sourceparts"); if (FileExists(Parts) == true) Res &= ReadSourceDir(Parts); - else + else if (FileExists(Main) == false) + // Only warn if there is no sources.list file. _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); return Res; diff --git a/debian/changelog b/debian/changelog index 4e3177efe..b360a0b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). + * apt-pkg/sourcelist.cc: + - Only warn about missing sources.list if there is no sources.list.d + and vice versa as only one of them is needed (Closes: #539731). - -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 + -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 48778d1198eb37dca437a878cd0b97a7cfb4e32e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:20:07 +0200 Subject: debian/control: Add myself to Uploaders. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index b360a0b23..2e4923740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). + * debian/control: + - Add myself to Uploaders. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 84c411509..910436d19 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno + Luca Bruno , Julian Andres Klode Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From 05ecd9b6027842cbdbc461b0eeb48c74bc8accbe Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:34:39 +0200 Subject: Set version to 0.7.22.1. --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/changelog') diff --git a/configure.in b/configure.in index 48b1def5c..9131e2fbe 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.21") +AC_DEFINE_UNQUOTED(VERSION,"0.7.22.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2e4923740..646bf745c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -apt (0.7.23) unstable; urgency=low +apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) + Martin Pitt for reporting the problem), also Closes: #535362. [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: -- cgit v1.2.3-70-g09d2 From 00388ba3ec5af81f529d038f0c44eb4e20504f14 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:40:11 +0200 Subject: debian/changelog: Close the FTBFS on kFreeBSD bug. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 646bf745c..f2e7552dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.22.1) unstable; urgency=low [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on - non-Linux architectures (as it uses mremap). + non-Linux architectures as it uses mremap (Closes: #539742). * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). -- cgit v1.2.3-70-g09d2 From e0423680dc09d64afdc62bf3a756a8ef9849365b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:48:29 +0200 Subject: debian/control: Increase Standards-Version to 3.8.2.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f2e7552dd..59d9a0b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.7.22.1) unstable; urgency=low and vice versa as only one of them is needed (Closes: #539731). * debian/control: - Add myself to Uploaders. + - Increase Standards-Version to 3.8.2.0. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 910436d19..cb20e2864 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.1.0 +Standards-Version: 3.8.2.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From 6985efb330487fb4ceb3fea0b4bfc86010c6d7f8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:12:20 +0200 Subject: debian/apt.cron.daily: Make sure that VERBOSE is always set before accessing it (Closes: #539366) --- debian/apt.cron.daily | 4 +--- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian/changelog') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 4f47ccfab..35ee5db6c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -320,11 +320,9 @@ if ! which apt-config >/dev/null ; then fi # Set VERBOSE mode from apt-config (or inherit from environment) +VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) debug_echo "verbose level $VERBOSE" -if [ -z "$VERBOSE" ]; then - VERBOSE="0" -fi if [ "$VERBOSE" -le 2 ]; then # quiet for 0,1,2 XSTDOUT=">/dev/null" diff --git a/debian/changelog b/debian/changelog index 59d9a0b27..377cc6b57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.22.2) unstable; urgency=low + + * debian/apt.cron.daily: Make sure that VERBOSE is always set + before accessing it (Closes: #539366) + + -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From 17443d48b60b1abad4d16a2b6a3e3b3199bfa7d3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:33:57 +0200 Subject: debian/apt.cron.daily: Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) --- debian/apt.cron.daily | 11 +++++++++++ debian/changelog | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian/changelog') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 35ee5db6c..3973e63b5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,9 @@ # Dir::Cache::Archive "archives/"; # - Set package archive directory # +# APT::Periodic::Enable "1"; +# - Enable the update/upgrade script (0=disable) +# # APT::Periodic::BackupArchiveInterval "0"; # - Backup after n-days if archive contents changed.(0=disable) # @@ -319,6 +322,14 @@ if ! which apt-config >/dev/null ; then exit 0 fi +# check if the user really wants to do something +AutoAptEnable=1 # default is yes +eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) + +if [ AutoAptEnable -eq 0 ]; then + exit 0 +fi + # Set VERBOSE mode from apt-config (or inherit from environment) VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) diff --git a/debian/changelog b/debian/changelog index 377cc6b57..21772e5df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ apt (0.7.22.2) unstable; urgency=low - * debian/apt.cron.daily: Make sure that VERBOSE is always set - before accessing it (Closes: #539366) + * debian/apt.cron.daily: + - Make sure that VERBOSE is always set (Closes: #539366) + - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) - -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 apt (0.7.22.1) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 6b519e4227f41980b6de18a882808df92f1e36f1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:48:41 +0200 Subject: debian/apt.cron.daily: Support using debdelta to download packages (Closes: #532079) --- debian/apt.cron.daily | 11 ++++++++++- debian/changelog | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3973e63b5..a09eeaca8 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -49,7 +49,10 @@ # # APT::Periodic::Download-Upgradeable-Packages "0"; # - Do "apt-get upgrade --download-only" every n-days (0=disable) -# +# +# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; +# - Use debdelta-upgrade to download updates if available (0=disable) +# # APT::Periodic::Unattended-Upgrade "0"; # - Run the "unattended-upgrade" security upgrade script # every n-days (0=disabled) @@ -395,6 +398,9 @@ eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) BackupArchiveInterval=0 eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) +Debdelta=1 +eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) + # check if we actually have to do anything if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && @@ -438,6 +444,9 @@ 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 + fi if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "download upgradable (success)" diff --git a/debian/changelog b/debian/changelog index 21772e5df..2d3446d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ apt (0.7.22.2) unstable; urgency=low * debian/apt.cron.daily: - Make sure that VERBOSE is always set (Closes: #539366) - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) + - Support using debdelta to download packages (Closes: #532079) -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 -- cgit v1.2.3-70-g09d2 From c6aa14e46842b0059c1648125562793e5edd08ee Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Aug 2009 11:20:27 +0200 Subject: * apt-pkg/pkgcache.cc: - do not set internel "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) --- apt-pkg/pkgcache.cc | 12 ++++++------ debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'debian/changelog') diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2a9756c45..b0ce6e598 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -275,13 +275,13 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsUnpack; if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured || - //we don't need to care for triggers awaiting packages - //dpkg will deal with them automatically when the - //trigger pending action is run (those packages are usually - //in half-configured or triggers-pending state) + Pkg->CurrentState == pkgCache::State::HalfConfigured) + // we leave triggers alone complettely. dpkg deals with + // them in a hard-to-predict manner and if they get + // resolved by dpkg before apt run dpkg --configure on + // the TriggersPending package dpkg returns a error //Pkg->CurrentState == pkgCache::State::TriggersAwaited - Pkg->CurrentState == pkgCache::State::TriggersPending) + //Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || diff --git a/debian/changelog b/debian/changelog index 2131b8077..6692191d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ apt (0.7.22.3) UNRELEASED; urgency=low and '{http,ftp}_proxy' environment variables are used only if options mentioned above are not specified. (Closes: #445985, #157759, #320184, #365880, #479617) + + [ Michael Vogt ] + * apt-pkg/pkgcache.cc: + - do not set internel "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) -- Michael Vogt Wed, 19 Aug 2009 11:14:15 +0200 -- cgit v1.2.3-70-g09d2