From: Ian Jackson Date: Wed, 14 Aug 1996 13:46:47 +0000 (+0100) Subject: dpkg (1.3.5) experimental; urgency=low (high for debian-changelog-mode) X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ae3bb28c3a2faaf0f4aea57ac8bd245dd36af9;p=dpkg dpkg (1.3.5) experimental; urgency=low (high for debian-changelog-mode) * 822-date script included. (Bug#4136.) * debian-changelog-add-version works on empty file. * debian-changelog-mode mode-help works properly. * dpkg-source tells patch not to make numbered backups. (Bug#4135.) * More developers' PGP keys. * Paragraph on uucp -a and -g options removed from policy manual. -- Ian Jackson Wed, 14 Aug 1996 14:46:47 +0100 --- diff --git a/debian/changelog b/debian/changelog index e2ee9440..04292326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +dpkg (1.3.5) experimental; urgency=low (high for debian-changelog-mode) + + * 822-date script included. (Bug#4136.) + * debian-changelog-add-version works on empty file. + * debian-changelog-mode mode-help works properly. + + * dpkg-source tells patch not to make numbered backups. (Bug#4135.) + + * More developers' PGP keys. + * Paragraph on uucp -a and -g options removed from policy manual. + + -- Ian Jackson Wed, 14 Aug 1996 14:46:47 +0100 + dpkg (1.3.4) experimental; urgency=low * Removed debugging output from dpkg-source -x. Oops. diff --git a/doc/developer-keys.bak b/doc/developer-keys.bak new file mode 100644 index 00000000..dfbf9df1 Binary files /dev/null and b/doc/developer-keys.bak differ diff --git a/doc/developer-keys.pgp b/doc/developer-keys.pgp index 3877423a..10692b2c 100644 Binary files a/doc/developer-keys.pgp and b/doc/developer-keys.pgp differ diff --git a/doc/policy.sgml b/doc/policy.sgml index 9517a326..2994a9a8 100644 --- a/doc/policy.sgml +++ b/doc/policy.sgml @@ -915,10 +915,6 @@ mail is /usr/sbin/rmail, as per the FSSTND. Likewise, /usr/sbin/rsmtp if it is supported.

-Smail is not using HoneyDanBer UUCP, whose - If you need to know what name to use (for example) on outgoing news and mail messages which are generated locally, you should use the file /etc/mailname. It will contain the portion after the username @@ -1125,6 +1121,12 @@ If you do not have a PGP key yet generate one. You should probably read the PGP manual, as it has much important information which is critical to its security. Many more security failures are due to human error than to software failure or high-powered spy techniques. +

+ +If you live in a country where use of cryptography even for signing is +forbidden then please contact us so we can make special arrangements. +This does not apply in France, where I believe only encryption and not +signing is forbidden. When you have a package to upload

diff --git a/scripts/822-date.1 b/scripts/822-date.1 new file mode 100644 index 00000000..5fb56a47 --- /dev/null +++ b/scripts/822-date.1 @@ -0,0 +1,29 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.\" Authors: Ian Jackson +.TH 822\-DATE 1 "14th August 1996" "Debian Project" "Debian GNU/Linux manual" +.SH NAME +822\-date \- Print date and time in RFC822 format +.SH SYNOPSIS +.B 822\-date +.SH DESCRIPTION +.B 822\-date +displays the current date and time in the format described in RFC822, +using a numeric timezone offset as recommended in RFC1123. +.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 Standard for the Format of ARPA Internet Text Messages +(RFC822), +.br +.I Requirements for Internet Hosts -- Application and Support +(RFC1123) section 5.2.14, +.br +.BR date (1). +.SH AUTHOR +.B 822\-date +and this manpage were written by Ian Jackson. They are hereby placed +by him into the public domain. diff --git a/scripts/822-date.pl b/scripts/822-date.pl new file mode 100644 index 00000000..7ce7602a --- /dev/null +++ b/scripts/822-date.pl @@ -0,0 +1,9 @@ +#!/usr/bin/perl -- +# I hereby place this in the public domain - Ian Jackson, 1995. +@ARGV && die "usage: 822-date\n"; +$x=time; sub z { $_[1]+$_[2]*60; }; @l=localtime($x); $od=1440; +$d=&z(@l)-&z(gmtime($x)); $d+=$od; $d%=$od; $s=$d>$od/2?($d=$od-$d,'-'):'+'; +printf("%s, %d %s %d %02d:%02d:%02d %s%02d%02d\n", + (Sun,Mon,Tue,Wed,Thu,Fri,Sat)[$l[6]], $l[3], + (Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec)[$l[4]], $l[5]+1900, + $l[2],$l[1],$l[0], $s,$d/60,$d%60) || die "822-date: output error: $!\n"; diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 4103c695..a6d86781 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -36,12 +36,12 @@ etcdir= /etc altsetcdir = $(etcdir)/alternatives perlpath = @perlpath@ -MAN1 = dpkg-name dpkg-source +MAN1 = dpkg-name dpkg-source 822-date LSMAN = dpkg-source.$(man1) LSMANL= dpkg-gencontrol dpkg-genchanges dpkg-buildpackage \ dpkg-distaddfile dpkg-parsechangelog EXC = dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \ - dpkg-buildpackage dpkg-parsechangelog dpkg-distaddfile + dpkg-buildpackage dpkg-parsechangelog dpkg-distaddfile 822-date MAN8 = update-rc.d start-stop-daemon update-alternatives install-info \ dpkg-scanpackages SBIN = update-rc.d start-stop-daemon update-alternatives install-info \ diff --git a/scripts/debian-changelog-mode.el b/scripts/debian-changelog-mode.el index aae0548c..9da6c890 100644 --- a/scripts/debian-changelog-mode.el +++ b/scripts/debian-changelog-mode.el @@ -105,19 +105,21 @@ finalised yet (ie, has a maintainer name and email address and a release date." (save-excursion (goto-char (point-min)) - (if (re-search-forward "\n\\S-" (point-max) t) nil - (goto-char (point-max))) - (if (re-search-backward "\n --" (point-min) t) - (forward-char 4) - (beginning-of-line) - (insert " --\n\n") - (backward-char 2)) - (cond - ((looking-at "[ \n]+\\S-[^\n\t]+\\S- <[^ \t\n<>]+> \\S-[^\t\n]+\\S-[ \t]*\n") - t) - ((looking-at "[ \t]*\n") - nil) - ("finalisation line has bad format (not ` -- maintainer date')")))) + (if (re-search-forward "\n\\S-" (point-max) t) + (progn + (if (re-search-backward "\n --" (point-min) t) + (forward-char 4) + (beginning-of-line) + (insert " --\n\n") + (backward-char 2)) + (cond + ((looking-at "[ \n]+\\S-[^\n\t]+\\S- <[^ \t\n<>]+> \\S-[^\t\n]+\\S-[ \t]*\n") + t) + ((looking-at "[ \t]*\n") + nil) + (t + "finalisation line has bad format (not ` -- maintainer date')"))) + t))) (defun debian-changelog-add-version () "Add a new version section to a debian-style changelog file." @@ -132,7 +134,7 @@ release date." (number-to-string (+ 1 (string-to-number (match-string 2)))) (match-string 3)) (let ((pkg (read-string "Package name: ")) - (ver (read-version "New version (including any revision): "))) + (ver (read-string "New version (including any revision): "))) (concat pkg " (" ver ") unstable; urgency=" (cdr (car debian-changelog-urgencies))))))) (insert headstring "\n\n * ") @@ -190,7 +192,7 @@ Runs `debian-changelog-mode-hook' if it exists. Key bindings: -\\{dpkg-changelog-mode-map}" +\\{debian-changelog-mode-map}" (interactive) (kill-all-local-variables) (text-mode) diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index d96993c7..46110e8c 100644 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -504,7 +504,8 @@ if ($opmode eq 'build') { if (!$c2) { open(STDIN,"<&GZIP") || &syserr("reopen gzip for patch"); chdir($newdirectory) || &syserr("chdir to $newdirectory for patch"); - exec('patch','-b','.dpkg-orig','-s','-t','-F','0','-N','-p1','-u'); + exec('patch','-s','-t','-F','0','-N','-p1','-u', + '-V','never','-b','.dpkg-orig'); &syserr("exec patch"); } close(GZIP);