[libreoffice] 01/03: more changes because of debhelper internal changes, get the helpers packaged again
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit af4ed0a8abdf8f8ef212a2ef096c38fc82804b87
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 26 09:28:08 2016 +0100
more changes because of debhelper internal changes, get the helpers packaged again
---
changelog | 2 ++
control | 4 ++--
rules | 54 +++++++++++++++++++++++++++++-------------------------
3 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/changelog b/changelog
index 2950a6f..d97a867 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium
* debian/rules:
- -officebean is a arch-dep package, move pom generation and mh_*
calls for it to install-arch...
+ - adapt for changed debhelper internals to make out -dbgsym hacks work
+ again and build-depend on debhelper >= 9.20160115
-- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
diff --git a/control b/control
index a3ee324..99f4ce7 100644
--- a/control
+++ b/control
@@ -13,7 +13,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
bzip2,
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 9.20151219),
+ debhelper (>= 9.20160115),
default-jdk (>= 1:1.7-48) [ia64],
default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
default-jdk [!mips64],
@@ -4373,7 +4373,7 @@ Depends: ant (>= 1.7.0),
bzip2,
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 9.20151219),
+ debhelper (>= 9.20160115),
default-jdk,
default-jdk (>= 2:1.7-52.1),
dh-python,
diff --git a/rules b/rules
index 7c196aa..b3a8dbb 100755
--- a/rules
+++ b/rules
@@ -203,6 +203,9 @@ 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
@@ -211,6 +214,9 @@ 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)
@@ -889,7 +895,7 @@ else
endif
ifeq "$(BUILD_DDEBS)" "y"
- BUILD_DEPS += , debhelper (>= 9.20151219)
+ BUILD_DEPS += , debhelper (>= 9.20160115)
# from debhelper changelog
BUILD_DEPS += , dpkg-dev (>= 1.18.2~)
else
@@ -3180,37 +3186,37 @@ ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)"
# dh_strip --dbg-package= is not idempotent, force copying of the binaries
# again...
rm -f $(STAMP_DIR)/install-common
- mkdir -p debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)
+ mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
mv $(CURDIR)/debian/tmp/usr/share/gdb/auto-load/$(OODIR)/program \
- debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)
+ debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)
# I think a -dbg-common is overkill. Although this means that this all only
# will work if libreoffice-dbg is installed..
- mkdir -p debian/$(CORE_DBG)/usr/share/libreoffice/gdb
+ mkdir -p debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb
mv $(CURDIR)/debian/tmp/usr/share/libreoffice/gdb/libreoffice \
- debian/$(CORE_DBG)/usr/share/libreoffice/gdb
- mkdir -p debian/$(WRITER_DBG)/usr/share/gdb/auto-load/$(OODIR)/program
- mkdir -p debian/$(WRITER_DBG)/usr/share/libreoffice/gdb/libreoffice/
+ 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/
for i in sw writerfilter; do \
- if [ -f debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py ]; then \
- mv debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)/program/lib$${i}lo.so-gdb.py \
- debian/$(WRITER_DBG)/usr/share/gdb/auto-load/$(OODIR)/program/; \
+ 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 \
+ debian/$(WRITER_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/; \
fi; \
- mv debian/$(CORE_DBG)/usr/share/libreoffice/gdb/libreoffice/$$i.py \
- debian/$(WRITER_DBG)//usr/share/libreoffice/gdb/libreoffice; \
+ mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/$$i.py \
+ debian/$(WRITER_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice; \
done
# FIXME: or better ure-dbg (ure/lib?). Then again ure is a link which is in -common
# anyways...
- mkdir -p debian/$(UNO_LIBS_DBG)/usr/share/gdb/auto-load/$(OODIR)/program
- mv debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_cppu.so.3-gdb.py \
- debian/$(UNO_LIBS_DBG)/usr/share/gdb/auto-load/$(OODIR)/program
- mv debian/$(CORE_DBG)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_sal.so.3-gdb.py \
- debian/$(UNO_LIBS_DBG)/usr/share/gdb/auto-load/$(OODIR)/program
- mkdir -p debian/$(UNO_LIBS_DBG)/usr/share/libreoffice/gdb/libreoffice
- mv debian/$(CORE_DBG)/usr/share/libreoffice/gdb/libreoffice/cppu.py \
- debian/$(UNO_LIBS_DBG)/usr/share/libreoffice/gdb/libreoffice
- mv debian/$(CORE_DBG)/usr/share/libreoffice/gdb/libreoffice/sal.py \
- debian/$(UNO_LIBS_DBG)/usr/share/libreoffice/gdb/libreoffice
+ mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+ mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_cppu.so.3-gdb.py \
+ debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+ mv debian/$(CORE_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program/libuno_sal.so.3-gdb.py \
+ debian/$(UNO_LIBS_DBG_ROOT)/usr/share/gdb/auto-load/$(OODIR)/program
+ mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+ mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/cppu.py \
+ debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
+ mv debian/$(CORE_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice/sal.py \
+ debian/$(UNO_LIBS_DBG_ROOT)/usr/share/libreoffice/gdb/libreoffice
else
dh_strip -s
endif
@@ -3361,10 +3367,8 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
endif
ifeq "$(BUILD_DDEBS)" "y"
for i in libreoffice-core libreoffice-writer uno-libs3; do \
- if [ -d debian/.debhelper/$$i/dbgsym-root/DEBIAN ]; then \
- d=dbgsym-root; else d=ddeb-root; fi; \
perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \
- debian/.debhelper/$$i/$$d/DEBIAN/control; \
+ debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \
done
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: