From: Russ Allbery <rra@debian.org>
Date: Mon, 14 Jun 2010 19:37:45 +0000 (-0700)
Subject: Merge branch 'master' into bug575639-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5fbce1fd6720b25fa4ec574573bf635a5ed0ba8d;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug575639-rra

Conflicts:
	debian/changelog
---

5fbce1fd6720b25fa4ec574573bf635a5ed0ba8d
diff --cc debian/changelog
index fca9cd5,3dea6a4..73a9b56
--- a/debian/changelog
+++ b/debian/changelog
@@@ -68,11 -68,11 +68,16 @@@ debian-policy (3.8.5.0) UNRELEASED; urg
      Seconded: Steve Langasek <vorlon@debian.org>
      Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
      Closes: #555978
+   * Policy: Relax requirement that library dev files be in one package
+     Wording: Russ Allbery <rra@debian.org>
+     Seconded: Julien Cristau <jcristau@debian.org>
+     Seconded: Andrew McMillan <andrew@morphoss.com>
+     Closes: #347581
 +  * Policy: Tighten requirements for maintainer-like fields
 +    Wording: Russ Allbery <rra@debian.org>
 +    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
 +    Seconded: Andrew McMillan <andrew@morphoss.com>
 +    Closes: #575639
    * Perl Policy: Change perlapi provides to use an ABI version
      Wording: Niko Tyni <ntyni@debian.org>
      Seconded: Russ Allbery <rra@debian.org>