casa-mp-base

diff --git Changelog Changelog

index 07dfe16..47bbfef 100644

--- Changelog

+++ Changelog

@@ -1,5 +1,21 @@

 Changes in version 0.7.4:

+ - Release gtk-mac-bundler 0.7.4 (John Ralls)

+ - Make sure to check for .symbolic icon extension (Jesse van den Kieboom)

+ - Fix pixbuf loader cache path (Jesse van den Kieboom)

+ - Make sure that libraries are writeable before using otool. (Julien Woillez)

+ - Update doap to reflect correct bug tracker. (John Ralls)

+ - Bug 698196: Fix typo (John Ralls)

+ - Bug #698916: Update versions, fix pixbuf (John Ralls)

+ - Update all launchers to reflect new pango environment variables (John Ralls)

+ - launcher: Update for pango changes (Dave Vasilevsky)

+ - Correct gdk-pixbuf path in the pygtk example (John Ralls)

+ - Bring example bundle files and launchers up to date (John Ralls)

+ - The *correct* fix for pango modules. (John Ralls)

+ - Fix another typo in pango module path (John Ralls)

+

+Changes in version 0.7.4:

+

  - Make sure to check for .symbolic icon extension (Jesse van den Kieboom)

  - Fix pixbuf loader cache path (Jesse van den Kieboom)

  - Make sure that libraries are writeable before using otool. (Julien Woillez)

diff --git bundler/bundler.py bundler/bundler.py

index 8061ac1..65b8cc0 100644

--- bundler/bundler.py

+++ bundler/bundler.py

@@ -1,12 +1,12 @@

 import sys

 import os, errno, glob

-import dircache, shutil

+import shutil

 import re

 from plistlib import Plist

 from distutils import dir_util, file_util

-from project import *

-import utils

+from .project import *

+from . import utils

 class Bundler:

     def __init__(self, project):

@@ -32,13 +32,13 @@ class Bundler:

     def recursive_rm(self, dirname):

         # Extra safety ;)

         if dirname in [ "/", os.getenv("HOME"), os.path.join(os.getenv("HOME"), "Desktop"), self.meta.dest ]:

-            print "Eek, trying to remove a bit much, eh? (%s)" % (dirname)

+            print("Eek, trying to remove a bit much, eh? (%s)" % (dirname))

             sys.exit(1)

         if not os.path.exists(dirname):

             return

-        files = dircache.listdir(dirname)

+        files = os.listdir(dirname)

         for file in files:

             path = os.path.join (dirname, file)

             if os.path.isdir(path):

@@ -68,6 +68,12 @@ class Bundler:

         self.copy_path(path)

     def create_pango_setup(self):

+        if utils.has_pkgconfig_module("pango") and \

+                not utils.has_pkgconfig_variable("pango", "pango_module_version"):

+            # Newer pango (>= 1.38) no longer has modules, skip this

+            # step in that case.

+            return

+

         # Create a temporary pangorc file just for creating the

         # modules file with the right modules.

         module_version = utils.evaluate_pkgconfig_variables("${pkg:pango:pango_module_version}")

@@ -227,7 +233,7 @@ class Bundler:

             # Clean out any libtool (*.la) files and static libraries

             if os.path.isdir(dest):

                 for root, dirs, files in os.walk(dest):

-                    for name in filter(lambda l: l.endswith(".la") or l.endswith(".a"), files):

+                    for name in [l for l in files if l.endswith(".la") or l.endswith(".a")]:

                         os.remove(os.path.join(root, name))

     # Copies from Path.source to Path.dest, evaluating any variables

@@ -247,7 +253,7 @@ class Bundler:

                 relative_dest = self.project.evaluate_path(Path.source[m.end():])

                 dest = self.project.get_bundle_path("Contents/Resources", relative_dest)

             else:

-                print "Invalid bundle file, missing or invalid 'dest' property: " + Path.dest

+                print("Invalid bundle file, missing or invalid 'dest' property: " + Path.dest)

                 sys.exit(1)