--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: apt: debian/rules improvements -- EOL whitespace, long options, POSIX cmd substitution
- From: Jari Aalto <jari.aalto@cante.net>
- Date: Wed, 14 Apr 2010 21:46:40 +0300
- Message-id: <20100414184640.1773.85358.reportbug@jondo.cante.net>
Package: apt
Version: 0.7.25.3
Severity: wishlist
The following patch is against:
r1687 nosmart+http://bzr.debian.org/apt/apt/debian-experimental/
Suggested changes:
* Spell out the meanng of options by using --long option formats where
possible. This will help reading the code without consulting the
manual pages.
* Remove subshell calls in on-line context like "(cd DIR; cmd)"
* Utilize GNU tar --directory option in cases like "cd DIR; tar ..."
* Use readable POSIX command substitution: $(<command sequence>)
in place of traditional backticks
* Remove EOL whitespace
-- Package-specific info:
-- (/etc/apt/preferences present, but not submitted) --
-- (/etc/apt/sources.list present, but not submitted) --
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages apt depends on:
ii debian-archive-keyring 2009.01.31 GnuPG archive keys of the Debian a
ii libc6 2.10.2-6 Embedded GNU C Library: Shared lib
ii libgcc1 1:4.4.3-7 GCC support library
ii libstdc++6 4.4.3-7 The GNU Standard C++ Library v3
apt recommends no packages.
Versions of packages apt suggests:
pn apt-doc <none> (no description available)
ii aptitude 0.6.1.5-3 terminal-based package manager (te
ii bzip2 1.0.5-4 high-quality block-sorting file co
ii dpkg-dev 1.15.5.6 Debian package development tools
ii lzma 4.43-14 Compression method of 7z format in
ii python-apt 0.7.94.2 Python interface to libapt-pkg
-- no debconf information
>From 740701c02c05db12813cdd412b24de1c2cac9c96 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 14 Apr 2010 21:38:08 +0300
Subject: [PATCH] debian/rules: use readable --long options and POSIX command substitution.
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
* Spell out the meanng of options by using --long option formats where
possible. This will help reading the code without consulting the
manual pages.
* Remove subshell calls in on-line context like "(cd DIR; cmd)"
* Utilize GNU tar --directory option in cases like "cd DIR; tar ..."
* Use readable POSIX command substitution: $(<command sequence>)
in place of traditional backticks
* Remove EOL whitespace
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
rules | 66 +++++++++++++++++++++++++++++++++-------------------------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/rules b/rules
index 9d8497e..e843f68 100755
--- a/rules
+++ b/rules
@@ -32,7 +32,7 @@ BASE=.
ifdef BUILD
BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
else
-BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname --machine) $(BASE)/build
endif
BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX))))
@@ -70,7 +70,7 @@ LIBAPTINST_PROVIDE=libapt-inst$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
debian/shlibs.local: apt-pkg/makefile
# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
# one for the rest of the packages. This ensures that each package gets
- # the right overrides..
+ # the right overrides..
rm -rf $@ $@.apt $@.apt-utils
echo "libapt-pkg$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
@@ -80,8 +80,8 @@ debian/shlibs.local: apt-pkg/makefile
echo "libapt-pkg$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
echo "libapt-inst$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
-build: build/build-stamp
-build-doc: build/build-doc-stamp
+build: build/build-stamp
+build-doc: build/build-doc-stamp
# Note that this is unconditionally done first as part of loading environment.mak
# The true is needed to force make to reload environment.mak after running
@@ -92,7 +92,7 @@ build/environment.mak: build/configure-stamp
configure: configure.in
build/configure-stamp: configure
dh_testdir
- -mkdir build
+ mkdir --parents build
cp COPYING debian/copyright
cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
touch $@
@@ -109,7 +109,7 @@ build/build-doc-stamp: build/configure-stamp
clean:
dh_testdir
-# dh_testroot
+# dh_testroot
[ -f Makefile ] && $(MAKE) clean
[ -f Makefile ] && $(MAKE) distclean
@@ -127,9 +127,9 @@ libapt-pkg-doc: build-doc debian/shlibs.local
dh_installdirs -p$@
#
# libapt-pkg-doc install
-#
+#
dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
- $(BLD)/docs/files* $(BLD)/docs/method* \
+ $(BLD)/docs/files* $(BLD)/docs/method* \
doc/libapt-pkg2_to_3.txt doc/style.txt
dh_installexamples -p$@
@@ -151,7 +151,7 @@ apt-doc: build-doc
#
# Copy the guides
dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
- $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html
+ $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html
dh_installchangelogs -p$@
dh_compress -p$@
dh_fixperms -p$@
@@ -196,7 +196,7 @@ apt: build build-doc debian/shlibs.local
cp share/debian-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
cp debian/apt.conf.security debian/$@/etc/apt/apt.conf.d/05security
-# head -n 500 ChangeLog > debian/ChangeLog
+# head -n 500 ChangeLog > debian/ChangeLog
# copy lintian override
cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt
@@ -207,7 +207,7 @@ apt: build build-doc debian/shlibs.local
rm -f po/*.pot
dh_installexamples -p$@ $(BLD)/docs/examples/*
- dh_installman -p$@
+ dh_installman -p$@
dh_installcron -p$@
dh_installdocs -p$@
dh_installchangelogs -p$@
@@ -216,7 +216,7 @@ apt: build build-doc debian/shlibs.local
dh_fixperms -p$@
dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)'
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt
+ dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt
dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
dh_md5sums -p$@
dh_builddeb -p$@
@@ -231,22 +231,22 @@ libapt-pkg-dev: build debian/shlibs.local
#
cp -a $(BLD)/bin/libapt-pkg*.so debian/libapt-pkg-dev/usr/lib/
cp -a $(BLD)/bin/libapt-inst*.so debian/libapt-pkg-dev/usr/lib/
-# ln -s libapt-pkg.so.$(LIBAPTPKG_MAJOR) debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
+# ln -s libapt-pkg.so.$(LIBAPTPKG_MAJOR) debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
find ./ -regextype awk -regex './(apt-pkg|apt-inst)/.*\.h' -print | while read FILE; do \
install -D $$FILE debian/libapt-pkg-dev/usr/include/$$FILE; \
done
dh_installdocs -p$@
-# dh_installmenu -p$@
-# dh_installinit -p$@
-# dh_installcron -p$@
-# dh_installman -p$@
+# dh_installmenu -p$@
+# dh_installinit -p$@
+# dh_installcron -p$@
+# dh_installman -p$@
dh_installchangelogs -p$@
dh_strip -p$@
dh_compress -p$@
dh_fixperms -p$@
-# dh_suidregister -p$@
+# dh_suidregister -p$@
dh_installdeb -p$@
dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
dh_md5sums -p$@
@@ -273,9 +273,9 @@ apt-utils: build debian/shlibs.local
dh_strip -p$@
dh_compress -p$@
dh_fixperms -p$@
- dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@
+ dh_makeshlibs --major=$(LIBAPTINST_MAJOR) --version-info='$(LIBAPTINST_PROVIDE)' -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils
+ dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils
dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
dh_md5sums -p$@
dh_builddeb -p$@
@@ -287,7 +287,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev
dh_installdirs -p$@
# install the method
- mkdir -p debian/$@/usr/lib/apt/methods
+ mkdir --parents debian/$@/usr/lib/apt/methods
cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
dh_installdocs -p$@ debian/apt-transport-https.README
@@ -301,7 +301,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev
dh_compress -p$@
dh_fixperms -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib
+ dh_shlibdeps -p$@ -l$(pwd)/debian/apt/usr/lib:$(pwd)/debian/$@/usr/lib
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -310,7 +310,7 @@ apt-dbg: apt
dh_testdir -p$@
dh_testroot -p$@
dh_installdirs -p$@
-
+
dh_installdocs -p$@
dh_installchangelogs -p$@
dh_compress -p$@
@@ -319,10 +319,11 @@ apt-dbg: apt
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
-
+
source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+ @echo 'source and diff are obsolete - use dpkg-source -b' >&2
+ false
# Update from CVS
l33ch: really-clean
@@ -339,18 +340,19 @@ l33ch-stamp: super-l33ch
touch $@
really-clean: clean
- -find -name Makefile.in -print0 | xargs -0r rm -f
- find -name ChangeLog | xargs rm -f
- rm -f l33ch-stamp
+ find . -name Makefile.in -print0 | xargs --null --no-run-if-empty rm --force
+ find . -name ChangeLog | xargs --no-run-if-empty rm --force
+ rm --force l33ch-stamp
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary debian/shlibs.local
arch-prepare:
- rm -rf debian/arch-build
- mkdir -p debian/arch-build/apt-$(APT_DEBVER)
- tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
+ rm --recursive --force debian/arch-build
+ mkdir --parents debian/arch-build/apt-$(APT_DEBVER)
+ tar --exclude=arch-build --no-recursion --create --file - $(bzr inventory) | \
+ tar --directory debian/arch-build/$(PKG)-$(APT_DEBVER) -x --file -
arch-build: arch-prepare
- (cd debian/arch-build/apt-$(APT_DEBVER) && debuild)
+ cd debian/arch-build/apt-$(APT_DEBVER) && debuild
--
1.7.0
--- End Message ---
--- Begin Message ---
Source: apt
Source-Version: 0.7.26~exp5
We believe that the bug you reported is fixed in the latest version of
apt, which is due to be installed in the Debian FTP archive:
apt-doc_0.7.26~exp5_all.deb
to main/a/apt/apt-doc_0.7.26~exp5_all.deb
apt-transport-https_0.7.26~exp5_i386.deb
to main/a/apt/apt-transport-https_0.7.26~exp5_i386.deb
apt-utils_0.7.26~exp5_i386.deb
to main/a/apt/apt-utils_0.7.26~exp5_i386.deb
apt_0.7.26~exp5.dsc
to main/a/apt/apt_0.7.26~exp5.dsc
apt_0.7.26~exp5.tar.gz
to main/a/apt/apt_0.7.26~exp5.tar.gz
apt_0.7.26~exp5_i386.deb
to main/a/apt/apt_0.7.26~exp5_i386.deb
libapt-pkg-dev_0.7.26~exp5_i386.deb
to main/a/apt/libapt-pkg-dev_0.7.26~exp5_i386.deb
libapt-pkg-doc_0.7.26~exp5_all.deb
to main/a/apt/libapt-pkg-doc_0.7.26~exp5_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 577804@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Vogt <mvo@debian.org> (supplier of updated apt package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Tue, 25 May 2010 16:01:42 +0200
Source: apt
Binary: apt apt-doc libapt-pkg-dev libapt-pkg-doc apt-utils apt-transport-https
Architecture: source all i386
Version: 0.7.26~exp5
Distribution: experimental
Urgency: low
Maintainer: APT Development Team <deity@lists.debian.org>
Changed-By: Michael Vogt <mvo@debian.org>
Description:
apt - Advanced front-end for dpkg
apt-doc - Documentation for APT
apt-transport-https - APT https transport
apt-utils - APT utility programs
libapt-pkg-dev - Development files for APT's libapt-pkg and libapt-inst
libapt-pkg-doc - Documentation for APT development
Closes: 490347 531492 566166 571541 576752 577804 578135 581159 581742
Changes:
apt (0.7.26~exp5) experimental; urgency=low
.
[ David Kalnischkies ]
* cmdline/apt-get.cc:
- rerun dpkg-source in source if --fix-broken is given (Closes: #576752)
- don't suggest held packages as they are installed (Closes: #578135)
- handle multiple --{tar,diff,dsc}-only options correctly
- show at the end of the install process a list of disappeared packages
* cmdline/apt-cache.cc:
- use GroupCount for package names in stats and add a package struct line
* methods/rred.cc:
- use the patchfile modification time instead of the one from the
"old" file - thanks to Philipp Weis for noticing! (Closes: #571541)
* debian/rules:
- remove targets referring to CVS or arch as they are useless
- use $(CURDIR) instead of $(pwd)
- use dpkg-buildflags if available for CXXFLAGS
* README.arch:
- remove the file completely as it has no use nowadays
* apt-pkg/depcache.cc:
- be doublesure that the killer query is empty before starting reinstall
* methods/gpgv.cc:
- remove the keyrings count limit by using vector magic
* contrib/mmap.cc:
- clarify "MMap reached size limit" error message, thanks Ivan Masár!
* doc/apt.ent
- add entities for the current oldstable/stable/testing codenames
* doc/sources.list.5.xml:
- use stable-codename instead of stable in the examples (Closes: #531492)
* doc/apt_preferences.5.xml:
- adapt some examples here to use current codenames as well
- add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
* debian/libapt-pkg-doc.doc-base.cache:
- remove yet another reference to the removed cache.sgml
* doc/apt-get.8.xml:
- do not say explicit target_release_{name,version,codename}, it should
be clear by itself and 'man' can break lines again (Closes: #566166)
- remove the gnome-apt reference as it is removed from unstable
* apt-pkg/deb/dpkgpm.cc:
- add 'disappear' to the known processing states, thanks Jonathan Nieder
* apt-pkg/packagemanager.h:
- export info about disappeared packages with GetDisappearedPackages()
.
[ Michael Vogt ]
* methods/http.{cc,h}:
- code cleanup, use enums instead of magic ints
.
[ Jari Aalto ]
* debian/rules:
- spell out some less known options to reduce manpage consultation-rate
- Use POSIX command substitution: $(<command sequence>)
- Remove EOL whitespace (Closes: #577804)
.
[ Julian Andres Klode ]
* apt-pkg/acquire-item.cc:
- Fix pkgAcqFile::Custom600Headers() to always return something.
.
.
[ Christian Perrier ]
* Slovak translation update. Closes: #581159
* Italian translation update. Closes: #581742
Checksums-Sha1:
c32878774931d0e255e97f3d27f9749a2c198b03 1258 apt_0.7.26~exp5.dsc
d31d239b2dafc0ffc09d95089d49a10256c3be54 2820873 apt_0.7.26~exp5.tar.gz
1f02e3ac4bb4752e217e234ff745b71aa4b78446 224630 apt-doc_0.7.26~exp5_all.deb
aec022c57ce22b99ff8810b26ec62e9917902682 613508 libapt-pkg-doc_0.7.26~exp5_all.deb
fbf91dcb9c0db65dbb5b022898ecbba74345a598 1916602 apt_0.7.26~exp5_i386.deb
fed35f70cd4ffcc0bb76cb7f1e4c7479c460d011 135632 libapt-pkg-dev_0.7.26~exp5_i386.deb
4b3ba968c1cfdbbff8b92a6e0e3a06c13a8e5a90 261118 apt-utils_0.7.26~exp5_i386.deb
7b6659396afa3f10fe16ebfe1417b570542cd968 74618 apt-transport-https_0.7.26~exp5_i386.deb
Checksums-Sha256:
0e952403749b2af13ecd31a51bb77be8a333d0688790c2596f143d55e0f03336 1258 apt_0.7.26~exp5.dsc
47ef51fdb80c92a247a3a927c5aa84b97b7441b9370df15c3f1628dc1feb0a07 2820873 apt_0.7.26~exp5.tar.gz
bc876ff4add113ef4feb5fd55dfc7a9a15b99417033db6e4db0e1a975b711ecf 224630 apt-doc_0.7.26~exp5_all.deb
de0d0477ade44e1780d68fbcf0bddc8a61c6b3a122084b0a4bc7157d09308a9d 613508 libapt-pkg-doc_0.7.26~exp5_all.deb
0a1a1a426b534e7395055e54e1dc97d14a86e5765c79fccee0c8e0024328a85b 1916602 apt_0.7.26~exp5_i386.deb
c47ff5ed312cecc05457b9c45e8d22e50ed01b7214e930b38b455079f06f371a 135632 libapt-pkg-dev_0.7.26~exp5_i386.deb
3b23658439bfe56529e7cb91b637c2f5a874adbfe902aa79925d87299778aaf9 261118 apt-utils_0.7.26~exp5_i386.deb
5a6b232b70e008f48c0c40ddee514063d1ceaed5e7ae9da1604b8b62c1c97f9c 74618 apt-transport-https_0.7.26~exp5_i386.deb
Files:
fc4eb36e4bbea891b58141d8c458b1f2 1258 admin important apt_0.7.26~exp5.dsc
09455387f47158eaa725085c52e8f903 2820873 admin important apt_0.7.26~exp5.tar.gz
be11f1f598e8fd6a70bccc458e260a17 224630 doc optional apt-doc_0.7.26~exp5_all.deb
294f0339411922eb46171ea5cde1b605 613508 doc optional libapt-pkg-doc_0.7.26~exp5_all.deb
7a7e6bccd8d2a473b05efeda9f9afefb 1916602 admin important apt_0.7.26~exp5_i386.deb
119bf5d2cb8f123bf0e0e7c1abdcf3a6 135632 libdevel optional libapt-pkg-dev_0.7.26~exp5_i386.deb
f2eb4f37419c4f9d59021aaf1863bf79 261118 admin important apt-utils_0.7.26~exp5_i386.deb
cf3d0858227c60356498255d4501e254 74618 admin optional apt-transport-https_0.7.26~exp5_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkv8LpMACgkQliSD4VZixzQg2ACgmO0mZu+SiqMru3s7e/NNJio1
ADUAnA8y1sIH3dXW2KbyfD0q8S9tFN+/
=3nTJ
-----END PGP SIGNATURE-----
--- End Message ---