[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b



The following commit has been merged in the debian-experimental-4.0 branch:
commit d89b877e26124b30ba10f352cd651ca6c9a20f3a
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Nov 26 19:11:49 2012 +0100

    even with the new python3 we need to fix the depends up...

diff --git a/rules b/rules
index 988a971..9614db2 100755
--- a/rules
+++ b/rules
@@ -2790,7 +2790,11 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
 endif
 	dh_python3 -ppython3-uno --no-guessing-deps
-ifneq "$(PYTHON_VERSION)" "current"
+	# adds a python3 (>= 3.2.3-3~)
+ifeq "$(PYTHON_VERSION)" "current"
+	sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR) (>= 3.3~)/g' \
+		debian/python3-uno.substvars
+else
 	sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
 		debian/python3-uno.substvars
 endif

-- 
LibreOffice packaging repository


Reply to: