[101275] branches/release_2_1

[jmr at macports.org]

Revision: 101275
          https://trac.macports.org/changeset/101275
Author:   jmr at macports.org
Date:     2013-01-07 07:06:48 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r101274 from trunk:
 update ChangeLog

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

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,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270,101274


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,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270
/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,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270,101274
/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	2013-01-07 15:02:45 UTC (rev 101274)
+++ branches/release_2_1/base/ChangeLog	2013-01-07 15:06:48 UTC (rev 101275)
@@ -27,8 +27,23 @@
 
     - Fix a problem where interrupting the uninstallation process could leave
       the registry database in a corrupted state.
-      (cal in r100219)
+      (#34482, cal in r100219)
 
+    - Fixed a failure in the fallback code used by 'port pkg' when
+      PackageMaker is not installed. (#36597, jmr in r96262)
+
+    - Fixed an incorrect lint error about the port directory name when a full
+      @macports.org maintainer address is used. (#35925, ryandesign in r97264)
+
+    - Fixed creation of disk images with flat packages. (jmr in r99167)
+
+    - Fixed a bug where not all requested variants would be passed on to
+      dependencies when building an mpkg. (#36363, jmr in r100679)
+
+    - Added configure.compiler options macports-clang-3.2 and
+      macports-clang-3.3 (jeremyhu, ryandesign, jmr in r92588, r101163,
+      r101166, r101270)
+
 Release 2.1.2 (2012-07-26 by jmr):
     - Fixed autodetection of developer_dir with Xcode 4.4
       (#35150, mfeiri in r95552)


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,93250,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869,100129,100217-100220
/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,93256,93268,93274,95439,95620,95873,96137,96399-96401,96539,97869,100129,100217-100220,101274
/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/20130107/7f4a6761/attachment-0001.html>