[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-1-gd807bd1
The following commit has been merged in the master branch:
commit d807bd1e0309e95f3b54efdb74b6f65a38b02f9c
Author: Rene Engelhard <rene@debian.org>
Date: Sat Oct 8 12:15:30 2011 +0200
remove PYTHON_HELPER conditional, we use dh_python2 anywhere and lintian just spits out false positives...
diff --git a/changelog b/changelog
index 3171991..7c9bca9 100644
--- a/changelog
+++ b/changelog
@@ -14,12 +14,14 @@ libreoffice (1:3.4.3-4) unstable; urgency=low
- use mingw-w64 for unowinreg.dll build (closes: #642954)
- build-dep on libpq-dev (>= 9.0~) for PQconnectdbParams
- add libhunspell-1.3-0-dbg to DBG_DBG_SUGGESTS
+ - remove PYTHON_HELPER conditional, we use dh_python2 anywhere and
+ lintian just spits out false positives...
* merge from ubuntu-oneiric-3.4:
- hard hack to make upload happy: Pre-Depends on xz-capable dpkg
for -dbg
- -- Rene Engelhard <rene@debian.org> Fri, 07 Oct 2011 00:22:12 +0000
+ -- Rene Engelhard <rene@debian.org> Sat, 08 Oct 2011 12:08:04 +0200
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/rules b/rules
index 0a5d4d9..a8df3d5 100755
--- a/rules
+++ b/rules
@@ -112,7 +112,6 @@ BUILD_PYUNO=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
endif
-PYTHON_HELPER=dh_python2
# THIS IS ONLY FOR TESTING. When building against a specified pythonX.Y
# this will work inside OOo but *not* from outside OOo unless the user
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
@@ -622,17 +621,7 @@ PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
- ifeq ($(PYTHON_HELPER),dh_python2)
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
- else ifeq ($(PYTHON_HELPER),dh_pycentral)
- BUILD_DEPS += , python-central (>= 0.5)
- else ifeq ($(PYTHON_HELPER),dh_pysupport)
- ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
- BUILD_DEPS += , python-support (>= 0.90.4)
- else
- BUILD_DEPS += , python-support
- endif
- endif
DBG_DBG_SUGGESTS+= , python-dbg
BUILD_DEPS += , $(PYTHON)-dev
else
@@ -3282,20 +3271,7 @@ ifeq "$(ENABLE_JAVA)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
endif
endif
-ifeq ($(PYTHON_HELPER),dh_python2)
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
-else ifeq ($(PYTHON_HELPER),dh_pycentral)
- dh_pycentral -ppython-uno
- ifeq "$(PYTHON_VERSION)" "current"
- # fix up broken depends (should be like python (<< 2.6), python (>= 2.5)
- # as it was the case before it broke somewhen
- perl -pi -e 's/python, python-central/python (<< $(PYMAJOR).$(PYMINORPLUS1)), python (>= $(PYMAJOR).$(PYMINOR)), python-central/' debian/python-uno.substvars
- endif
-else ifeq ($(PYTHON_HELPER),dh_pysupport)
- dh_pysupport -ppython-uno -V $(PYMAJOR).$(PYMINOR)
-else
- dh_python
-endif
dh_lintian -s
dh_bugfiles -s -A
dh_link -s
diff --git a/source.lintian-overrides b/source.lintian-overrides
index e312b3d..7edd3bb 100644
--- a/source.lintian-overrides
+++ b/source.lintian-overrides
@@ -6,5 +6,3 @@ libreoffice source: debhelper-but-no-misc-depends libreoffice-l10n-mr-in
libreoffice source: debhelper-but-no-misc-depends libreoffice-l10n-te-in
libreoffice source: debhelper-but-no-misc-depends libreoffice-l10n-ml-in
libreoffice source: debhelper-but-no-misc-depends libreoffice-l10n-as-in
-libreoffice source: dh_pycentral-is-obsolete line 3272
-libreoffice source: dh_python-is-obsolete line 3281
--
LibreOffice packaging repository
Reply to: