From: Ian Jackson Date: Wed, 12 Jun 1996 13:35:19 +0000 (+0100) Subject: dpkg (1.2.6); priority=MEDIUM X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13fd64e0c458bb0bb5a4c38b4fb95fbba347adb;p=dpkg dpkg (1.2.6); priority=MEDIUM * NFS, CDROM and partition dselect methods include mountpoint in paths given to dpkg in [I]install, so they should now work. * Removed some leftover files from source tree. -- Ian Jackson Wed, 12 Jun 1996 14:35:19 +0100 --- diff --git a/debian.Changelog b/debian.Changelog index 2fb221da..b3e4fa1e 100644 --- a/debian.Changelog +++ b/debian.Changelog @@ -1,3 +1,12 @@ +dpkg (1.2.6); priority=MEDIUM + + * NFS, CDROM and partition dselect methods include mountpoint + in paths given to dpkg in [I]install, so they should now work. + + * Removed some leftover files from source tree. + + -- Ian Jackson Wed, 12 Jun 1996 14:35:19 +0100 + dpkg (1.2.5); priority=MEDIUM * Allow, but do not create, packages in half-installed state diff --git a/debian.rules b/debian.rules index 873deb25..c0ba4cf3 100755 --- a/debian.rules +++ b/debian.rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f package=dpkg -version=1.2.5 +version=1.2.6 archi=$(shell dpkg --print-architecture) DIR:=$(shell pwd) diff --git a/dselect/t.c b/dselect/t.c deleted file mode 100644 index c324412c..00000000 --- a/dselect/t.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/lib/sta00630 b/lib/sta00630 deleted file mode 100644 index 0cf064b6..00000000 Binary files a/lib/sta00630 and /dev/null differ diff --git a/lib/sta11978 b/lib/sta11978 deleted file mode 100644 index 4381d5f9..00000000 Binary files a/lib/sta11978 and /dev/null differ diff --git a/methods/disk.install b/methods/disk.install index 998771c5..f23620e7 100644 --- a/methods/disk.install +++ b/methods/disk.install @@ -104,15 +104,15 @@ package by using `dpkg --install --auto-deconfigure'\'' by hand. print "Running dpkg -iB for $package ...\n"; exec("dpkg","-iB","--",@invoke); die "failed to exec dpkg: $!\n"; - ' -- "$binaryprefix$p_main_binary" "$predep" + ' -- "$p_mountpoint$p_main_binary" "$predep" done for f in main ctb nf lcl do eval 'this_binary=$p_'$f'_binary' if [ -z "$this_binary" ]; then continue; fi - echo Running dpkg -iGROEB "$binaryprefix$this_binary" - dpkg -iGROEB "$binaryprefix$this_binary" + echo Running dpkg -iGROEB "$p_mountpoint$this_binary" + dpkg -iGROEB "$p_mountpoint$this_binary" done echo -n 'Installation OK. Hit RETURN. ' diff --git a/scripts/t b/scripts/t deleted file mode 100644 index 81e7cf51..00000000 --- a/scripts/t +++ /dev/null @@ -1,194 +0,0 @@ -#!/usr/bin/perl -- -# usage: -# dpkg-scanpackages .../binary .../noverride pathprefix >.../Packages.new -# mv .../Packages.new .../Packages -# -# This is the core script that generates Packages files (as found -# on the Debian FTP site and CD-ROMs). -# -# The first argument should preferably be a relative filename, so that -# the Filename field has good information. -# -# Any desired string can be prepended to each Filename value by -# passing it as the third argument. -# -# The noverride file is a series of lines of the form -#
-# where the field is optional. Fields are separated by -# whitespace. The field may be => -# (this is recommended). - -$version= '1.0.12'; # This line modified by Makefile - -%kmap= ('optional','suggests', - 'recommended','recommends', - 'class','priority', - 'package_revision','revision'); - -%pri= ('priority',300, - 'section',290, - 'maintainer',280, - 'version',270, - 'depends',250, - 'recommends',240, - 'suggests',230, - 'conflicts',220, - 'provides',210, - 'filename',200, - 'size',180, - 'md5sum',170, - 'description',160); - -@ARGV==3 || die; - -$binarydir= shift(@ARGV); --d $binarydir || die $!; - -$override= shift(@ARGV); --e $override || die $!; - -$pathprefix= shift(@ARGV); - -open(F,"find $binarydir -name '*.deb' -print |") || die $!; -while () { - chop($fn=$_); - substr($fn,0,length($binarydir)) eq $binarydir || die $fn; - open(C,"dpkg-deb -I $fn control |") || die "$fn $!"; - $t=''; while () { $t.=$_; } - $!=0; close(C); $? && die "$fn $? $!"; - undef %tv; - $o= $t; - while ($t =~ s/^\n*(\S+):[ \t]*(.*(\n[ \t].*)*)\n//) { - $k= $1; $v= $2; - $k =~ y/A-Z/a-z/; - if (defined($kmap{$k})) { $k= $kmap{$k}; } - $v =~ s/\s+$//; - $tv{$k}= $v; -#print STDERR "K>$k V>$v<\n"; - } - $t =~ m/^\n*$/ || die "$fn $o / $t ?"; - defined($tv{'package'}) || die "$fn $o ?"; - $p= $tv{'package'}; delete $tv{'package'}; - defined($p1{$p}) && die "$fn $p repeat"; - if (defined($tv{'filename'})) { - print(STDERR " ! Package $p (filename $fn) has Filename field !\n") || die $!; - } - $tv{'filename'}= "$pathprefix$fn"; - open(C,"md5sum <$fn |") || die "$fn $!"; - chop($_=); m/^[0-9a-f]{32}$/ || die "$fn \`$_' $!"; - $!=0; close(C); $? && die "$fn $? $!"; - $tv{'md5sum'}= $_; - defined(@stat= stat($fn)) || die "$fn $!"; - $stat[7] || die "$fn $stat[7]"; - $tv{'size'}= $stat[7]; - if (length($tv{'revision'})) { - $tv{'version'}.= '-'.$tv{'revision'}; - delete $tv{'revision'}; - } - for $k (keys %tv) { - $pv{$p,$k}= $tv{$k}; - $k1{$k}= 1; - $p1{$p}= 1; - } - $_= substr($fn,length($binarydir)); - s#/[^/]+$##; s#^/*##; - $psubdir{$p}= $_; - $pfilename{$p}= $fn; -} -$!=0; close(F); $? && die "$? $!"; - -select(STDERR); $= = 1000; select(STDOUT); - -format STDERR = - ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -$packages -. - -sub writelist { - $title= shift(@_); - return unless @_; - print(STDERR " $title\n") || die $!; - $packages= join(' ',sort @_); - while (length($packages)) { write(STDERR) || die $!; } - print(STDERR "\n") || die $!; -} - -@samemaint=(); - -open(O,"<$override") || die $!; -while() { - s/\s+$//; - ($p,$priority,$section,$maintainer)= split(/\s+/,$_,4); - next unless defined($p1{$p}); - if (length($maintainer)) { - if ($maintainer =~ m/\s*=\>\s*/) { - $oldmaint= $`; $newmaint= $'; - if ($pv{$p,'maintainer'} ne $oldmaint) { - push(@changedmaint," $p ($pv{$p,'maintainer'}, not $oldmaint)\n"); - } else { - $pv{$p,'maintainer'}= $newmaint; - } - } elsif ($pv{$p,'maintainer'} eq $maintainer) { - push(@samemaint," $p ($maintainer)\n"); - } else { - $pv{$p,'maintainer'}= $maintainer; - } - } - $pv{$p,'priority'}= $priority; - $pv{$p,'section'}= $section; - if (length($psubdir{$p}) && $section ne $psubdir{$p}) { - print(STDERR " !! Package $p has \`Section: $section',". - " but file is in \`$psubdir{$p}' !!\n") || die $!; - $ouches++; - } - $o1{$p}= 1; -} -close(O); - -if ($ouches) { print(STDERR "\n") || die $!; } - -$k1{'maintainer'}= 1; -$k1{'priority'}= 1; -$k1{'section'}= 1; - -@missingover=(); - -for $p (sort keys %p1) { - if (!defined($o1{$p})) { - push(@missingover,$p); - } - $r= "Package: $p\n"; - for $k (sort { $pri{$b} <=> $pri{$a} } keys %k1) { - next unless length($pv{$p,$k}); - $r.= "$k: $pv{$p,$k}\n"; - } - $r.= "\n"; - $written++; - print(STDOUT $r) || die $!; -} -close(STDOUT) || die $!; - -&writelist("** Packages in archive but missing from override file: **", - @missingover); -<<<<<<< dpkg-scanpackages.pl -||||||| /usr/ian-home/junk/u -&writelist("++ Packages appearing in override file but not in archive: ++", - @inover); -======= -&writelist("++ Packages appearing in override file but not in archive: ++", - @inover); -if (@changedmaint) { - print(STDERR - " ++ Packages in override file with incorrect old maintainer value: ++\n", - @changedmaint, - "\n") || die $!; -} ->>>>>>> /usr/ian-home/junk/t -if (@samemaint) { - print(STDERR - " -- Packages specifying same maintainer as override file: --\n", - @samemaint, - "\n") || die $!; -} - -print(STDERR " Wrote $written entries to output Packages file.\n") || die $!;