adium-1.4 2591:f66a716bfc79: libpurple version++, fix fix fix fi...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/f66a716bfc79
revision:	2591:f66a716bfc79
author:		Zachary West <zacw at adium.im>
date:		Fri Aug 21 13:24:36 2009 -0700

libpurple version++, fix fix fix fix libjson-glib compiling.

diffs (39 lines):

diff -r a222c0fee341 -r f66a716bfc79 Utilities/dep-build-scripts/framework_maker/frameworkize.py
--- a/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Fri Aug 21 13:23:31 2009 -0700
+++ b/Utilities/dep-build-scripts/framework_maker/frameworkize.py	Fri Aug 21 13:24:36 2009 -0700
@@ -40,13 +40,14 @@
     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)
     if match:
+      print library_name + ' matches ' + regex + ' with ' + match.groups()[1]
       return match.groups()
   
   # If we get here, we need a new regex. Throw an exception.
diff -r a222c0fee341 -r f66a716bfc79 Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh	Fri Aug 21 13:23:31 2009 -0700
+++ b/Utilities/dep-build-scripts/universalize.sh	Fri Aug 21 13:24:36 2009 -0700
@@ -16,12 +16,12 @@
 MEANWHILE=libmeanwhile.1
 GADU=libgadu.3.7.0
 SASL=libsasl2.2
-JSONGLIB=libjson-glib-1.0
+JSONGLIB=libjson-glib-1.0.0
 
 # vv
 # I'm not sure what to do to universalize the vv libs, especially the gst-plugins
 
-PURPLE_VERSION=0.6.0
+PURPLE_VERSION=0.6.2
 
 LIBPURPLE=libpurple.$PURPLE_VERSION
 PURPLE_FOLDER=libpurple-$PURPLE_VERSION