Просмотр исходного кода

Handle architectures in all dependency fields in debian/control,
even those of binary packages. Closes: #252657, #324741, #347819

Frank Lichtenheld лет назад: 20
Родитель
Сommit
2822cd35fa
3 измененных файлов с 8 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/dpkg-gencontrol.pl

+ 5 - 0
ChangeLog

@@ -1,5 +1,10 @@
 2006-02-18  Frank Lichtenheld  <djpig@debian.org>
 2006-02-18  Frank Lichtenheld  <djpig@debian.org>
 
 
+	* scripts/dpkg-gencontrol.pl: Call parsedep
+	with use_arch and reduce_arch parameters to
+	allow using architectures in dependency
+	fields of binary packages in debian/control.
+
 	* scripts/dpkg-gencontrol.pl: Fix handling of
 	* scripts/dpkg-gencontrol.pl: Fix handling of
 	debian/files when architecture is set via -D
 	debian/files when architecture is set via -D
 	command line option. The value override was
 	command line option. The value override was

+ 2 - 0
debian/changelog

@@ -2,6 +2,8 @@ dpkg (1.13.17~) UNRELEASED; urgency=low
 
 
   [ Frank Lichtenheld ]
   [ Frank Lichtenheld ]
   * Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911
   * Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911
+  * Handle architectures in all dependency fields in debian/control,
+    even those of binary packages. Closes: #252657, #324741, #347819
 
 
  -- Frank Lichtenheld <frank@lichtenheld.de>  Sat, 18 Feb 2006 19:01:24 +0100
  -- Frank Lichtenheld <frank@lichtenheld.de>  Sat, 18 Feb 2006 19:01:24 +0100
 
 

+ 1 - 1
scripts/dpkg-gencontrol.pl

@@ -180,7 +180,7 @@ for $_ (keys %fi) {
     } elsif (s/^C$myindex //) {
     } elsif (s/^C$myindex //) {
         if (m/^(Package|Description|Essential|Optional)$/) {
         if (m/^(Package|Description|Essential|Optional)$/) {
         } elsif (exists($pkg_dep_fields{$_})) {
         } elsif (exists($pkg_dep_fields{$_})) {
-           my $dep = parsedep(substvars($v));
+           my $dep = parsedep(substvars($v), 1, 1);
            &error("error occoured while parsing $_") unless defined $dep;
            &error("error occoured while parsing $_") unless defined $dep;
             $f{$_}= showdep($dep, 0);
             $f{$_}= showdep($dep, 0);
         } elsif (m/^Section$|^Priority$/) {
         } elsif (m/^Section$|^Priority$/) {