From f7e51977e235f67cdcf8d3c83d11fe9df2ea3e43 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:04:30 +0200 Subject: Fixed 'debian/rules ignores make errors' lintian warnings. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 006d2de8a..3b9a115d7 100755 --- a/debian/rules +++ b/debian/rules @@ -125,8 +125,8 @@ build/build-doc-stamp: build/configure-stamp clean: dh_testdir # dh_testroot - -$(MAKE) clean - -$(MAKE) distclean + [ -f Makefile ] && $(MAKE) clean + [ -f Makefile ] && $(MAKE) distclean rm -rf build -- cgit v1.2.3-70-g09d2 From acbd8c84cf41ab41172d6197439c36f71220e40e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 20:56:17 +0200 Subject: Added lintian override of 'must depend on python. --- debian/changelog | 4 ++++ debian/rules | 3 +++ share/lintian-overrides | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 share/lintian-overrides (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index c6b7b170c..625dd8e0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ apt (0.7.17) unstable; urgency=low 'maintainer-script-ignores-error'. * dselect/makefile: - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. + * share/lintian-overrides: + - Added with override of 'apt must depend on python'. Script 'apt-mark' + needs apt-python for working and checks this on fly. We don't want + python in most cases. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/rules b/debian/rules index 3b9a115d7..f6ff3c47a 100755 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,9 @@ apt: build debian/shlibs.local cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog + # copy lintian override + cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt + # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir rm -f build/po/*.pot diff --git a/share/lintian-overrides b/share/lintian-overrides new file mode 100644 index 000000000..49c5ce53c --- /dev/null +++ b/share/lintian-overrides @@ -0,0 +1,3 @@ +# apt-mark is rarely used auxiliary script, we don't want to depend on +# python-apt only for it. +apt binary: python-script-but-no-python-dep ./usr/bin/apt-mark -- cgit v1.2.3-70-g09d2 From 425684e05521bba07b03dc2c5e647908ce757141 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:52:36 +0200 Subject: Fix 'dpkg-buildpackage -B' FTBFS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 1f39db3b4..ca8c6cea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.18) unstable; urgency=low * doc/apt-get.8.xml: - Advanced descriptions for 'remove' and 'purge' options. (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/debian/rules b/debian/rules index f6ff3c47a..f587b141a 100755 --- a/debian/rules +++ b/debian/rules @@ -186,7 +186,7 @@ apt-doc: build-doc # Build architecture-dependent files here. binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https -apt: build debian/shlibs.local +apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k -- cgit v1.2.3-70-g09d2 From 370ad5e1849d4e6f5713e840d4cd38160ff80683 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 22:14:52 +0200 Subject: Documented briefly 'APT::https' group of options. --- debian/changelog | 2 ++ debian/rules | 2 +- doc/apt.conf.5.xml | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index fc8cde53b..3535ca5f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.20) unstable; urgency=low from 0.6.46.1 to 0.7.0. (Closes: #439866) * 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) -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/debian/rules b/debian/rules index f587b141a..f1eb62b57 100755 --- a/debian/rules +++ b/debian/rules @@ -307,7 +307,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev mkdir -p debian/$@/usr/lib/apt/methods cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods - dh_installdocs -p$@ + dh_installdocs -p$@ debian/apt-transport-https.README dh_installexamples -p$@ # Install the man pages.. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index ce7012460..35987f8d8 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -220,6 +220,29 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; require this are in violation of RFC 2068. + https + HTTPS URIs. Cache-control and proxy options are the same as for + http method. + Pipeline-Depth option is not supported yet. + + CaInfo suboption specifies place of file that + holds info about trusted certificates. + <host>::CaInfo is corresponding per-host option. + Verify-Peer boolean suboption determines whether verify + server's host certificate against trusted certificates or not. + <host>::Verify-Peer is corresponding per-host option. + Verify-Host boolean suboption determines whether verify + server's hostname or not. + <host>::Verify-Host is corresponding per-host option. + SslCert determines what certificate to use for client + authentication. <host>::SslCert is corresponding per-host option. + SslKey determines what private key to use for client + authentication. <host>::SslKey is corresponding per-host option. + SslForceVersion overrides default SSL version to use. + Can contain 'TLSv1' or 'SSLv3' string. + <host>::SslForceVersion is corresponding per-host option. + + ftp FTP URIs; ftp::Proxy is the default proxy server to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/ and is -- cgit v1.2.3-70-g09d2