From 94cb04ddd1f9221e16680dceb98afad6a1273c50 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:01:52 +0200 Subject: Fixed bashisms in apt-key. --- cmdline/apt-key | 6 +++--- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..94c11497c 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) + keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` old_mtime=0 if [ -e $keyring ]; then - old_mtime=$(stat -c %Y $keyring) + old_mtime=`stat -c %Y $keyring` fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=$(stat -c %Y $keyring) + new_mtime=`stat -c %Y $keyring` if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING diff --git a/debian/changelog b/debian/changelog index 40e1cc23d..dedb574b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + * cmdline/apt-key: + - Fixed bashisms; -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3 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/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dedb574b8..07360eca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.17) unstable; urgency=low (Closes: #425150) * cmdline/apt-key: - Fixed bashisms; + * debian/rules: + - Fixed lintian warnings "debian/rules ignores make errors". -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 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 From 9b9eb42ace92e3dd2e0a3e5fcaeb251708517106 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:08:12 +0200 Subject: 'Source-Version' in debian/control became 'binary:Version'. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 07360eca6..832f41be1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.17) unstable; urgency=low - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". + * debian/control: + - Substituted outdated "Source-Version" fields with "binary:Version". -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/control b/debian/control index a3c84d72a..e3a727e84 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${Source-Version}), apt-utils (= ${Source-Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3 From a76446ffb2496427d4268c191c4ffdea3bfac3a9 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:33:12 +0200 Subject: Fixed 'Devel' -> 'Debian' doc-base sections. --- debian/changelog | 3 +++ debian/libapt-pkg-doc.doc-base.cache | 2 +- debian/libapt-pkg-doc.doc-base.dpkg-tech | 2 +- debian/libapt-pkg-doc.doc-base.files | 2 +- debian/libapt-pkg-doc.doc-base.method | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 832f41be1..14f6ffd27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ apt (0.7.17) unstable; urgency=low - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". + * debian/libapt-pkg-doc.doc-base.*: + - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate + lintian warnings. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index 59558dee8..4b47db810 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -8,7 +8,7 @@ Abstract: The APT Cache Specification describes the complete implementation tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/cache.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech index 3afc262e9..055e8e674 100644 --- a/debian/libapt-pkg-doc.doc-base.dpkg-tech +++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech @@ -3,7 +3,7 @@ Title: APT's interpetation of DPkg Technical Specification Author: Jason Gunthorpe Abstract: The DPkg Technical Manual gives an overview of dpkg's external functions(as APT sees them) and describes how it views the world. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.files b/debian/libapt-pkg-doc.doc-base.files index e0b79358c..a9faec027 100644 --- a/debian/libapt-pkg-doc.doc-base.files +++ b/debian/libapt-pkg-doc.doc-base.files @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Files document describes the complete implementation and format of the installed APT directory structure. It also serves as guide to how APT views the Debian archive. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/files.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.method b/debian/libapt-pkg-doc.doc-base.method index 61c361251..f40d875bd 100644 --- a/debian/libapt-pkg-doc.doc-base.method +++ b/debian/libapt-pkg-doc.doc-base.method @@ -3,7 +3,7 @@ Title: APT Method Interface Author: Jason Gunthorpe Abstract: The APT Method Interface document describes the interface that APT uses to the archive access methods. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/method.html/index.html -- cgit v1.2.3 From 7b4159cf2a4b7de10622c7e4e29247067358a3ab Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:34:27 +0200 Subject: Added 'python-apt' to Suggests of apt (because of apt-mark). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 14f6ffd27..d2e8fcc52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.7.17) unstable; urgency=low - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". + - Added 'python-apt' to Suggests, as apt-mark need it for work. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. diff --git a/debian/control b/debian/control index e3a727e84..468d1f641 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3 From 0c96f6dfdc1cb3a64b1be05bb192463d1601edc0 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:17:01 +0200 Subject: Added 'set -e' to maintainer scripts. --- debian/changelog | 3 +++ debian/postrm | 2 ++ debian/preinst | 2 ++ debian/prerm | 2 ++ 4 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index d2e8fcc52..47e2d9587 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.7.17) unstable; urgency=low * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. + * debian/{postrm,prerm,preinst}: + - Added 'set -e', fixes lintian warnings + 'maintainer-script-ignores-error'. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/debian/postrm b/debian/postrm index 8b921dda1..ae1e18d33 100755 --- a/debian/postrm +++ b/debian/postrm @@ -8,6 +8,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +set -e + #DEBHELPER# case "$1" in diff --git a/debian/preinst b/debian/preinst index 276eae5de..985ad9b84 100755 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,7 @@ #! /bin/sh +set -e + # dpkg does this for us while we are upgrading.. #if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then # rm /var/state/apt diff --git a/debian/prerm b/debian/prerm index ac70a0279..4a8d47782 100755 --- a/debian/prerm +++ b/debian/prerm @@ -1,5 +1,7 @@ #! /bin/sh +set -e + #DEBHELPER# if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && -- cgit v1.2.3 From f72538c52031241cb3cb3cd46c87cd046e20f237 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:21:22 +0200 Subject: Removed unneeded 'LOCAL' entry, now clean runs smoothly in dselect/ directory. --- debian/changelog | 2 ++ dselect/makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47e2d9587..58e3f15d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.17) unstable; urgency=low * debian/{postrm,prerm,preinst}: - Added 'set -e', fixes lintian warnings 'maintainer-script-ignores-error'. + * dselect/makefile: + - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 diff --git a/dselect/makefile b/dselect/makefile index c2059f92a..fab72b264 100644 --- a/dselect/makefile +++ b/dselect/makefile @@ -11,7 +11,7 @@ TO = $(BUILD)/scripts/dselect TARGET = program include $(COPY_H) -LOCAL = dselect +# LOCAL = dselect SOURCE = install update TYPE = sh include $(PODOMAIN_H) -- cgit v1.2.3 From 18c497690be5c6de0d8fcab2729f0c13d782ce8e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 23:29:37 +0200 Subject: Dropped Debian revision '-1' from build dependency on 'doc-base'. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 58e3f15d1..9a86b3fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ apt (0.7.17) unstable; urgency=low * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". - Added 'python-apt' to Suggests, as apt-mark need it for work. + - Drop Debian revision from 'doc-base' build dependency, this fixes + appropriate lintian warning. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. diff --git a/debian/control b/debian/control index 468d1f641..0f72299b6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 -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-1), xsltproc, docbook-xsl, xmlto +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 XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3 From 20ba2505a3a2e9f2c526800d154270edce22d78f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 20:24:05 +0200 Subject: Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism. --- cmdline/apt-key | 6 +++--- debian/changelog | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 94c11497c..51a0bc2d1 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` + keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) old_mtime=0 if [ -e $keyring ]; then - old_mtime=`stat -c %Y $keyring` + old_mtime=$(stat -c %Y $keyring) fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=`stat -c %Y $keyring` + new_mtime=$(stat -c %Y $keyring) if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING diff --git a/debian/changelog b/debian/changelog index 9a86b3fa5..c6b7b170c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,6 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) - * cmdline/apt-key: - - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: -- cgit v1.2.3 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 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 From dac074b0ad8925ea542edea8ffd113736364344e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 21:21:18 +0200 Subject: Added 'unset GREP_OPTIONS' to apt-key. --- cmdline/apt-key | 1 + debian/changelog | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..7bb30240e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,6 +1,7 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available diff --git a/debian/changelog b/debian/changelog index 625dd8e0b..beef99123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ apt (0.7.17) unstable; urgency=low - 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. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3