From 7cfc8c3d2e4ee8b5e72844861d2aeeb9daa60fca Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Mon, 27 Sep 1999 01:37:25 +0000 Subject: [PATCH] Updated to dpkg 1.4.1.11 --- ChangeLog | 11 +++++++++++ archtable | 6 ++++++ debian/changelog | 11 +++++++++++ scripts/dpkg-architecture.1 | 4 ++-- scripts/dpkg-source.pl | 4 ++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 727a7651..9ba55da4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +dpkg (1.4.1.11) unstable; urgency=low + + * Non-maintainer release. + * Added sparc64 to archtable + * Added entries for newer alpha architectures to the archtable + * Always run patch and diff with LANG set to C. + * Handle diff warning for files with no newline at the end of file + Closes: Bug#45642 + + -- Wichert Akkerman Fri, 24 Sep 1999 03:23:54 +0200 + dpkg (1.4.1.10) unstable; urgency=low * Non-maintainer release. diff --git a/archtable b/archtable index fca9e306..eee78fa7 100644 --- a/archtable +++ b/archtable @@ -19,7 +19,13 @@ i586 i386 i486 i686 i386 i486 pentium i386 i486 sparc sparc sparc +sparc64 sparc64 sparc64 alpha alpha alpha +alphaev4 alpha alpha +alphaev5 alpha alpha +alphaev56 alpha alpha +alphaev6 alpha alpha +alphapca56 alpha alpha m68k m68k m68k arm arm arm ppc powerpc powerpc diff --git a/debian/changelog b/debian/changelog index 727a7651..9ba55da4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +dpkg (1.4.1.11) unstable; urgency=low + + * Non-maintainer release. + * Added sparc64 to archtable + * Added entries for newer alpha architectures to the archtable + * Always run patch and diff with LANG set to C. + * Handle diff warning for files with no newline at the end of file + Closes: Bug#45642 + + -- Wichert Akkerman Fri, 24 Sep 1999 03:23:54 +0200 + dpkg (1.4.1.10) unstable; urgency=low * Non-maintainer release. diff --git a/scripts/dpkg-architecture.1 b/scripts/dpkg-architecture.1 index fe0f5a1e..b441ee46 100644 --- a/scripts/dpkg-architecture.1 +++ b/scripts/dpkg-architecture.1 @@ -2,8 +2,8 @@ ''' $RCSfile$$Revision$$Date$ ''' ''' $Log$ -''' Revision 1.3 1999-09-27 01:31:19 wakkerma -''' Updated to dpkg 1.4.1.10 +''' Revision 1.4 1999-09-27 01:37:25 wakkerma +''' Updated to dpkg 1.4.1.11 ''' ''' .de Sh diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 50188700..6a1b269f 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -361,6 +361,7 @@ if ($opmode eq 'build') { } defined($c3= open(DIFFGEN,"-|")) || &syserr("fork for diff"); if (!$c3) { + $ENV{'LANG'}= 'C'; exec('diff','-u', '-L',"$basedirname.orig/$fn", '-L',"$basedirname/$fn", @@ -535,6 +536,7 @@ if ($opmode eq 'build') { while (($_ = ) && !/^--- /) { # read hunk header (@@) s/\n$// or &error("diff is missing trailing newline"); + next if /^\\ No newline/; /^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or &error("Expected ^@@ in line $. of diff"); my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1); @@ -543,6 +545,7 @@ if ($opmode eq 'build') { while ($olines || $nlines) { $_ = or &error("unexpected end of diff"); s/\n$// or &error("diff is missing trailing newline"); + next if /^\\ No newline/; if (/^ /) { --$olines; --$nlines; } elsif (/^-/) { --$olines; } elsif (/^\+/) { --$nlines; } @@ -626,6 +629,7 @@ if ($opmode eq 'build') { if (!$c2) { open(STDIN,"<&GZIP") || &syserr("reopen gzip for patch"); chdir($newdirectory) || &syserr("chdir to $newdirectory for patch"); + $ENV{'LANG'}= 'C'; exec('patch','-s','-t','-F','0','-N','-p1','-u', '-V','never','-g0','-b','-z','.dpkg-orig'); &syserr("exec patch"); -- 2.39.5