Drop "MS-Windows XP " prefix from all the 'id's.

Provide "Checked Build " prefix for the Checked Build packages.

diff --git a/src/install/acquire/captivemodid-print.pl b/src/install/acquire/captivemodid-print.pl
index 7f5ba81..7360c4e 100755 (executable)
--- a/src/install/acquire/captivemodid-print.pl
+++ b/src/install/acquire/captivemodid-print.pl
@@ -165,7 +165,7 @@ sub stack0_flush()
 HERE
                        $print.=<<"HERE" if !$dupe_global;
 <module type="@{[ $this->{"type"} ]}" length="@{[ $this->{"length"} ]}" priority="@{[ $this->{"priority"} ]}" md5="@{[ $this->{"md5"} ]}"
-               id="MS-Windows XP @{[ $this->{"dist"} ]} @{[ $this->{"lang"} ]} $ver_prefix@{[ $this->{"ver"} ]} @{[ $this->{"this_name"} ]}" />
+               id="@{[ $this->{"dist"} ]} @{[ !$this->{"is_debug"} ? "" : "Checked Build "]}@{[ $this->{"lang"} ]} $ver_prefix@{[ $this->{"ver"} ]} @{[ $this->{"this_name"} ]}" />
 HERE
                        $print=~s/^/"\t" x (1+$stacki)/egm;
                        print STDERR "\n" if $STDERR_needs_eol;
@@ -245,7 +245,7 @@ my($filename_unused,$basename_orig)=@_;
                $pri-=20 if $basename_orig=~/^ntkrnlpa/;
                $pri-=40 if $basename_orig=~/^ntkrnlmp/;
                $pri-=60 if $basename_orig=~/^ntkrpamp/;
-               $pri+=5000000 if name_is_debug $basename0;
+               $pri+=5000000 if my $is_debug=name_is_debug $basename0;
                local *F;
                open F,$filename or confess;
                my $md5obj=Digest::MD5->new();
@@ -264,6 +264,7 @@ my($filename_unused,$basename_orig)=@_;
                        "lang"=>$lang,
                        "ver"=>$ver,
                        "this_name"=>$this_name,
+                       "is_debug"=>$is_debug,
                        );
                # Highest priority/version of all the files in the cabinet:
                for (qw(ver priority)) {