# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2018-05-12 17:57:04
# Node ID e5d2248dcc396305e1d16a9f069509cec2480682
# Parent  6f5b4ceea95b401af1e38c771ee147f151a11fb7

packaging: move contrib/macosx to contrib/packaging/

And update various references throughout the code.

Differential Revision: https://phab.mercurial-scm.org/D3550

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -197,10 +197,10 @@ osx:
 	  --identifier org.mercurial-scm.mercurial \
 	  --version "$${HGVER}" \
 	  build/mercurial.pkg && \
-	productbuild --distribution contrib/macosx/distribution.xml \
+	productbuild --distribution contrib/packaging/macosx/distribution.xml \
 	  --package-path build/ \
 	  --version "$${HGVER}" \
-	  --resources contrib/macosx/ \
+	  --resources contrib/packaging/macosx/ \
 	  "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg
 
 deb:
diff --git a/contrib/macosx/Readme.html b/contrib/packaging/macosx/Readme.html
rename from contrib/macosx/Readme.html
rename to contrib/packaging/macosx/Readme.html
diff --git a/contrib/macosx/Welcome.html b/contrib/packaging/macosx/Welcome.html
rename from contrib/macosx/Welcome.html
rename to contrib/packaging/macosx/Welcome.html
diff --git a/contrib/macosx/distribution.xml b/contrib/packaging/macosx/distribution.xml
rename from contrib/macosx/distribution.xml
rename to contrib/packaging/macosx/distribution.xml
--- a/contrib/macosx/distribution.xml
+++ b/contrib/packaging/macosx/distribution.xml
@@ -4,7 +4,7 @@
   <organization>org.mercurial-scm</organization>
   <options customize="never" require-scripts="false" rootVolumeOnly="true" />
   <welcome file="Welcome.html" mime-type="text/html" />
-  <license file="../../COPYING" mime-type="text/plain" />
+  <license file="../../../COPYING" mime-type="text/plain" />
   <readme file="Readme.html" mime-type="text/html" />
   <pkg-ref id="org.mercurial-scm.mercurial"
            version="0"
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1082,8 +1082,8 @@ setup(name='mercurial',
           'bdist_mpkg': {
               'zipdist': False,
               'license': 'COPYING',
-              'readme': 'contrib/macosx/Readme.html',
-              'welcome': 'contrib/macosx/Welcome.html',
+              'readme': 'contrib/packaging/macosx/Readme.html',
+              'welcome': 'contrib/packaging/macosx/Welcome.html',
           },
       },
       **extra)