The following commit has been merged in the debian-experimental-3.6 branch:
commit 298473ede4f0e603e6231e213883ad70482491f9
Author: Rene Engelhard <[email protected]>
Date: Fri Jan 4 16:14:13 2013 +0100
fix gdb helper installation; use upstreams install-gdb-printers
Conflicts:
changelog
diff --git a/changelog b/changelog
index 1ccb510..c827cad 100644
--- a/changelog
+++ b/changelog
@@ -8,12 +8,13 @@ libreoffice (1:3.6.5~rc2-1) UNRELEASED; urgency=low
(closes: #682838)
- temporarily remove wheezy backport conditionals as base-files would make
us think we should build for wheezy right now
+ - fix gdb helper installation; use upstreams install-gdb-printers
* debian/rules, debian/*.triggers.in, debian/libreoffice-common.postinst.in:
- re-introduce @OODIR@/share/extensions trigger as we still need to tell
LO to sync if a subdir inside share/extension *changes*, but "touch" is
enough now
- -- Rene Engelhard <[email protected]> Mon, 14 Jan 2013 21:37:10 +0100
+ -- Rene Engelhard <[email protected]> Wed, 16 Jan 2013 14:25:29 +0100
libreoffice (1:3.6.4-1) experimental; urgency=low
diff --git a/rules b/rules
index cf00913..883d523 100755
--- a/rules
+++ b/rules
@@ -1684,6 +1684,9 @@ $(STAMP_DIR)/install-common:
export OOINSTBASE=$(OODIR); \
export OOO_LANGS_LIST="$(ISOS)"; \
$(CURDIR)/debian/scripts/gid2pkgdirs.sh
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ make cmd cmd="export DESTDIR=$(CURDIR)/debian/tmp; install-gdb-printers
-a /usr/share/gdb/auto-load/$(OODIR) -c -i /$(OODIR) -p
/usr/share/libreoffice/gdb"
+endif
# FIXME
if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
@@ -2816,13 +2819,26 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
# dh_strip --dbg-package= is not idempotent, force copying of the
binaries
# again...
rm -f $(STAMP_DIR)/install-arch
- # install .gdb-py
- for i in `find $(SOURCE_TREE)/solver/ -name "*-gdb.py"`; do \
- if echo $$i | grep -q uno_; then pkg=uno-libs3;
path=usr/lib/ure/lib; \
- else pkg=libreoffice; path=usr/lib/libreoffice/program; fi; \
- mkdir -p debian/$$pkg-dbg/usr/lib/debug/$$path && \
- install -m644 $$i
debian/$$pkg-dbg/usr/lib/debug/$$path/`basename $$i`; \
- done
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ mkdir -p $(PKGDIR)-dbg/usr/share/gdb/auto-load/$(OODIR)
+ mv $(CURDIR)/debian/tmp/usr/share/gdb/auto-load/$(OODIR)/program \
+ $(PKGDIR)-dbg/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 $(PKGDIR)-dbg/usr/share/libreoffice/gdb
+ mv $(CURDIR)/debian/tmp/usr/share/libreoffice/gdb/libreoffice \
+ $(PKGDIR)-dbg/usr/share/libreoffice/gdb
+ # FIXME: or better ure-dbg (ure/lib?). Then again ure-link is a link
which is in -common
+ # anyways...
+ mkdir -p debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure-link/
+ mv $(CURDIR)/debian/tmp//usr/share/gdb/auto-load/$(OODIR)/ure-link/lib \
+ debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure-link
+ mkdir -p debian/uno-libs3-dbg/usr/share/libreoffice/gdb/libreoffice
+ mv $(PKGDIR)-dbg/usr/share/libreoffice/gdb/libreoffice/cppu.py \
+ debian/uno-libs3-dbg/usr/share/libreoffice/gdb/libreoffice
+ mv $(PKGDIR)-dbg/usr/share/libreoffice/gdb/libreoffice/sal.py \
+ debian/uno-libs3-dbg/usr/share/libreoffice/gdb/libreoffice
+endif
else
dh_strip -s
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
