[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit abd8d89edc89d09b2b91bff8b954a5efdf6ef935
Merge: 8d6f72c 51b7442
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 13 22:46:15 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
rules
changelog | 7 +++++++
rules | 38 +++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 19 deletions(-)
diff --cc changelog
index b9b395a,4e62aa0..4f6b1f8
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,24 +1,20 @@@
-libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium
-
- * New upstream release candidate
- - only initializes the OpenGL context if we need it (closes: #819153)
-
- * debian/control.in:
- - move ttf-liberation-fonts recommends to -common (closes: #747132)
- - move libpaper-utils recommends to -core
++libreoffice (1:5.2.0~rc2-1) UNRELEASED; urgency=medium
+
+ * debian/rules:
- - use dh_* -a instead of deprecated -s
++ - use (more) dh_* -a instead of deprecated -s
+
+ -- Rene Engelhard <rene@debian.org> Wed, 13 Jul 2016 14:40:59 +0200
+
-libreoffice (1:5.1.4~rc2-2) unstable; urgency=medium
+libreoffice (1:5.2.0~rc2-1) experimental; urgency=medium
- * rebuild with clean debian/.. (closes: #827513)
+ * new upstream release candidate
+
+ * debian/rules:
+ - use dh_listpackages -a instead of deprecated -s
- -- Rene Engelhard <rene@debian.org> Fri, 17 Jun 2016 11:50:22 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 07 Jul 2016 08:18:31 +0200
-libreoffice (1:5.1.4~rc2-1) unstable; urgency=medium
+libreoffice (1:5.2.0~rc1-1) experimental; urgency=medium
* new upstream release candidate
- scales gtk3 smooth scaling events... (closes: #826654)
diff --cc rules
index 0b4a4ef,6461d5e..e2eb5e9
--- a/rules
+++ b/rules
@@@ -3283,13 -3273,13 +3283,13 @@@ ifeq "$(shell echo $(BUILD_DBGSYM_PACKA
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
+ dh_strip -a
endif
- dh_fixperms -s
- dh_icons -s
- dh_compress -s -X.py -X.mk -X.sxd
+ dh_fixperms -a
+ dh_icons -a
+ dh_compress -a -X.py -X.mk -X.sxd
ifeq "$(ENABLE_INTROSPECTION)" "y"
- dh_girepository -s debian/liblibreofficekitgtk/$(OODIR)/program
- dh_girepository -a $(PKGDIR)-gtk3/$(OODIR)/program
++ dh_girepository -a debian/liblibreofficekitgtk/$(OODIR)/program
endif
dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~), ure" -- -c0 -d -V -v`echo $(BINARY_VERSION) | cut -d: -f2`
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -d -V -v`echo $(BINARY_VERSION) | cut -d: -f2`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: