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 fd2a2dd303d50d401c35a7c2e54226d1c29b84e0
Author: Rene Engelhard <r...@debian.org>
Date: Wed Sep 23 14:45:57 2015 +0200
prepare for DDEBS
---
changelog | 4 +++-
rules | 48 ++++++++++++++++++++++++++++++++++++++----------
2 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/changelog b/changelog
index 0581ffc..7b241da 100644
--- a/changelog
+++ b/changelog
@@ -21,8 +21,10 @@ libreoffice (1:5.1.0~alpha1~git20150922-1) UNRELEASED;
urgency=medium
- gtk3 is on per default now (closes: #799399, #681180)
- build only en-US for now
- disable the tests for now
+ * debian/rules: prepare for .ddebs: disable manual -dbg build if building
+ ddebs; use dh_strip --ddeb-migration to create .ddebs
- -- Rene Engelhard <r...@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 23 Sep 2015 14:41:59 +0200
libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
diff --git a/rules b/rules
index 44e4e51..fbf9393 100755
--- a/rules
+++ b/rules
@@ -90,7 +90,6 @@ BUILD_DEPS=\
bc,\
bison,\
bzip2,\
- dpkg-dev (>= 1.16.1),\
fastjar,\
flex (>= 2.3.35), \
gperf,\
@@ -198,13 +197,31 @@ BUILD_KDE=y
QT_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
+ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
+BUILD_DDEBS=n
+ 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
+ endif
+endif
+ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
+$(error only either DDEBS or -dbg allowed)
+endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
endif
ifeq "$(BUILD_TEST_PACKAGE)" "y"
BUILD_DBG_PACKAGE=y
+ BUILD_DDEBS=n
endif
-ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo
true)" "true"
ENABLE_SYMBOLS=y
SMALL_SYMBOLS=y
endif
@@ -693,6 +710,8 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk
'{ print $$2 }')" "j
BUGS=mailto:debian-backpo...@lists.debian.org
SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds
glm libwps libetonyek orcus libgltf,$(SYSTEM_STUFF))
JESSIE_BACKPORT=y
+ BUILD_DBG_PACKAGE=y
+ BUILD_DDEBS=n
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
BUGS=mailto:debian-openoffice@lists.debian.org
@@ -821,7 +840,7 @@ ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
endif
OPENCL_SUGGESTS := ocl-icd-libopencl1
-ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo
true)" "true"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
else
@@ -829,7 +848,9 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
SMALL_SYMBOLS = n
endif
endif
+ ifeq "$(BUILD_DBG_PACKAGE)" "y"
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!alpha
!ia64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg,
libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg,
libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg,
libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2) [...]
+ endif
endif
export DPKG_EXPORT_BUILDFLAGS=y
@@ -864,7 +885,14 @@ else
BUILD_DEPS += , python
endif
+ifeq "$(DH_BUILD_DDEBS)" "1"
+ BUILD_DEPS += , debhelper (>= 9.20150628)
+ # from debhelper changelog
+ BUILD_DEPS += , dpkg-dev (>= 1.18.2~)
+else
BUILD_DEPS += , debhelper (>= 7.2.3~)
+ BUILD_DEPS += , dpkg-dev (>= 1.16.1)
+endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
@@ -3167,14 +3195,14 @@ endif
dh_lintian -s
dh_bugfiles -s -A
dh_link -s -X.desktop
-ifeq "$(BUILD_DBG_PACKAGE)" "y"
- dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice-dbg
- dh_strip -pure --dbg-package=ure-dbg
- dh_strip -puno-libs3 --dbg-package=uno-libs3-dbg
+ifeq "$(shell echo $(BUILD_DDEBS)$(BUILD_DBG_PACKAGE) | grep -q y && echo
true)" "true"
+ dh_strip -s -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
+ dh_strip -pure $(DH_STRIP_DBG_OPTION_URE)
+ dh_strip -puno-libs3 $(DH_STRIP_DBG_OPTION_UNO_LIBS)
# dh_strip --dbg-package= is not idempotent, force copying of the
binaries
# again...
- rm -f $(STAMP_DIR)/install-arch
-ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ rm -f $(STAMP_DIR)/install-common
+ 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)
@@ -3195,7 +3223,7 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
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
+ endif
else
dh_strip -s
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
