Source: equivs Version: 2.0.9 Severity: normal Tags: patch User: [email protected] Usertag: multiarch
This patch updates the original to include some proper documentation. It also removes the bit adding 'Multi-Arch: to the equivs package itself as that is covered separately in #697820. So the updated patches in this bug and that should apply without conflict. -- System Information: Debian Release: 6.0.7 APT prefers stable APT policy: (990, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.32.33-kvm-i386-20111128-dirty (SMP w/1 CPU core) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
Description: Add support for Multi-Arch field equivs needs to support this field in order to make packages which behave correctly with multiarch (satisfying foreign-arch dependencies or not) . Author: Wookey <[email protected]> diff -Nru equivs-2.0.9/debian/equivs-build.pod equivs-2.0.9+multiarch1/debian/equivs-build.pod --- equivs-2.0.9/debian/equivs-build.pod 2010-01-20 03:47:30.000000000 +0000 +++ equivs-2.0.9+multiarch1/debian/equivs-build.pod 2013-02-25 12:50:36.000000000 +0000 @@ -55,6 +55,13 @@ of the package. See the Debian developers reference for a description (package developers-reference). +=item Multi-Arch: + +Field specifying multiarch dependency status. Used exactly as is 'real' packages. +Foreign: Satisfies dependencies for all architecture +Same: Satisfies dependencies only for the same architecture +Allowed: Can act as either foriegn or same, as specified in dependency + =item Extra-Files: A comma-separated list of files to copy to the diff -Nru equivs-2.0.9/usr/bin/equivs-build equivs-2.0.9+multiarch1/usr/bin/equivs-build --- equivs-2.0.9/usr/bin/equivs-build 2011-09-30 06:22:24.000000000 +0000 +++ equivs-2.0.9+multiarch1/usr/bin/equivs-build 2013-02-23 21:17:45.000000000 +0000 @@ -309,6 +309,7 @@ "Breaks", "Provides", "Replaces", + "Multi-Arch", "Description"); close OUT; } diff -Nru equivs-2.0.9/usr/share/equivs/template/debian/control.in equivs-2.0.9+multiarch1/usr/share/equivs/template/debian/control.in --- equivs-2.0.9/usr/share/equivs/template/debian/control.in 2011-09-30 05:25:26.000000000 +0000 +++ equivs-2.0.9+multiarch1/usr/share/equivs/template/debian/control.in 2013-02-23 21:17:45.000000000 +0000 @@ -6,6 +6,7 @@ Package: equivs-dummy Architecture: all +Multi-Arch: foreign Description: Dummy package to fulfill package dependencies This is a dummy package that makes Debian's package management system believe that equivalents to packages on which other diff -Nru equivs-2.0.9/usr/share/equivs/template.ctl equivs-2.0.9+multiarch1/usr/share/equivs/template.ctl --- equivs-2.0.9/usr/share/equivs/template.ctl 2011-09-30 05:59:19.000000000 +0000 +++ equivs-2.0.9+multiarch1/usr/share/equivs/template.ctl 2013-02-23 21:17:45.000000000 +0000 @@ -16,6 +16,7 @@ # Provides: <comma-separated list of packages> # Replaces: <comma-separated list of packages> # Architecture: all +# Multi-Arch: <one of: foreign|same|allowed> # Copyright: <copyright file; defaults to GPL2> # Changelog: <changelog file; defaults to a generic changelog> # Readme: <README.Debian file; defaults to a generic one>
