The following commit has been merged in the master branch: commit edb5b7598366738eb4d3b48ddff2dcef9cda4c54 Author: Guillem Jover <guil...@debian.org> Date: Thu May 14 07:49:59 2009 +0200
Remove obsolete 822-date program It has long been superseeded by ‘date -R’. diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule index 6b2293c..76d8365 100644 --- a/README.feature-removal-schedule +++ b/README.feature-removal-schedule @@ -1,13 +1,6 @@ This is a list of features that are scheduled to be removed from dpkg. -What: 822-date (program) -Status: obsolete -When: lenny+1 -Warning: program -Why: - Should switch to use 'date -R'. - What: Source-Version (substvar) Status: obsolete When: lenny+1 @@ -100,3 +93,9 @@ Why: These priorities have been superseded by either other fields or values in other fields. +What: 822-date (program) +Status: removed +When: 1.15.1 +Why: + Should switch to use 'date -R'. + diff --git a/debian/changelog b/debian/changelog index ce952b7..5855a82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Remove obsolete --largemem and --smallmem dpkg options. * Remove obsolete --force-auto-select dpkg option. * Remove obsolete priorities support from dpkg. + * Remove obsolete 822-date program. [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/debian/dpkg-dev.install b/debian/dpkg-dev.install index 628468d..1e2c639 100644 --- a/debian/dpkg-dev.install +++ b/debian/dpkg-dev.install @@ -1,7 +1,6 @@ ../shlibs.default etc/dpkg ../shlibs.override etc/dpkg -usr/bin/822-date usr/bin/dpkg-architecture usr/bin/dpkg-buildpackage usr/bin/dpkg-checkbuilddeps @@ -18,7 +17,6 @@ usr/bin/dpkg-source usr/bin/dpkg-vendor usr/lib/dpkg/parsechangelog usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo -usr/share/man/{*/*,*}/822-date.1 usr/share/man/{*/*,*}/deb-control.5 usr/share/man/{*/*,*}/deb-version.5 usr/share/man/{*/*,*}/deb-substvars.5 diff --git a/debian/usertags b/debian/usertags index 8e26281..ef4ff74 100644 --- a/debian/usertags +++ b/debian/usertags @@ -82,7 +82,6 @@ libdpkg-perl Dpkg perl modules. cleanup-info [CLEANUP-INFO] install-info [INSTALL-INFO] -822-date [822-DATE] dpkg-dev Those should be reassigned to the dpkg-dev package. @@ -120,7 +119,6 @@ usercategory dpkg-program + Dpkg perl modules [tag=libdpkg-perl] + start-stop-daemon [tag=s-s-d] + update-alternatives [tag=u-a] - + 822-date [tag=822-date] + cleanup-info [tag=cleanup-info] + install-info [tag=install-info] + dselect [package=dselect] diff --git a/man/822-date.1 b/man/822-date.1 deleted file mode 100644 index afe9251..0000000 --- a/man/822-date.1 +++ /dev/null @@ -1,40 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH 822\-date 1 "2007-01-24" "Debian Project" "dpkg utilities" -.SH NAME -822\-date \- Print date and time in RFC2822 format -. -.SH SYNOPSIS -.B 822\-date -. -.SH DESCRIPTION -.B 822\-date -displays the current date and time in the format described in RFC2822. -It does so by simply calling -.BR date (1) -with the \fB\-R\fP option. -.PP -.B Using 822\-date is deprecated since -.BR date (1) -provides the same functionality when called with the \fB\-R\fP. -. -.SH OPTIONS -.B 822\-date -does not take any arguments or options. -. -.SH BUGS -This facility really ought to be part of -.BR date (1). -. -.SH SEE ALSO -.I Internet Message Format -(RFC2822), -.BR date (1). -. -.SH AUTHOR -.B 822\-date -is a really simple wrapper around -.BR date (1). -By its simplicity, the code is probably not copyrightable and -should be considered to be in the public domain. This man page -was written by Frank Lichtenheld based on an earlier version -by Ian Jackson and was also put in the public domain. diff --git a/man/Makefile.am b/man/Makefile.am index 6c582dc..592b6d8 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -71,7 +71,6 @@ dist-hook: man.stamp done dist_man_MANS = \ - 822-date.1 \ deb-control.5 \ deb-version.5 \ deb-shlibs.5 \ diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg index 0e6524f..598cd82 100644 --- a/man/po/po4a.cfg +++ b/man/po/po4a.cfg @@ -13,11 +13,6 @@ opt_ru:"-L koi8-r -A koi8-r" \ opt_sv:"-L ISO-8859-1" -[type:man] $(srcdir)/822-date.1 \ - $lang:$lang/822-date.1 \ - add_$lang:$(srcdir)/po/$lang.add - - [type:man] $(srcdir)/deb.5 \ $lang:$lang/deb.5 \ add_$lang:$(srcdir)/po/$lang.add diff --git a/scripts/.gitignore b/scripts/.gitignore index 0889294..0511562 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -16,5 +16,4 @@ dpkg-statoverride update-alternatives install-info install-info-stamp -822-date t.tmp diff --git a/scripts/822-date.pl b/scripts/822-date.pl deleted file mode 100755 index be0d8d0..0000000 --- a/scripts/822-date.pl +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/perl -- - -use strict; -use warnings; - -use Dpkg; -use Dpkg::Gettext; -use Dpkg::ErrorHandling; - -textdomain("dpkg-dev"); - -...@argv && die _g("Usage: 822-date")."\n"; - -warning(_g("This program is deprecated. Please use 'date -R' instead.")); - -print `date -R`; - diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d96f760..f0fcdd3 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -3,7 +3,6 @@ SUBDIRS = po bin_SCRIPTS = \ - 822-date \ dpkg-architecture \ dpkg-buildpackage \ dpkg-checkbuilddeps \ @@ -28,7 +27,6 @@ changelog_SCRIPTS = \ EXTRA_DIST = \ README.alternatives \ - 822-date.pl \ dpkg-architecture.pl \ dpkg-buildpackage.pl \ dpkg-checkbuilddeps.pl \ diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 904fa7e..4be1a14 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -1,6 +1,5 @@ # This is the list of all source files with translatable strings. -scripts/822-date.pl scripts/dpkg-architecture.pl scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org