diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/archtable | 4 | ||||
| -rw-r--r-- | debian/changelog | 49 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/dpkg.cfg | 2 | ||||
| -rw-r--r-- | debian/dpkg.install | 1 | ||||
| -rw-r--r-- | debian/dpkg.logrotate | 9 | ||||
| -rwxr-xr-x | debian/dpkg.postinst | 5 | ||||
| -rwxr-xr-x | debian/dpkg.postrm | 7 | ||||
| -rwxr-xr-x | debian/dpkg.preinst | 15 | ||||
| -rwxr-xr-x | debian/dpkg.prerm | 12 |
10 files changed, 96 insertions, 11 deletions
diff --git a/debian/archtable b/debian/archtable index 63e566648..86194e19f 100644 --- a/debian/archtable +++ b/debian/archtable @@ -11,7 +11,7 @@ # by ‘dpkg --print-architecture’. # # <ignore> <Debian name> -i386-linux-gnu i386 +i486-linux-gnu i386 ia64-linux-gnu ia64 alpha-linux-gnu alpha arm-linux-gnu arm @@ -23,4 +23,4 @@ powerpc-linux-gnu powerpc s390-linux-gnu s390 sh-linux-gnu sh sparc-linux-gnu sparc -i386-gnu hurd-i386 +i486-gnu hurd-i386 diff --git a/debian/changelog b/debian/changelog index 04bd24ef0..76fe513a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,32 @@ +dpkg (1.13.5) experimental; urgency=low + + The "Flatulent Elm of West Ruislip" Release. + + * Actions and package states are now logged by default in the + /var/log/dpkg.log file. This file is rotated monthly and can be + disabled by commenting the line in /etc/dpkg/dpkg.cfg. + * User decisions about conffiles are now logged. + * dpkg-source no longer complains about Enhances field. Closes: #159642, + #159745, #159746. + * preinst no longer relies on procps being installed. Closes: #311808. + + * Architecture Support: + - Change DEB_*_GNU_CPU from i386 to i486, to reflect reality. + DEB_*_ARCH_CPU remains at i386, you should be checking against that. + Closes: #310394. + - Fixed order ostable is read to prevent Linux becoming the Hurd. + Closes: #309603. + * Updated Manpage Translations (Christian Perrier): + - Syntax error corrected in Swedish man page for dpkg-deb. + Closes: #300980. + - Syntax error corrected in Spanish man page for dpkg-scanpackages. + Closes: #300981 + + -- Scott James Remnant <scott@netsplit.com> Mon, 6 Jun 2005 05:34:21 +0100 + dpkg (1.13.4) experimental; urgency=low - The "Or the Wabbit gets it" Release + The "Or the Wabbit gets it" Release. * Add -L option to dpkg-architecture to list architecture strings we can accept. @@ -131,10 +157,29 @@ dpkg (1.13.0) experimental; urgency=low * Remove SGML and POD documentation formats due to both licensing and sanity issues. Closes: #285806. * The dpkg-doc and dpkg-static packages are no more. - * dpkg.cfg cleaned up to remove non-useful examples. Closes: #169618. + * dpkg.cfg cleaned up to remove non-useful examples. + Closes: #169618, #305192. -- Scott James Remnant <scott@netsplit.com> Fri, 14 Jan 2005 19:28:00 +0000 +dpkg (1.10.28) unstable; urgency=low + + The "Awh, yeah? Ripper!" Release. + + * New Translations (Christian Perrier): + - Romanian (Eddy Petrisor). Closes: #309714. + - Tagalog (Eric Pareja). Closes: #296407. + * Updated Translations (Christian Perrier): + - French (Christian Perrier). + - Greek (Konstantinos Margaritis). Closes: #295922 + - Indonesian (Arief S Fitrianto). Closes: #296733 + * Updated Manpage Translations (Christian Perrier): + - French (Philippe Batailler). + - Syntax error corrected in Brazilian Portuguese man page for + update-alternatives. Closes: #300646 + + -- Scott James Remnant <scott@netsplit.com> Thu, 26 May 2005 18:18:10 +0100 + dpkg (1.10.27) unstable; urgency=low The "Grab your gun and bring in the cat" Release. diff --git a/debian/control b/debian/control index 0b688cd9f..1eefe4b2d 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,7 @@ Source: dpkg Section: base Priority: required -Maintainer: Dpkg Development <debian-dpkg@lists.debian.org> -Uploaders: Scott James Remnant <scott@netsplit.com> +Maintainer: Scott James Remnant <scott@netsplit.com> Origin: debian Bugs: debbugs://bugs.debian.org Standards-Version: 3.6.1.0 diff --git a/debian/dpkg.cfg b/debian/dpkg.cfg index 5970eccb6..1e6ff71b8 100644 --- a/debian/dpkg.cfg +++ b/debian/dpkg.cfg @@ -6,4 +6,4 @@ # # Log status changes and actions to a file. -#log /var/log/dpkg.log +log /var/log/dpkg.log diff --git a/debian/dpkg.install b/debian/dpkg.install index b9f80aaa7..0807920be 100644 --- a/debian/dpkg.install +++ b/debian/dpkg.install @@ -1,4 +1,5 @@ ../dpkg.cfg etc/dpkg +../dpkg.logrotate etc/logrotate.d/dpkg ../archtable usr/share/dpkg etc/alternatives diff --git a/debian/dpkg.logrotate b/debian/dpkg.logrotate new file mode 100644 index 000000000..c9d499186 --- /dev/null +++ b/debian/dpkg.logrotate @@ -0,0 +1,9 @@ +/var/log/dpkg.log { + monthly + rotate 12 + compress + delaycompress + missingok + notifempty + create 640 root adm +} diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index 3aeda563c..be5d107ea 100755 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -139,11 +139,10 @@ Shall I remove these links ? [y/n] " # Divert textutils/coreutils md5sum now that we no longer provide it divert_md5sum() { - if [ -f /usr/bin/md5sum.textutils ] && [ ! -f /usr/bin/md5sum ]; then + if [ ! -f /usr/bin/md5sum ]; then dpkg-divert --divert /usr/bin/md5sum --rename /usr/bin/md5sum.textutils fi - if [ -f /usr/share/man/man1/md5sum.textutils.1.gz ] \ - && [ ! -f /usr/share/man/man1/md5sum.1.gz ]; then + if [ ! -f /usr/share/man/man1/md5sum.1.gz ]; then dpkg-divert --divert /usr/share/man/man1/md5sum.1.gz --rename \ /usr/share/man/man1/md5sum.textutils.1.gz fi diff --git a/debian/dpkg.postrm b/debian/dpkg.postrm index cd11e28be..0659aea90 100755 --- a/debian/dpkg.postrm +++ b/debian/dpkg.postrm @@ -27,11 +27,18 @@ # <new-postrm> abort-upgrade <old-version> +# Remove log file when dpkg is purged +remove_logfile() { + rm -f /var/log/dpkg.log /var/log/dpkg.log.* 2>/dev/null +} + + case "$1" in remove) ;; purge) + remove_logfile ;; upgrade|failed-upgrade|disappear|abort-install|abort-upgrade) diff --git a/debian/dpkg.preinst b/debian/dpkg.preinst index 7d3a00a8c..eb5b5e31b 100755 --- a/debian/dpkg.preinst +++ b/debian/dpkg.preinst @@ -95,7 +95,9 @@ Are you installing only the dpkg upgrade in this dpkg run ? [y/n] " # Confirm that dselect got split into it's own package confirm_dselect_split() { - ps -C dselect >/dev/null || return + if [ -x /bin/ps ]; then + ps -C dselect >/dev/null || return + fi if ! grep "^Package: *dselect$" /var/lib/dpkg/status >/dev/null; then echo -n " @@ -139,8 +141,17 @@ remove_hd_method() { } +# Create log file and set default permissions +create_logfile() { + touch /var/log/dpkg.log + chmod 640 /var/log/dpkg.log + chown root:adm /var/log/dpkg.log +} + + case "$1" in install) + create_logfile ;; upgrade) @@ -161,6 +172,8 @@ case "$1" in confirm_dselect_split ;; esac + + create_logfile ;; abort-upgrade) diff --git a/debian/dpkg.prerm b/debian/dpkg.prerm index 50477bcb5..a7211f1cb 100755 --- a/debian/dpkg.prerm +++ b/debian/dpkg.prerm @@ -18,8 +18,20 @@ # <prerm> remove in-favour <new-package> <version> +# Remove the md5sum diversion on removal or downgrade +undivert_md5sum() { + dpkg-divert --rename --remove /usr/bin/md5sum + dpkg-divert --rename --remove /usr/share/man/man1/md5sum.1.gz +} + + case "$1" in remove|upgrade) + case "$2" in + 0.* | 1.[0123456789].* | 1.10 | 1.10.* | 1.13.[01234] | '') + undivert_md5sum + ;; + esac ;; failed-upgrade|deconfigure) |