adium 2611:5dd00099f721: Backed out changeset 634e2660696b

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/5dd00099f721
revision:	2611:5dd00099f721
author:		Zachary West <zacw at adium.im>
date:		Wed Aug 12 14:46:00 2009 -0400

Backed out changeset 634e2660696b
Subject: adium 2612:60dd5e6b7ead: Fix compiling/universalizing libjson-glib.

details:	http://hg.adium.im/adium/rev/60dd5e6b7ead
revision:	2612:60dd5e6b7ead
author:		Zachary West <zacw at adium.im>
date:		Wed Aug 19 19:02:12 2009 -0700

Fix compiling/universalizing libjson-glib.

diffs (37 lines):

diff -r d6bb9d4249fc -r 60dd5e6b7ead Utilities/dep-build-scripts/framework_maker/frameworkize.py
--- a/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Fri Aug 21 15:08:10 2009 -0400
+++ b/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Wed Aug 19 19:02:12 2009 -0700
@@ -40,9 +40,9 @@
     return (library_name, 'A')
   # Note: these styles are named after where I noticed them, not necessarily
   # where they originate. -RAF
-  regexes = [r'([A-Za-z0-9_-]*)-([0-9.]*)$', #apr style
-             r'([A-Za-z0-9_-]*[a-zA-Z])\.([0-9.]*)$', #gnu style
-             r'([A-Za-z0-9_-]*[a-zA-Z])([0-9.]*)$', #sqlite style
+  regexes = [r'([A-Za-z0-9_-]*)-([0-9\.]*)$', #apr style
+             r'([A-Za-z0-9_-]*[a-zA-Z])\.([0-9\.]*)$', #gnu style
+             r'([A-Za-z0-9_-]*[a-zA-Z])([0-9\.]*)$', #sqlite style
              ]
   for regex in regexes:
     match = re.match(regex, library_name)
diff -r d6bb9d4249fc -r 60dd5e6b7ead Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh	Fri Aug 21 15:08:10 2009 -0400
+++ b/Utilities/dep-build-scripts/universalize.sh	Wed Aug 19 19:02:12 2009 -0700
@@ -19,7 +19,7 @@
 MEANWHILE=libmeanwhile.1
 GADU=libgadu.3.7.0
 SASL=libsasl2.2
-JSONGLIB=libjson-glib-1.0.0
+JSONGLIB=libjson-glib-1.0
 
 # vv
 GSTREAMER=libgstreamer-0.10.0
@@ -67,7 +67,7 @@
 
 
 mkdir libjson-glib-1.0.0 || true
-cp -R $TARGET_DIR_I386/include/json-glib-1.0/ $UNIVERSAL_DIR/include/libjson-glib-1.0.0/
+cp -R $TARGET_DIR_I386/include/json-glib-1.0/json-glib $UNIVERSAL_DIR/include/libjson-glib-1.0.0
 
 
 ####