[libreoffice] 01/02: migrate from --ddeb-migration to --dbgsym-migration

To: debian-openoffice@lists.debian.org
Subject: [libreoffice] 01/02: migrate from --ddeb-migration to --dbgsym-migration
From: Rene Engelhard <rene@moszumanska.debian.org>
Date: Sat, 21 May 2016 16:42:40 +0000
Message-id: <[🔎] E1b49z6-0004zE-L8@moszumanska.debian.org>
Reply-to: Rene Engelhard <rene@debian.org>
In-reply-to: <[🔎] 20160521164232.17527.27783@moszumanska.debian.org>
References: <[🔎] 20160521164232.17527.27783@moszumanska.debian.org>

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 314d11252e0eb2f8889dc7c00c4f39cd39d0ee9d
Author: Rene Engelhard <rene@debian.org>
Date:   Sat May 21 18:40:37 2016 +0200

    migrate from --ddeb-migration to --dbgsym-migration
---
 changelog |  1 +
 control   |  2 +-
 rules     | 40 ++++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/changelog b/changelog
index 1a55d99..e6d80f9 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ libreoffice (1:5.1.3-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - move GTK3_MINVER setting down in rules so the conditional gets honoured
+    - migrate from --ddeb-migration to --dbgsym-migration
 
   * debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
     forgotten mdds-1.2.0.tar.bz2
diff --git a/control b/control
index cb15709..986d40f 100644
--- a/control
+++ b/control
@@ -14,7 +14,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                chromium (>= 39.0.2171.71-1) [i386 amd64],
                coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
                coinor-libcoinutils-dev (>= 2.9.15-3.1),
-               debhelper (>= 9.20160115),
+               debhelper (>= 9.20160114),
                default-jdk (>= 1:1.7-48) [ia64],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk [!mips64],
diff --git a/rules b/rules
index 32f2d0f..8f65a7f 100755
--- a/rules
+++ b/rules
@@ -198,16 +198,16 @@ QT_MINVER= (>= 4:4.8)
 KDELIBS_MINVER= (>= 4:4.3.4)
 BUILD_DBG_PACKAGE=n
 ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
-BUILD_DDEBS=y
+BUILD_DBGSYM_PACKAGES=y
 endif
 
-ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
-$(error only either DDEBS or -dbg allowed)
+ifeq "$(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE)" "yy"
+$(error only either -dbgsym or -dbg allowed)
 endif
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   BUILD_TEST_PACKAGE=y
 endif
-ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
+ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
   ENABLE_SYMBOLS=y
   SMALL_SYMBOLS=y
 endif
@@ -694,7 +694,7 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "j
   SYSTEM_STUFF := $(filter-out opencollada collada2gltf libcmis mdds glm orcus libgltf libwps,$(SYSTEM_STUFF))
   JESSIE_BACKPORT=y
   BUILD_DBG_PACKAGE=y
-  BUILD_DDEBS=n
+  BUILD_DBGSYM_PACKAGES=n
   PYTHON_SIX_RECOMMENDS = python-six
   MDDS_VER := 0.1
   LIBORCUS_MINVER :=
@@ -703,7 +703,7 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "U
   BUGS=mailto:debian-openoffice@lists.debian.org
 endif
 
-ifeq "$(BUILD_DDEBS)" "y"
+ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 UNO_LIBS_DBG=uno-libs3-dbgsym
 URE_DBG=ure-dbgsym
 CORE_DBG=libreoffice-core-dbgsym
@@ -711,9 +711,9 @@ 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
+DH_STRIP_DBG_OPTION_LO=--dbgsym-migration=libreoffice-dbg
+DH_STRIP_DBG_OPTION_URE=--dbgsym-migration=ure-dbg
+DH_STRIP_DBG_OPTION_UNO_LIBS=--dbgsym-migration=uno-libs3-dbg
 else
 UNO_LIBS_DBG=uno-libs3-dbg
 URE_DBG=ure-dbg
@@ -726,9 +726,9 @@ 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
+DH_STRIP_DBG_OPTION_LO += --no-automatic-dbgsym
+DH_STRIP_DBG_OPTION_URE += --no-automatic-dbgsym
+DH_STRIP_DBG_OPTION_UNO_LIBS3 += --no-automatic-dbgsym
 endif
 endif
 
@@ -856,7 +856,7 @@ ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
 endif
 	OPENCL_SUGGESTS := ocl-icd-libopencl1
 
-ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
+ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
   ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
 	SMALL_SYMBOLS = n
   else
@@ -902,8 +902,8 @@ else
 	BUILD_DEPS += , python
 endif
 
-ifeq "$(BUILD_DDEBS)" "y"
-	BUILD_DEPS += , debhelper (>= 9.20160115)
+ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
+	BUILD_DEPS += , debhelper (>= 9.20160114)
 	# from debhelper changelog
 	BUILD_DEPS += , dpkg-dev (>= 1.18.2~)
 else
@@ -2098,7 +2098,7 @@ $(STAMP_DIR)/install-common:
 	export OOINSTBASE=$(OODIR); \
 	export OOO_LANGS_LIST="$(ISOS)"; \
 	$(CURDIR)/debian/scripts/gid2pkgdirs.sh
-ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
+ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
 	make cmd cmd="export DESTDIR=$(CURDIR)/debian/tmp; $(CURDIR)/solenv/bin/install-gdb-printers -a /usr/share/gdb/auto-load/$(OODIR) -c -i /$(OODIR) -p /usr/share/libreoffice/gdb"
 endif
 
@@ -3233,8 +3233,8 @@ endif
 	dh_lintian -s
 	dh_bugfiles -s -A
 	dh_link -s -X.desktop
-ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
-  ifeq "$(BUILD_DDEBS)" "y"
+ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
+  ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	rm -rf debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) debian/$(WRITER_DBG_ROOT)
   endif
 	dh_strip -s -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
@@ -3253,7 +3253,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"
+  ifeq "$(BUILD_DBGSYM_PACKAGES)" "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 \
@@ -3427,7 +3427,7 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
 		-V'python-six-recommends=$(PYTHON_SIX_RECOMMENDS)' \
 		-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
 endif
-ifeq "$(BUILD_DDEBS)" "y"
+ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 	for i in libreoffice-core libreoffice-writer uno-libs3; do \
 		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, $(PYTHON_SIX_RECOMMENDS)/' \
 		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git

Reply to:

References:
- [libreoffice] branch master updated (2b5d378 -> 7abe0fd)
  - From: Rene Engelhard <rene@moszumanska.debian.org>

Prev by Date: Processed: Re: Bug#824867: lightproof: add support for pt-BR
Next by Date: [libreoffice] 02/02: regen tests/control...
Previous by thread: [libreoffice] branch master updated (2b5d378 -> 7abe0fd)
Next by thread: [libreoffice] 02/02: regen tests/control...
Index(es):
- Date
- Thread