[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
Rene Engelhard
rene at moszumanska.debian.org
Mon Aug 7 05:33:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit 11d6f00ced358351c00600182bd9a4814ae7d849
Merge: 2bcc9f1 839a8f3
Author: Rene Engelhard <rene at debian.org>
Date: Mon Aug 7 07:32:44 2017 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
changelog | 14 +++++
control | 102 +++++--------------------------
control.gtk2.in | 1 -
control.in | 79 +-----------------------
control.subsequentcheckbase.in | 2 +-
control.transitionals.in | 4 +-
rules | 135 +++++++++++++++++++----------------------
7 files changed, 99 insertions(+), 238 deletions(-)
diff --cc changelog
index 78b838d,12c4386..67052d4
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,17 +1,30 @@@
+libreoffice (1:6.0.0~alpha0~git20170806-1) UNRELEASED; urgency=medium
+
+ [ Rene Engelhard ]
+ * New upstream snapshot
+
+ * merge from Ubuntu, thanks Rico Tzschichholz:
+ - Add "elementary" style package
+
+ [ Rico Tzschichholz ]
+ * Add Kannada (kn) langpack
+
+ -- Rene Engelhard <rene at debian.org> Thu, 18 May 2017 12:54:08 +0200
+
+ libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - install appstream stuff into /usr/share/metainfo. sigh.
+ - make -writer-dbgsym recommend -core-dbgsym as it wants some gdb stuff
+ from it
+ - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
+ and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above)
+ - generate and install apparmor profiles
+ * debian/control*in:
+ - move to policy 4.0.1; extra -> optional
+
+ -- Rene Engelhard <rene at debian.org> Sat, 05 Aug 2017 14:15:19 +0000
+
libreoffice (1:5.4.0-1) unstable; urgency=medium
* New upstream release
diff --cc control
index 280a0b6,9e3e555..47f1f3c
--- a/control
+++ b/control
@@@ -29,9 -30,10 +30,9 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
fonts-liberation [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
- g++-7 (>= 7-20170106) [m68k],
- gcc-7 (>= 7-20170106) [m68k],
+ g++ (>= 4:7) [m68k],
+ gcc (>= 4:7) [m68k],
gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
- gettext,
ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
gobject-introspection (>= 1.32.0),
gperf,
@@@ -182,21 -180,11 +182,11 @@@ Build-Conflicts: amd-libopencl1
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcj-4.2 (= 4.2.2-6),
- gjdoc (= 0.7.8-2),
- libboost1.39-dev (<< 1.39.0-2),
- libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
- libc6-dev (= 2.6.1-3) [i386 amd64],
- libc6-dev (= 2.6.1-4) [i386 amd64],
- libcairo2 (= 1.4.8-1),
- libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
- nvidia-libopencl1,
- qt3-dev-tools
- Standards-Version: 4.0.0
+ nvidia-libopencl1
+ Standards-Version: 4.0.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
diff --cc control.in
index 13631a2,b3f2f66..8cab7ed
--- a/control.in
+++ b/control.in
@@@ -5,25 -5,15 +5,15 @@@ Maintainer: Debian LibreOffice Maintain
Uploaders: Rene Engelhard <rene at debian.org>, Chris Halls <halls at debian.org>
Build-Depends: %BUILD_DEPS%,
Build-Depends-Indep: %BUILD_DEPS_INDEP%
- Build-Conflicts: flex (= 2.5.34-1) [amd64],
- g++-4.6 (= 4.6.1-10),
+ Build-Conflicts: g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcj-4.2 (= 4.2.2-6),
- gjdoc (= 0.7.8-2),
- libboost1.39-dev (<< 1.39.0-2),
- libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
- libc6-dev (= 2.6.1-3) [i386 amd64],
- libc6-dev (= 2.6.1-4) [i386 amd64],
- libcairo2 (= 1.4.8-1),
- libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
- qt3-dev-tools,
amd-libopencl1,
nvidia-libopencl1
- Standards-Version: 4.0.0
+ Standards-Version: 4.0.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
diff --cc rules
index 9ba0725,e8738ce..0c93855
--- a/rules
+++ b/rules
@@@ -1541,8 -1517,10 +1518,8 @@@ els
CONFIGURE_FLAGS += --disable-gio
endif
- BUILD_DEPS += , gettext
-
ifeq "$(ENABLE_DCONF)" "y"
- BUILD_DEPS += , libdconf-dev
+ BUILD_DEPS += , libdconf-dev (>= 0.15.2)
else
CONFIGURE_FLAGS += --disable-dconf
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list