From 16e891ff335496ff24d0f7e48b0059375840c564 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 14 Jul 2010 09:20:00 -0700 Subject: [PATCH] Revert "Clarify the banned dependencies between main and non-main" This reverts commit 30daa4aab845a7972bff3f0e33994176bc912dc6. Bill Allombert objects to this change, so we'll do it through the normative process. Conflicts: debian/changelog --- debian/changelog | 4 ---- policy.sgml | 8 +++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d3600b..92264b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,10 +40,6 @@ debian-policy (3.9.1.0) UNRELEASED; urgency=low package. * Explain the Perl module package naming policy more explicitly and provide some examples. (Closes: #175202) - * Add Pre-Depends and Build-Depends-Indep to the relationships not - allowed from main to contrib or non-free and mention that such - relationships are okay if the non-free package is only an - alternative. Thanks, Raphael Geissert. (Closes: #587279) * Revise the footnote discussing shlibs creation to not talk about the switch to objdump as if it were a new innovation and to explicitly mention the NEEDED attribute as the source of dependency information. diff --git a/policy.sgml b/policy.sgml index 7736ddb..6c770fd 100644 --- a/policy.sgml +++ b/policy.sgml @@ -476,11 +476,9 @@ must not require a package outside of main for compilation or execution (thus, the package must - not declare a Pre-Depends, Depends, - Recommends, Build-Depends, - or Build-Depends-Indep relationship on a - non-main package unless a package - in main is listed as an alternative), + not declare a "Depends", "Recommends", or + "Build-Depends" relationship on a non-main + package), must not be so buggy that we refuse to support them, -- 2.39.2