add rra's draft of option C; stick 5 and 6 explicitly in options A and B

diff --git a/688772_gnome_depends_nmg/don_draft.txt b/688772_gnome_depends_nmg/don_draft.txt
index 6e42994151dd8d4560f874cfc59752f1b26f3851..d25b6a2508a212bc6645a79a3777dfab27ccd5da 100644 (file)
--- a/688772_gnome_depends_nmg/don_draft.txt
+++ b/688772_gnome_depends_nmg/don_draft.txt
@@ -20,6 +20,14 @@ Therefore
 A 4. We overrule the decision of the meta-gnome maintainers to add a
 A    dependency from gnome to network-manager-gnome; this dependency
 A    should be removed for the release of wheezy.
+A 
+A 5. We request that the Release Team unblock update(s) to meta-gnome so
+A    that our decisions may be implemented in wheezy.
+A 
+A 6. We request that a release note is created explaining that gnome
+A    users who do not currently have NM installed consider installing
+A    it.
+
 
 B 4. We overrule the decision of the meta-gnome maintainers to add a
 B    dependency from gnome to network-manager-gnome; this dependency
@@ -34,11 +42,24 @@ B    Specifically, valid bugs where existing valid network
 B    configurations are broken by the automatic, required installation
 B    on system upgrade of packages not previously installed which
 B    perform network configuration on should have severity serious.
+B
+B 5. We request that the Release Team unblock update(s) to meta-gnome so
+B    that our decisions may be implemented in wheezy.
+B 
+B 6. We request that a release note is created explaining that gnome
+B    users who do not currently have NM installed consider installing
+B    it.
 
-5. We request that the Release Team unblock update(s) to meta-gnome so
-   that our decisions may be implemented in wheezy.
-
-6. We request that a release note is created explaining that gnome
-   users who do not currently have NM installed consider installing
-   it.
-
+C 4. After further discussion, we understand that reintroducing
+C    network-manager on upgrade was part of the intent, due to both
+C    substantial improvements in network-manager and tighter integration of
+C    network-manager with the GNOME desktop in wheezy.  Since the gnome
+C    metapackage has historically been more aggressive at pulling in
+C    additional packages, we believe the move of the dependency from
+C    gnome-core to gnome is an acceptable compromise that was not raised
+C    during the previous discussion.  Users who want to remove
+C    network-manager can still use the gnome-core metapackage to get the
+C    basic GNOME desktop functionality.
+C 
+C    We recommend that this upgrade behavior for users of the gnome
+C    metapackage be documented in the release notes.