[gimp/gimp-2-8] build: update OSX build files

[Clayton Walker <claytonw src gnome org>]

commit d824943b589e6dd89c4a55a588ef3595d105efde
Author: Clayton Walker <blender3dartist gmail com>
Date:   Thu Jan 24 14:06:41 2013 -0700

    build: update OSX build files

 build/osx/{gimp-python.bundle => gimp-2.8.bundle} |   29 +++--
 build/osx/gimp.bundle                             |  127 ---------------------
 build/osx/{Info.plist => info-2.8.3.plist}        |   11 ++-
 build/osx/{Info.plist => info-2.8.4.plist}        |   13 ++-
 build/osx/{launcher-python.sh => launcher-2.8.sh} |    2 +-
 build/osx/launcher.sh                             |   63 ----------
 6 files changed, 35 insertions(+), 210 deletions(-)
---
diff --git a/build/osx/gimp-python.bundle b/build/osx/gimp-2.8.bundle
similarity index 92%
rename from build/osx/gimp-python.bundle
rename to build/osx/gimp-2.8.bundle
index c183d17..e351200 100644
--- a/build/osx/gimp-python.bundle
+++ b/build/osx/gimp-2.8.bundle
@@ -54,7 +54,7 @@
   </binary>
 
   <!-- Copy in Info.plist -->
-  <plist>${project}/Info.plist</plist>
+  <plist>${project}/info-2.8.3.plist</plist>
 
   <!-- Copy in libpyglib, which will pull in other dependencies we need -->
   <binary>
@@ -71,20 +71,29 @@
 
   <!-- We have to pull in the python modules, which are mixed python
        and loadable modules.  -->
-  <data>
-    ${prefix}/lib/python2.7/
+
+  <binary recurse="True">
+    ${prefix}/lib/python2.7/*.so
+  </binary>
+
+  <data recurse="True">
+    ${prefix}/lib/python2.7/*.py
   </data>
 
   <data>
-    ${prefix}/lib/pygtk/2.0/
+    ${prefix}/lib/python2.7/config/
+  </data>
+
+  <data recurse="True">
+    ${prefix}/lib/pygtk/2.0/*.py
   </data>
 
   <data>
-    ${prefix}/include/python2.7/
+    ${prefix}/include/python2.7/pyconfig.h
   </data>
 
   <!-- Name of main gimp binary -->
-  <main-binary>${prefix}/bin/gimp</main-binary>
+  <main-binary>${prefix}/bin/gimp-2.8</main-binary>
 
   <!-- Copy in gimp plugins -->
   <binary>${prefix}/lib/gimp/2.0/plug-ins/*</binary>
@@ -93,7 +102,8 @@
   <binary>${prefix}/lib/gimp/2.0/modules/*.so</binary>
 
   <!-- Copy in gimp python modules -->
-  <binary>${prefix}/lib/gimp/2.0/python/*</binary>
+  <binary>${prefix}/lib/gimp/2.0/python/*.so</binary>
+  <data>${prefix}/lib/gimp/2.0/python/*.py</data>
 
   <!-- Copy in GTK+ modules -->
   <binary>${prefix}/lib/${gtkdir}/modules/*.so</binary>
@@ -113,9 +123,6 @@
   <!-- Copy in GTK+ immodules -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so</binary>
 
-  <!-- Copy in pango modules -->
-  <binary>${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so</binary>
-
   <!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
   <binary>${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so</binary>
 
@@ -128,8 +135,6 @@
   <data>${prefix}/etc/gtk-2.0/*</data>
 
   <!-- Fontconfig data; requires clean up -->
-  <data>${prefix}/etc/fonts/fonts.dtd</data>
-  <data>${prefix}/etc/fonts/conf.avail/*</data>
   <data>${prefix}/etc/fonts/conf.d/*</data>
 
   <!-- Gimp data -->
diff --git a/build/osx/Info.plist b/build/osx/info-2.8.3.plist
similarity index 99%
copy from build/osx/Info.plist
copy to build/osx/info-2.8.3.plist
index bc1eb91..1b10b4a 100644
--- a/build/osx/Info.plist
+++ b/build/osx/info-2.8.3.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleName</key>
 	<string>GIMP</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.8.2, Â 1995-2012 The GIMP Development Team</string>
+	<string>2.8.3, Â 1995-2012 The GIMP Development Team</string>
 	<key>CFBundleIconFile</key>
 	<string>gimp.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,15 +19,20 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.2</string>
+	<string>2.8.3</string>
 	<key>CFBundleSignature</key>
 	<string>gimp</string>
 	<key>CFBundleVersion</key>
-	<string>2.8.2.2</string>
+	<string>2.8.3</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Â 1995-2012 The GIMP Development Team</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6.0</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+	</dict>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleDocumentTypes</key>
diff --git a/build/osx/Info.plist b/build/osx/info-2.8.4.plist
similarity index 98%
rename from build/osx/Info.plist
rename to build/osx/info-2.8.4.plist
index bc1eb91..4a40e7d 100644
--- a/build/osx/Info.plist
+++ b/build/osx/info-2.8.4.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleName</key>
 	<string>GIMP</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.8.2, Â 1995-2012 The GIMP Development Team</string>
+	<string>2.8.4, Â 1995-2012 The GIMP Development Team</string>
 	<key>CFBundleIconFile</key>
 	<string>gimp.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,15 +19,20 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.2</string>
+	<string>2.8.4</string>
 	<key>CFBundleSignature</key>
 	<string>gimp</string>
 	<key>CFBundleVersion</key>
-	<string>2.8.2.2</string>
+	<string>2.8.4</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Â 1995-2012 The GIMP Development Team</string>
+	<string>Â 1995-2013 The GIMP Development Team</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6.0</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+	</dict>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleDocumentTypes</key>
diff --git a/build/osx/launcher-python.sh b/build/osx/launcher-2.8.sh
similarity index 97%
rename from build/osx/launcher-python.sh
rename to build/osx/launcher-2.8.sh
index 2ec4699..62285a4 100755
--- a/build/osx/launcher-python.sh
+++ b/build/osx/launcher-2.8.sh
@@ -80,5 +80,5 @@ if [ "x$GTK_DEBUG_SHELL" != "x" ]; then
 	exec bash
 
 else
-	$EXEC "$bundle_contents/MacOS/$name-bin"
+	$EXEC "$bundle_contents/MacOS/$name-bin" "$@"
 fi