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 6aee14739f62ade28a5a7901c0481cb4e2843732
Author: Rene Engelhard <r...@debian.org>
Date: Mon Dec 21 08:43:35 2015 +0100
enable ddebs and make -subsequentcheck depend on them, not -dbg
---
changelog | 9 ++++++
control | 67 +++----------------------------------------
rules | 31 +++++++++++++-------
tests/control | 2 +-
tests/{control => control.in} | 2 +-
5 files changed, 35 insertions(+), 76 deletions(-)
diff --git a/changelog b/changelog
index ab6085b..8a99417 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:5.1.0~rc1-2) experimental; urgency=medium
+
+ * debian/rules:
+ - fix/update some ddeb conditionals and migrate -dbg to -dbgsym
+ * debian/tests/control{,in}: generate from control.in with proper
+ depends (-dbg or *-dbgsym) in rules' control target
+
+ -- Rene Engelhard <r...@debian.org> Sun, 20 Dec 2015 11:05:15 +0100
+
libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
* New upstream release candidate
diff --git a/control b/control
index 6398e33..a8fe63d 100644
--- a/control
+++ b/control
@@ -13,12 +13,12 @@ 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 (>= 7.2.3~),
+ debhelper (>= 9.20151219),
default-jdk (>= 1:1.7-48) [ia64],
default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
default-jdk [!mips64],
dh-python,
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.18.2~),
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !mips64
!powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
flex (>= 2.3.35),
@@ -4203,65 +4203,6 @@ Description: OpenSymbol TrueType font
LibreOffice. This font contains symbols (like fonts as Wingdings(tm)),
bullets (needed for bullets in LibreOffice) and non-latin character
-Package: libreoffice-dbg
-Section: debug
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390
s390x sparc sparc64
-Priority: extra
-Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (=
${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde
(= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) |
libreoffice-base-core (= ${binary:Version}) | libreoffice-base (=
${binary:Version}) | libreoffice-impress (= ${binary:Version}) |
libreoffice-draw (= ${binary:Version}) | libreoffice-writer (=
${binary:Version}) | python3-uno (= ${binary:Version}) | libreoffice-ogltrans
(= ${bi [...]
- ${misc:Depends}
-Recommends: ure-dbg
-Suggests: python-six, ${dbg-dbg-suggests}
-Pre-Depends: dpkg (>= 1.15.6)
-Description: office productivity suite -- debug symbols
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the debug symbols of all LibreOffice and
- LibreOffice SDK components.
-
-Package: uno-libs3-dbg
-Section: debug
-Priority: extra
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390
s390x sparc sparc64
-Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
-Replaces: ure-dbg (<< 4.0.3-2)
-Suggests: python-six
-Description: LibreOffice UNO runtime environment -- public shared library
debug symbols
- The Uno Runtime Environment (URE) is the well-known UNO component model
- of LibreOffice, packaged up as an individual product.
- .
- It offers you a flexible, low-overhead component model that is most ideal
- for (but not limited to) combining in one application components written in
- different computer languages, and developed by different parties. You can use
- it to create any kind of application, in whatever application domain you can
- imagine.
- .
- This package contains the (detached) debug symbols for the public libraries:
- - libuno_sal: System Abstraction Layer (C Interface)
- - libuno_salhelpergcc3: additional C++ functionality for sal
- - libuno_cppu: C++ UNO bridge (C Interface)
- - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
- - libuno_purpenvhelpergcc3: "purpose environments" helper
-
-Package: ure-dbg
-Section: debug
-Priority: extra
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390
s390x sparc sparc64
-Depends: uno-libs3-dbg (= ${ure:Version}),
- ure (= ${ure:Version}),
- ${misc:Depends}
-Description: LibreOffice UNO runtime environment -- debug symbols
- The Uno Runtime Environment (URE) is the well-known UNO component model
- of LibreOffice, packaged up as an individual product.
- .
- It offers you a flexible, low-overhead component model that is most ideal
- for (but not limited to) combining in one application components written in
- different computer languages, and developed by different parties. You can use
- it to create any kind of application, in whatever application domain you can
- imagine.
- .
- This package contains the (detached) debug symbols for the URE.
-
Package: libreoffice-dev
Section: devel
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390
s390x sparc sparc64
@@ -4431,12 +4372,12 @@ Depends: ant (>= 1.7.0),
bzip2,
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 7.2.3~),
+ debhelper (>= 9.20151219),
default-jdk,
default-jdk (>= 2:1.7-52.1),
dh-python,
doxygen (>= 1.8.4),
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.18.2~),
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2),
flex (>= 2.3.35),
diff --git a/rules b/rules
index 5124083..722fdc6 100755
--- a/rules
+++ b/rules
@@ -195,19 +195,17 @@ BUILD_KDE=y
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
-BUILD_DBG_PACKAGE=y
+BUILD_DBG_PACKAGE=n
ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
-BUILD_DDEBS=n
+BUILD_DDEBS=y
ifeq "$(BUILD_DDEBS)" "y"
-DH_BUILD_DDEBS=1
-export DH_BUILD_DDEBS
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
-DH_STRIP_DBG_OPTION_LO=--dbg-package=libreoffice-dbg
-DH_STRIP_DBG_OPTION_URE=--dbg-package=ure-dbg
-DH_STRIP_DBG_OPTION_UNO_LIBS=--dbg-package=uno-libs3-dbg
+DH_STRIP_DBG_OPTION_LO=--no-ddebs --dbg-package=libreoffice-dbg
+DH_STRIP_DBG_OPTION_URE=--no-ddebs --dbg-package=ure-dbg
+DH_STRIP_DBG_OPTION_UNO_LIBS=--no-ddebs --dbg-package=uno-libs3-dbg
endif
endif
ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
@@ -215,10 +213,19 @@ $(error only either DDEBS or -dbg allowed)
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
+ ifeq "$(BUILD_DDEBS)" "y"
+ TEST_DBG_DEPENDS := $(shell dh_listpackages -a | grep -v "^libreoffice$$" |
sed -e s/$$/-dbgsym/g | xargs | sed -e "s/ /, /g")
+ else
+ ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ TEST_DBG_DEPENDS := libreoffice-dbg
+ else
+ TEST_DBG_DEPENDS :=
+ endif
+ endif
endif
ifeq "$(BUILD_TEST_PACKAGE)" "y"
- BUILD_DBG_PACKAGE=y
- BUILD_DDEBS=n
+ BUILD_DBG_PACKAGE=n
+ BUILD_DDEBS=y
endif
ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo
true)" "true"
ENABLE_SYMBOLS=y
@@ -871,8 +878,8 @@ else
BUILD_DEPS += , python
endif
-ifeq "$(DH_BUILD_DDEBS)" "1"
- BUILD_DEPS += , debhelper (>= 9.20150628)
+ifeq "$(BUILD_DDEBS)" "y"
+ BUILD_DEPS += , debhelper (>= 9.20151219)
# from debhelper changelog
BUILD_DEPS += , dpkg-dev (>= 1.18.2~)
else
@@ -1780,6 +1787,8 @@ endif
perl -pi -e
"s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ sed -e "s/@TEST_DBG_DEPENDS@/$(TEST_DBG_DEPENDS)/" \
+ < debian/tests/control.in > debian/tests/control
# we want the build deps as dep on subsequentcheckbase, but strip the
arch
# specifics as we are arch-all
# for now we filter out the arch-specific libc* and ia64, which is ugly,
diff --git a/tests/control b/tests/control
index 973adbc..47f69cf 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice-subsequentcheckbase, gdb, libreoffice-dbg
+Depends: libreoffice-subsequentcheckbase, gdb, libreoffice-core-dbgsym,
libreoffice-writer-dbgsym, libreoffice-calc-dbgsym, libreoffice-impress-dbgsym,
libreoffice-draw-dbgsym, libreoffice-math-dbgsym, libreoffice-base-core-dbgsym,
libreoffice-base-dbgsym, libreoffice-gtk-dbgsym, libreoffice-gnome-dbgsym,
python3-uno-dbgsym, libreoffice-officebean-dbgsym,
libreoffice-pdfimport-dbgsym, libreoffice-avmedia-backend-gstreamer-dbgsym,
libreoffice-avmedia-backend-vlc-dbgsym, libreoffice-sdbc-f [...]
Tests: pyuno-import
Depends: python3-uno
diff --git a/tests/control b/tests/control.in
similarity index 51%
copy from tests/control
copy to tests/control.in
index 973adbc..4994e07 100644
--- a/tests/control
+++ b/tests/control.in
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice-subsequentcheckbase, gdb, libreoffice-dbg
+Depends: libreoffice-subsequentcheckbase, gdb, @TEST_DBG_DEPENDS@
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
