[libreoffice] 01/01: fix -dbg building (e.g. for jessie-backports)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit de5b55cf1ca3246de07f8f4d9a8e9dc1577a3824
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 14 06:19:38 2016 +0100
fix -dbg building (e.g. for jessie-backports)
---
changelog | 7 +++++--
rules | 55 ++++++++++++++++++++++++++++++++-----------------------
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/changelog b/changelog
index 620fd91..24e8d6d 100644
--- a/changelog
+++ b/changelog
@@ -2,11 +2,14 @@ libreoffice (1:5.1.1-2) UNRELEASED; urgency=medium
* debian/rules:
- decouple BUILD_TEST_PACKAGE and BUILD_DDEBS/BUILD_DBG_PACKAGE,
- as the tests con't depend on -dbg/-dbgsym anymore
+ as the tests con't depend on -dbg/-dbgsym anymore (and it fixes
+ -dbg building for jessie-backports). Fix some order: add a if and
+ remove --no-ddeb on jessie (not existing) to make -dbg package building
+ actually work again
- use internal libwps for jessie-backports
- don't hardcode python3-six in -dbgsyms Recommends
- -- Rene Engelhard <rene@debian.org> Fri, 11 Mar 2016 13:19:37 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 13 Mar 2016 21:18:55 +0100
libreoffice (1:5.1.1-1) unstable; urgency=medium
diff --git a/rules b/rules
index 85189f9..e0c89cb 100755
--- a/rules
+++ b/rules
@@ -198,30 +198,8 @@ KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=n
ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
BUILD_DDEBS=y
- ifeq "$(BUILD_DDEBS)" "y"
-UNO_LIBS_DBG=uno-libs3-dbgsym
-URE_DBG=ure-dbgsym
-CORE_DBG=libreoffice-core-dbgsym
-WRITER_DBG=libreoffice-writer-dbgsym
-URE_DBG_ROOT=.debhelper/ure/dbgsym-root
-CORE_DBG_ROOT=.debhelper/libreoffice-core/dbgsym-root
-WRITER_DBG_ROOT=.debhelper/libreoffice-writer/dbgsym-root
-DH_STRIP_DBG_OPTION_LO=--ddeb-migration=libreoffice-dbg
-DH_STRIP_DBG_OPTION_URE=--ddeb-migration=ure-dbg
-DH_STRIP_DBG_OPTION_UNO_LIBS=--ddeb-migration=uno-libs3-dbg
- else
-UNO_LIBS_DBG=uno-libs3-dbg
-URE_DBG=ure-dbg
-CORE_DBG=libreoffice-dbg
-WRITER_DBG=$(CORE_DBG)
-URE_DBG_ROOT=$(URE_DBG)
-CORE_DBG_ROOT=$(CORE_DBG)
-WRITER_DBG_ROOT=$(WRITER_DBG)
-DH_STRIP_DBG_OPTION_LO=--no-ddebs --dbg-package=$(CORE_DBG)
-DH_STRIP_DBG_OPTION_URE=--no-ddebs --dbg-package=$(URE_DBG)
-DH_STRIP_DBG_OPTION_UNO_LIBS=--no-ddebs --dbg-package=$(UNO_LIBS_DBG)
- endif
endif
+
ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
$(error only either DDEBS or -dbg allowed)
endif
@@ -726,6 +704,35 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "U
BUGS=mailto:debian-openoffice@lists.debian.org
endif
+ifeq "$(BUILD_DDEBS)" "y"
+UNO_LIBS_DBG=uno-libs3-dbgsym
+URE_DBG=ure-dbgsym
+CORE_DBG=libreoffice-core-dbgsym
+WRITER_DBG=libreoffice-writer-dbgsym
+URE_DBG_ROOT=.debhelper/ure/dbgsym-root
+CORE_DBG_ROOT=.debhelper/libreoffice-core/dbgsym-root
+WRITER_DBG_ROOT=.debhelper/libreoffice-writer/dbgsym-root
+DH_STRIP_DBG_OPTION_LO=--ddeb-migration=libreoffice-dbg
+DH_STRIP_DBG_OPTION_URE=--ddeb-migration=ure-dbg
+DH_STRIP_DBG_OPTION_UNO_LIBS=--ddeb-migration=uno-libs3-dbg
+else
+UNO_LIBS_DBG=uno-libs3-dbg
+URE_DBG=ure-dbg
+CORE_DBG=libreoffice-dbg
+WRITER_DBG=$(CORE_DBG)
+URE_DBG_ROOT=$(URE_DBG)
+CORE_DBG_ROOT=$(CORE_DBG)
+WRITER_DBG_ROOT=$(WRITER_DBG)
+DH_STRIP_DBG_OPTION_LO=--dbg-package=$(CORE_DBG)
+DH_STRIP_DBG_OPTION_URE=--dbg-package=$(URE_DBG)
+DH_STRIP_DBG_OPTION_UNO_LIBS=---dbg-package=$(UNO_LIBS_DBG)
+ifneq "$(JESSIE_BACKPORT)" "y"
+DH_STRIP_DBG_OPTION_LO += --no-ddebs
+DH_STRIP_DBG_OPTION_URE += --no-ddebs
+DH_STRIP_DBG_OPTION_UNO_LIBS3 += --no-ddebs
+endif
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@ -3205,6 +3212,7 @@ ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)"
debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
mkdir -p debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/
+ ifeq "$(BUILD_DDEBS)" "y"
for i in sw writerfilter; do \
if [ -f debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py ]; then \
mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py \
@@ -3213,6 +3221,7 @@ ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)"
mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/$$i.py \
debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice; \
done
+ endif
# FIXME: or better ure-dbg (ure/lib?). Then again ure is a link which is in -common
# anyways...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: