diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | scripts/dpkg-scansources.pl | 2 |
4 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Dec 21 15:59:35 CET 1999 Wichert Akkerman <wakkerma@debian.org> + + * scripts/dpkg-scansoures.pl: don't use \z since that is perl5.005-specific. + Patch from Roderick Schertler <roderick@argon.org> + * debian/rules: fix typo so cleanup-info.8 actually gets installed + Fri Dec 17 00:41:50 CET 1999 Wichert Akkerman <wakkerma@debian.org> * Makefile.conf.in: use @libdir@ and @admindir@ diff --git a/debian/changelog b/debian/changelog index 11911caae..e395a8695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dpkg (1.6.5) unstable; urgency=low + + * Don't use \z in dpkg-scansources, Closes: Bug# 53182 + + -- Wichert Akkerman <wakkerma@debian.org> UNRELEASED + dpkg (1.6.4) unstable; urgency=low * No longer byte-compile for emacs diff --git a/debian/rules b/debian/rules index ebdbf9cc8..71adaef61 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ binary-dpkg: stamp-binary done ; \ install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man8 ; \ for m in dpkg.8 dselect.8 dpkg-split.8 start-stop-daemon.8 \ - cleanup-info dpkg-divert.8 \ + cleanup-info.8 dpkg-divert.8 \ install-info.8 update-alternatives.8 update-rc.d.8 ; do \ if [ -f $(TMP)/usr/share/man/$$i/man8/$$m ] ; then \ mv $(TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG)/usr/share/man/$$i/man8/$$m ; \ diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl index 083b5a351..0cdde2f5f 100755 --- a/scripts/dpkg-scansources.pl +++ b/scripts/dpkg-scansources.pl @@ -317,7 +317,7 @@ sub process_dsc { # Allow blank lines at the end of a file, because the other programs # do. - $contents =~ s/\n\n+\z/\n/; + $contents =~ s/\n\n+\Z/\n/; if ($contents =~ /^\n/ || $contents =~ /\n\n/) { xwarn_noerror "$file invalid (contains blank line)\n"; |