[equivs] 07/36: Import Debian version 2.0.9+nmu1

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository equivs.

commit 294d78810963faeaef2947480f16a1fcae6dfb35
Author: Wookey <wookey at debian.org>
Date:   Mon Oct 19 01:38:56 2015 +0000

    Import Debian version 2.0.9+nmu1
    
    equivs (2.0.9+nmu1) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Add Multi-Arch support. (Closes: #692934 693548 697820)
---
 debian/changelog                            | 7 +++++++
 debian/equivs-build.pod                     | 7 +++++++
 usr/bin/equivs-build                        | 1 +
 usr/share/equivs/template.ctl               | 1 +
 usr/share/equivs/template/debian/control.in | 1 +
 5 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5900b88..e193e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+equivs (2.0.9+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Multi-Arch support. (Closes: #692934 693548 697820)
+
+ -- Wookey <wookey at debian.org>  Mon, 19 Oct 2015 01:38:56 +0000
+
 equivs (2.0.9) unstable; urgency=low
 
   * Upgrade to Policy 3.9.2 - no changes.
diff --git a/debian/equivs-build.pod b/debian/equivs-build.pod
index 1943910..e5e1a66 100644
--- a/debian/equivs-build.pod
+++ b/debian/equivs-build.pod
@@ -55,6 +55,13 @@ Maintainerscripts executed before/after installation/removal
 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 in 'real' packages.
+Foreign: Satisfies dependencies for all architectures
+Same: Satisfies dependencies only for the same architecture
+Allowed: Can act as either Foreign or Same, as specified in the dependency
+
 =item Extra-Files:
 
 A comma-separated list of files to copy to the 
diff --git a/usr/bin/equivs-build b/usr/bin/equivs-build
index 1c7b06d..2000f21 100755
--- a/usr/bin/equivs-build
+++ b/usr/bin/equivs-build
@@ -309,6 +309,7 @@ sub write_control_file {
 			   "Breaks",
 			   "Provides",
 			   "Replaces",
+			   "Multi-Arch",
 			   "Description");
   close OUT;
 }
diff --git a/usr/share/equivs/template.ctl b/usr/share/equivs/template.ctl
index fd824aa..a5667f4 100644
--- a/usr/share/equivs/template.ctl
+++ b/usr/share/equivs/template.ctl
@@ -16,6 +16,7 @@ Package: <package name; defaults to equivs-dummy>
 # 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>
diff --git a/usr/share/equivs/template/debian/control.in b/usr/share/equivs/template/debian/control.in
index 38103e7..df0af8b 100644
--- a/usr/share/equivs/template/debian/control.in
+++ b/usr/share/equivs/template/debian/control.in
@@ -6,6 +6,7 @@ Standards-Version: 3.9.2
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/equivs.git