[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-3-8-g2b66683

["Rene Engelhard" <rene@rene-engelhard.de>]

The following commit has been merged in the master branch:
commit 2b666831653a0ea9d9d220264b6d5c281a26830e
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jun 7 19:30:57 2013 +0200

    do python2 stuff only when we really want to build it
    
    Conflicts:
    	rules

diff --git a/rules b/rules
index d9dea0b..fc7280f 100755
--- a/rules
+++ b/rules
@@ -672,10 +672,12 @@ PYMAJOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[0])")
 PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
 PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1]+1)")
 PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+ifeq "$(ENABLE_PYTHON2)" "y"
 PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
 PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
 PY2MINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]+1")
 PYTHON2_SITE:=debian/python-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+endif
 else
 PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
 PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")

-- 
LibreOffice packaging repository