Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert the #410418 since it breaks too many things and to add it major changes will be required, not adding them now

This commit is contained in:
Otavio Salvador 2007-10-30 19:31:19 +00:00
parent d570bf3ad3
commit 5f4cdb823e
2 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -15,9 +15,6 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
* Exclude multipath-udeb and libaio1-udeb since they're not being use
yet.
* Fix autorun.inf generation when win32-loader is present.
* Exclude packages and add all task present ones before resolve
dependencies, avoiding OR dependencies to take their place and removed
packages dependencies to be included. Closes: #410418.
* Applied patch from Nicolas François <nicolas.francois@centraliens.net>
to allow README.html translation using po4a.
* Remove the 'Last Modified' date from data/lenny/README.html.in since
@ -40,7 +37,7 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
[ Joey Hess ]
* Include dmraid deb. Closes: #443991
-- Otavio Salvador <otavio@debian.org> Fri, 28 Sep 2007 15:40:56 -0300
-- Joey Hess <joeyh@debian.org> Thu, 27 Sep 2007 13:44:56 -0400
debian-cd (3.0.3) unstable; urgency=low

65
tools/list2cds
View File

@ -104,16 +104,6 @@ if (not $nonfree) {
}
}
open (EXCLUDE_LIST, "< $exclude") || die "Can't open $exclude : $!\n";
while (defined($_=<EXCLUDE_LIST>)) {
chomp;
next if m/^\s*$/;
next if $excluded{$_};
$excluded{$_} = 'list';
$count_excl++;
}
close EXCLUDE_LIST;
msg(1, "Statistics:
Number of packages: @{ [scalar(keys %packages)] }
Number of excluded: $count_excl of @{ [scalar(keys %excluded)] }
@ -189,40 +179,21 @@ while (defined($_=<LIST>)) {
next;
}
next if $excluded{$_};
if ($included{$_} == 1) {
if ($included{$_}) {
msg(3, "$_ has already been included.\n");
next;
}
$included{$_} = 1;
# This is because udebs tend to have bad dependencies but work
# nevertheless ... this may be removed once the udebs have a
# better depencency system
if ($packages{$_}{"IsUdeb"}) {
add_to_cd($cd, $packages{$_}{"Size"}, [$_]);
} else {
add_package ($_, ! $norecommends, ! $nosuggests);
}
}
close LIST;
# List first add the packages on the list so we give them priority
foreach (keys %included) {
next if ($included{$_} != 1 && !$packages{$_}{"IsUdeb"});
$included{$_} = 1;
# This is because udebs tend to have bad dependencies but work
# nevertheless ... this may be removed once the udebs have a
# better depencency system
if ($packages{$_}{"IsUdeb"}) {
add_to_cd($cd, $packages{$_}{"Size"}, [$_]);
} else {
add_package ($_, ! $norecommends, ! $nosuggests);
}
}
# Now, let's add all the rest
foreach (keys %included) {
next if ($included{$_} == 1);
$included{$_} = 0;
add_package ($_, ! $norecommends, ! $nosuggests);
}
msg(0, " Now up to $cd_size bytes\n");
# All requested packages have been included
# But we'll continue to add if $complete was requested
@ -232,15 +203,15 @@ if ($complete) {
# other sections will get in through dependencies
# With some luck, most of them will already be here
foreach my $p (sort { ($packages{lc $a}{"Section"} cmp $packages{lc $b}{"Section"})
|| (lc $a cmp lc $b) }
grep { not ($included{$_} or $excluded{$_}) } keys %packages) {
# At this point, we should *not* be adding any more udebs,
# as they're no use to anybody.
if ($packages{lc $p}{"IsUdeb"}) {
msg(2, " Ignoring udeb $p ...\n");
} else {
add_package (lc $p, 0, 0);
}
|| (lc $a cmp lc $b) }
grep { not ($included{$_} or $excluded{$_}) } keys %packages) {
# At this point, we should *not* be adding any more udebs,
# as they're no use to anybody.
if ($packages{lc $p}{"IsUdeb"}) {
msg(2, " Ignoring udeb $p ...\n");
} else {
add_package (lc $p, 0, 0);
}
}
}