From: Michael Vogt Date: Fri, 3 Aug 2007 09:13:25 +0000 (+0200) Subject: * apt-pkg/deb/dpkgpm.{cc,h}: X-Git-Tag: 0.7.21~256 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0408d8c3b23367d09980cb27a5225a9f034d7610?ds=inline;hp=-c * apt-pkg/deb/dpkgpm.{cc,h}: - merged dpkg-log branch, this lets you specify a Dir::Log::Terminal file to log dpkg output to ABI break --- 0408d8c3b23367d09980cb27a5225a9f034d7610 diff --combined apt-pkg/init.cc index 3ebd592c9,2617603ec..0aff882b6 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@@ -24,6 -24,8 +24,6 @@@ const char *pkgVersion = VERSION const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "." Stringfy(APT_PKG_MINOR) "." Stringfy(APT_PKG_RELEASE); -const char *pkgCPU = COMMON_CPU; -const char *pkgOS = COMMON_OS; // pkgInitConfig - Initialize the configuration class /*{{{*/ // --------------------------------------------------------------------- @@@ -33,7 -35,11 +33,7 @@@ bool pkgInitConfig(Configuration &Cnf) { // General APT things - if (strcmp(COMMON_OS,"linux") == 0 || - strcmp(COMMON_OS,"unknown") == 0) - Cnf.Set("APT::Architecture",COMMON_CPU); - else - Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU); + Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); Cnf.Set("APT::Install-Recommends", false); Cnf.Set("APT::Install-Suggests", false); @@@ -68,6 -74,10 +68,10 @@@ Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); + + // State + Cnf.Set("Dir::Log","var/log/apt"); + Cnf.Set("Dir::Log::Name","term.log"); bool Res = true; diff --combined apt-pkg/init.h index b33d2db81,bc0e55036..23e951eff --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@@ -18,11 -18,13 +18,11 @@@ // See the makefile #define APT_PKG_MAJOR 4 --#define APT_PKG_MINOR 4 ++#define APT_PKG_MINOR 5 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; extern const char *pkgLibVersion; -extern const char *pkgOS; -extern const char *pkgCPU; bool pkgInitConfig(Configuration &Cnf); bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); diff --combined apt-pkg/makefile index df9954f67,8dd50b8c2..b327dbf64 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@@ -13,9 -13,9 +13,9 @@@ include ../buildlib/defaults.ma # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) --MAJOR=4.4 ++MAJOR=4.5 MINOR=0 - SLIBS=$(PTHREADLIB) $(INTLLIBS) + SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) # Source code for the contributed non-core things diff --combined debian/changelog index b9824f84a,cb86ce580..8c0bc2d0e --- a/debian/changelog +++ b/debian/changelog @@@ -1,80 -1,8 +1,84 @@@ -apt (0.7.4) UNRELEASED; urgency=low +apt (0.7.7) UNRELEASED; urgency=low - * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have one + - send range request with if-range + - delete failed downloads ++ * apt-pkg/deb/dpkgpm.{cc,h}: ++ - merged dpkg-log branch, this lets you specify a ++ Dir::Log::Terminal file to log dpkg output to ++ ABI break + + -- Michael Vogt Thu, 02 Aug 2007 11:55:54 +0200 + +apt (0.7.6) unstable; urgency=low + + * Applied patch from Aurelien Jarno to fix wrong + directory downloading on non-linux architectures (closes: #435597) + + -- Otavio Salvador Wed, 01 Aug 2007 19:49:51 -0300 + +apt (0.7.5) unstable; urgency=low + + [ Otavio Salvador ] + * Applied patch from Guillem Jover to use + dpkg-architecture to get the host architecture (closes: #407187) + * Applied patch from Guillem Jover to add + support to add lzma support (closes: #408201) - -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 + [ Michael Vogt ] + * apt-pkg/depcache.cc: + - support a list of sections for: + APT::Install-Recommends-Sections + APT::Never-MarkAuto-Sections + * methods/makefile: + - install lzma symlink method (for full lzma support) + * debian/control: + - suggest "lzma" + + -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 + +apt (0.7.4) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-get.cc: + - fix in the task-install code regexp (thanks to Adam Conrad and + Colin Watson) + - support task removal too: apt-get remove taskname^ + (thanks to Matt Zimmerman reporting this problem) + + [ Otavio Salvador ] + * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + * Fix compilation warnings: + - apt-pkg/contrib/configuration.cc: wrong argument type; + - apt-pkg/deb/dpkgpm.cc: wrong signess; + - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; + - methods/https.cc: + - type conversion; + - unused variable; + - changed SetupProxy() method to void; + * Simplified HttpMethod::Fetch on http.cc removing Tail variable; + * Fix pipeline handling on http.cc (closes: #413324) + * Fix building to properly support binNMUs. Thanks to Daniel Schepler + by the patch (closes: #359634) + * Fix example for Install-{Recommends,Suggests} options on + configure-index example file. Thanks to Peter Eisentraut + by the patch (closes: #432223) + + [ Christian Perrier ] + * Basque translation update. Closes: ##423766 + * Unfuzzy formerly complete translations + * French translation update + * Re-generate PO(T) files + * Spanish translation update + * Swedish translation update + + -- Otavio Salvador Tue, 24 Jul 2007 09:55:50 -0300 apt (0.7.3) unstable; urgency=low @@@ -88,9 -16,9 +92,9 @@@ - fix InstallTask code when a pkgRecord ends with a single '\n' (thanks to Soren Hansen for reporting) * merged from Christian Perrier: - * vi.po: completed to 532t, again. Closes: #429899 - * gl.po: completed to 532t. Closes: #429506 - * vi.po: completed to 532t. Closes: #428672 + * vi.po: completed to 532t, again. Closes: #429899 + * gl.po: completed to 532t. Closes: #429506 + * vi.po: completed to 532t. Closes: #428672 * Update all PO and the POT. Gives 514t14f4u for formerly complete translations * fr.po: completed to 532t @@@ -2613,3 -2541,4 +2617,3 @@@ apt (0.0.1) unstable; urgency=lo * Initial Release. -- Scott K. Ellis Tue, 31 Mar 1998 12:49:28 -0500 - diff --combined debian/rules index 473821f16,3e8b2d35a..b3222f3b4 --- a/debian/rules +++ b/debian/rules @@@ -38,7 -38,7 +38,7 @@@ build PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') +APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') @@@ -209,6 -209,7 +209,7 @@@ apt: build debian/shlibs.loca cp -r $(BLD)/locale debian/$@/usr/share/ cp debian/bugscript debian/$@/usr/share/bug/apt/script + cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove diff --combined doc/examples/configure-index index ab3657a58,0bf407a4d..f4a196b68 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -97,11 -97,11 +97,11 @@@ AP // consider Recommends, Suggests as important dependencies that should // be installed by default - APT::Install-Recommends "false"; - APT::Install-Suggests "false"; + Install-Recommends "false"; + Install-Suggests "false"; // consider dependencies of packages in this section manual - Never-MarkAuto-Section "metapackages"; + Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; }; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; @@@ -227,6 -227,11 +227,11 @@@ Dir "/ apt-get "/usr/bin/apt-get"; apt-cache "/usr/bin/apt-cache"; }; + + // Location of the logfile + Log "var/log/apt" { + Name "term.log"; + }; }; // Things that effect the APT dselect method diff --combined methods/makefile index f0fd4e414,f178cbbea..e47539dbb --- a/methods/makefile +++ b/methods/makefile @@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma BIN := $(BIN)/methods # FIXME.. --LIB_APT_PKG_MAJOR = 4.4 ++LIB_APT_PKG_MAJOR = 4.5 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@@ -80,9 -80,9 +80,9 @@@ LIB_MAKES = apt-pkg/makefil SOURCE = rsh.cc include $(PROGRAM_H) -# SSH and vzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 +# SSH and bzip2 method symlink +binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma +veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma $(BIN)/ssh: echo "Installing ssh method link" ln -fs rsh $(BIN)/ssh @@@ -92,10 -92,5 +92,10 @@@ clean-$(BIN)/ssh $(BIN)/bzip2: echo "Installing bzip2 method link" ln -fs gzip $(BIN)/bzip2 +$(BIN)/lzma: + echo "Installing lzma method link" + ln -fs gzip $(BIN)/lzma clean-$(BIN)/bzip2: -rm $(BIN)/bzip2 +clean-$(BIN)/lzma: + -rm $(BIN)/lzma