20617872 X needs to start using python 2.7 in its builds
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 03 Mar 2015 07:18:15 -0800
changeset 1439 e4614bd11218
parent 1438 d8b9f5323d55
child 1440 8d6b482b17c0
20617872 X needs to start using python 2.7 in its builds
exception_lists/packaging
open-src/common/Makefile.init
--- a/exception_lists/packaging	Wed Feb 25 13:39:12 2015 -0800
+++ b/exception_lists/packaging	Tue Mar 03 07:18:15 2015 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -73,12 +73,12 @@
 usr/share/X11/xorg.conf.d/50-synaptics.conf	i386
 
 # Only need the normal *.pyc compiled byte-code, not the "optimized" *.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/__init__.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/error.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/expr.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/matcher.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/state.pyo
-usr/lib/python2.6/vendor-packages/xcbgen/xtypes.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/__init__.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/error.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/expr.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/matcher.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/state.pyo
+usr/lib/python2.7/vendor-packages/xcbgen/xtypes.pyo
 
 # No need to deliver libchromeXvMC.so since it requires DRI which we don't build with
 usr/lib/libchromeXvMC.so			i386
--- a/open-src/common/Makefile.init	Wed Feb 25 13:39:12 2015 -0800
+++ b/open-src/common/Makefile.init	Tue Mar 03 07:18:15 2015 -0800
@@ -1,7 +1,7 @@
 # -*- Makefile -*- rules commonly shared among X consolidation open source dirs
 # Makefile.init has definitions that are needed before the module/modtype rules
 #
-# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -331,7 +331,7 @@
 ## Python tools & paths
 # When changing PYTHON_VERSION, check that PYTHON_PKG_VERSION & 
 # PYTHON_PATH_VERSION are still set correctly in pkg/Makefile
-PYTHON_VERSION=2.6
+PYTHON_VERSION=2.7
 PYTHON=/usr/bin/python$(PYTHON_VERSION)
 PYTHON_PATH=$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages:$(PROTODIR)/usr/lib/python$(PYTHON_VERSION)/site-packages:/usr/lib/python$(PYTHON_VERSION)/vendor-packages:/usr/lib/python$(PYTHON_VERSION)/site-packages
 # We want our python modules installed to vendor-packages, not site-packages