[93251] branches/release_2_1

[jmr at macports.org]

Revision: 93251
          https://trac.macports.org/changeset/93251
Author:   jmr at macports.org
Date:     2012-05-18 03:02:01 -0700 (Fri, 18 May 2012)
Log Message:
-----------
merge r93250 from trunk:
 update ChangeLog

Revision Links:
--------------
    https://trac.macports.org/changeset/93250

Modified Paths:
--------------
    branches/release_2_1/base/ChangeLog

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/
    branches/release_2_1/base/ChangeLog


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_1/base/ChangeLog
===================================================================
--- branches/release_2_1/base/ChangeLog	2012-05-18 10:00:15 UTC (rev 93250)
+++ branches/release_2_1/base/ChangeLog	2012-05-18 10:02:01 UTC (rev 93251)
@@ -3,11 +3,21 @@
 # $Id$
 ###
 
-Unreleased changes:
+Release 2.1.1 (unreleased):
     - Do not print detailed progress information in rev-upgrade when stdout is
-      not a terminal
-      (cal in r93221,r93222, #34480)
+      not a terminal (#34480, cal in r93221,r93222)
 
+    - Made rev-upgrade avoid trying to upgrade ports that are not in the index
+      (jmr in r93197)
+
+    - Fixed rev-upgrade disabling source-only mode in its first upgrade pass
+      (jmr in r93153)
+
+    - Fixed incorrect rebuild order in rev-upgrade (cal in r93129)
+
+    - Fixed port lookups failing for all sources when the index is missing in
+      one source (#30593, jmr in r92976)
+
 Release 2.1.0 (2012-05-15 by jmr):
     - New configure.compiler options: macports-clang-2.9, macports-clang-3.0,
       macports-clang-3.1, macports-gcc-4.7, macports-gcc-4.8


Property changes on: branches/release_2_1/base/ChangeLog
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/ChangeLog:37343-46937
/branches/gsoc09-logging/base/ChangeLog:51231-60371
/branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375
/branches/universal-sanity/base/ChangeLog:51872-52323
/branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225
/users/perry/base-bugs_and_notes/ChangeLog:45682-46060
/users/perry/base-select/ChangeLog:44044-44692
   + /branches/gsoc08-privileges/base/ChangeLog:37343-46937
/branches/gsoc09-logging/base/ChangeLog:51231-60371
/branches/gsoc11-rev-upgrade/base/ChangeLog:78828-88375
/branches/universal-sanity/base/ChangeLog:51872-52323
/branches/variant-descs-14482/base/ChangeLog:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/ChangeLog:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,93062,93129,93153,93197,93225,93250
/users/perry/base-bugs_and_notes/ChangeLog:45682-46060
/users/perry/base-select/ChangeLog:44044-44692
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120518/bdfb4c19/attachment.html>