← Back to branch summary

~onboard/onboard/0.98

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: marmuta
  • Date: 2012-10-27 11:16:45 UTC
  • Revision ID: marmvta@gmail.com-20121027111645-n328lok4l0mw1ku3
Merge trunk rev. 1029: Fix build failure on Precise with python 3.2 and python3-distutils-extra 2.34-0ubuntu0.1. The old encoding workaround is still necessary there.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
11
11
from distutils.core import Extension, Command
12
12
from distutils      import version
13
13
 
 
14
# Building in pbuilder for Precise with Python 3.2 and 
 
15
# python3-distutils-extra 2.34-0ubuntu0.1 
 
16
# still needs this workaround, else UnicodeDecodeError.
 
17
# Skip this in python 3.3 or 'open' calls will fail later.
 
18
if sys.version_info.major == 3 and \
 
19
   sys.version_info.minor <= 2:
 
20
    import locale
 
21
    locale.getpreferredencoding = lambda: 'UTF-8'
 
22
 
14
23
try:
15
24
    import DistUtilsExtra.auto
16
25
except ImportError:
159
168
                  ('share/onboard', glob.glob('NEWS')),
160
169
                  ('share/onboard', glob.glob('README')),
161
170
                  ('share/onboard', glob.glob('onboard-defaults.conf.example')),
 
171
                  ('share/onboard', glob.glob('onboard-defaults.conf')),
162
172
                  ('share/icons/hicolor/scalable/apps', glob.glob('icons/hicolor/*')),
163
173
                  ('share/icons/ubuntu-mono-dark/status/22', glob.glob('icons/ubuntu-mono-dark/*')),
164
174
                  ('share/icons/ubuntu-mono-light/status/22', glob.glob('icons/ubuntu-mono-light/*')),