[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] 13 commits: cleanup: remove PACKAGE_TTF_OPENSYMBOL conditional, we *do* need to package it…
Rene Engelhard
rene at debian.org
Mon Jan 8 22:24:53 UTC 2018
Rene Engelhard pushed to branch debian-experimental-6.1 at Debian LibreOffice Maintainers / libreoffice / libreoffice
Commits:
65552d1f by Rene Engelhard at 2017-12-28T13:49:10+01:00
cleanup: remove PACKAGE_TTF_OPENSYMBOL conditional, we *do* need to package it everytime anyways and it's maintained in here
- - - - -
c6f4f992 by Rene Engelhard at 2017-12-28T16:14:12+01:00
Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0
- - - - -
3ecb3447 by Rene Engelhard at 2017-12-28T21:47:22+01:00
Revert "disable gbuildtojson and its tests". Fixed.
This reverts commit 6232566a8a5393b63f61aa38f922f5a20658dee3.
- - - - -
743c8e48 by Rene Engelhard at 2017-12-28T22:34:16+01:00
remove obsolete fastjar build-dep
solenv calls just "jar", which is /usr/bin/jar, which is an alternative,
and the openjdk alternatives have much higher prio
- - - - -
2da628f2 by Rene Engelhard at 2018-01-06T13:44:04+01:00
update Vcs-* to salsa
- - - - -
f82cb614 by Rene Engelhard at 2018-01-08T19:09:00+01:00
git update; disable some more tests...
- - - - -
941b8cc6 by Rene Engelhard at 2018-01-08T22:51:33+01:00
backport patch from master to fix build with poppler 0.62
- - - - -
0cc3ea2f by Rene Engelhard at 2018-01-08T23:01:39+01:00
one more anonscm -> salsa
- - - - -
e23c21ba by Rene Engelhard at 2018-01-08T23:01:39+01:00
regen control for fastjar B-D: removal...
- - - - -
6a30467b by Rene Engelhard at 2018-01-08T23:02:25+01:00
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
- - - - -
2a69de4e by Rene Engelhard at 2018-01-08T23:07:57+01:00
make poppler-0.62.diff apply for 6.0...
- - - - -
e173c02b by Rene Engelhard at 2018-01-08T23:20:55+01:00
close #658569
- - - - -
55857ddf by Rene Engelhard at 2018-01-08T23:24:10+01:00
Merge remote-tracking branch 'origin/debian-experimental-6.0' into debian-experimental-6.1
- - - - -
7 changed files:
- README
- changelog
- control
- control.in
- patches/disable-flaky-tests.diff
- patches/disable-tests-somehow-needing-more-fonts.diff
- rules
Changes:
=====================================
README
=====================================
--- a/README
+++ b/README
@@ -6,7 +6,6 @@ Building the packages from source
Overview:
apt-get source libreoffice
apt-get build-dep libreoffice (to install build dependencies)
- [ somehow broken yet, probably because of the various |'s ]
cd <source directory>
debuild
@@ -74,7 +73,7 @@ Building the package from git master
To do a build from git master, do:
mkdir libreoffice-git
cd libreoffice-git
- git clone git://anonscm.debian.org/pkg-openoffice/libreoffice.git debian
+ git clone https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git debian
./debian/rules unpack GIT_BRANCH=master GIT_TAG=master SOURCE_TARBALLS=n
dpkg-buildpackage
=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
-libreoffice (1:6.1.0~alpha1~git20171228-1) UNRELEASED; urgency=medium
+libreoffice (1:6.1.0~alpha1~git20180108-1) UNRELEASED; urgency=medium
* New upstream snapshot
+ - fixes cross-file links with xlsx files (closes: #658569)
* debian/patches/no-packagekit-per-default.diff: use the new config options
to disable the packagekit install stuff
@@ -13,12 +14,17 @@ libreoffice (1:6.1.0~alpha1~git20171228-1) UNRELEASED; urgency=medium
-- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 20:59:01 +0100
-libreoffice (1:6.0.0~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc2~git20180108-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/patches/poppler-0.62.diff: backport from master to fix build with
+ poppler 0.62
* debian/rules:
- rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
- -- Rene Engelhard <rene at debian.org> Tue, 12 Dec 2017 19:10:51 +0100
+ -- Rene Engelhard <rene at debian.org> Mon, 08 Jan 2018 22:44:59 +0100
libreoffice (1:6.0.0~rc1-1) experimental; urgency=medium
=====================================
control
=====================================
--- a/control
+++ b/control
@@ -24,7 +24,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
dh-python,
dpkg-dev (>= 1.18.2~),
dwz,
- fastjar,
firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
flex (>= 2.3.35),
@@ -189,8 +188,8 @@ Build-Conflicts: amd-libopencl1,
nvidia-glx-legacy-dev,
nvidia-libopencl1
Standards-Version: 4.0.1
-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
+Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-6.1
+Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
=====================================
control.in
=====================================
--- a/control.in
+++ b/control.in
@@ -13,8 +13,8 @@ Build-Conflicts: g++-4.6 (= 4.6.1-10),
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 4.0.1
-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
+Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-6.1
+Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
=====================================
patches/disable-flaky-tests.diff
=====================================
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -68,6 +68,8 @@ index dbfc3e1..d235c5d 100644
now
12:22 < chris_wot> I'll ping the ML
+This seems fixed when opening the original doc.
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 54eed4d..78019bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -189,3 +191,24 @@ index 3273055d5373..cb452139170c 100644
ifeq ($(ENABLE_CHART_TESTS),TRUE)
ifeq ($(WITH_FONTS), TRUE)
+diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+index 4d65beeb90c4..f3d71501c41a 100644
+--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
++++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
+ }
+
+
+-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
++/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
+ {
+ // the position of the flying text frame should be off page
+ // 30624 below its anchor
+ OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
+ CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
+
+-}
++}*/
+ // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
+
+ CPPUNIT_PLUGIN_IMPLEMENT();
=====================================
patches/disable-tests-somehow-needing-more-fonts.diff
=====================================
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -61,3 +61,43 @@ index d7f548dcb4de..5bd6e6a6c5e9 100644
// check content of the first page
{
+diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
+index 0398e15e6ebe..cbfc0955842a 100644
+--- a/sw/qa/extras/uiwriter/uiwriter.cxx
++++ b/sw/qa/extras/uiwriter/uiwriter.cxx
+@@ -287,7 +287,7 @@ public:
+ void testTdf99689TableOfFigures();
+ void testTdf99689TableOfTables();
+ void testTdf113790();
+- void testTdf114306();
++// void testTdf114306();
+
+ CPPUNIT_TEST_SUITE(SwUiWriterTest);
+ CPPUNIT_TEST(testReplaceForward);
+@@ -456,7 +456,7 @@ public:
+ CPPUNIT_TEST(testTdf99689TableOfFigures);
+ CPPUNIT_TEST(testTdf99689TableOfTables);
+ CPPUNIT_TEST(testTdf113790);
+- CPPUNIT_TEST(testTdf114306);
++// CPPUNIT_TEST(testTdf114306);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
+@@ -5242,7 +5242,7 @@ void SwUiWriterTest::testTdf112025()
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
+ }
+
+-void SwUiWriterTest::testTdf114306()
++/*void SwUiWriterTest::testTdf114306()
+ {
+ load(DATA_DIRECTORY, "fdo114306.odt");
+ xmlDocPtr pXmlDoc = parseLayoutDump();
+@@ -5253,7 +5253,7 @@ void SwUiWriterTest::testTdf114306()
+ // page 1 and 1 paragraph on page 2.
+ assertXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt", 2);
+ assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt", 1);
+-}
++}*/
+
+ void SwUiWriterTest::testTdf108524()
+ {
=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -91,7 +91,6 @@ BUILD_DEPS=\
bc,\
bison,\
bzip2,\
- fastjar,\
flex (>= 2.3.35), \
gperf,\
libc0.1 (>= 2.10.2-7) [kfreebsd-any],\
@@ -140,7 +139,6 @@ else
PYTHON=python$(PYTHON_VERSION)
export PYTHON=python$(PYTHON_VERSION)
endif
-PACKAGE_TTF_OPENSYMBOL=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
@@ -1811,9 +1809,7 @@ ifeq "$(ENABLE_JAVA)" "y"
cat debian/control.nlpsolver.in >> debian/control
endif
endif
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
cat debian/control.fonts.in >> debian/control
-endif
ifeq "$(PACKAGE_SDK)" "y"
cat debian/control.sdk.in >> debian/control
endif
@@ -3024,7 +3020,6 @@ endif
perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OODIR)/program/unopkg
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
mkdir -p debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
@@ -3037,10 +3032,6 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30-opensymbol.conf
cd debian/fonts-opensymbol/etc/fonts/conf.d/ && \
ln -s /usr/share/fontconfig/conf.avail/30-opensymbol.conf
-else
- rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
- rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
-endif
# remove extra license files
rm -rf $(PKGDIR)-common/$(OODIR)/licenses
@@ -3647,10 +3638,8 @@ endif
-V'pyuno-depends=$(PYUNO_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-v$(BINARY_VERSION)
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
dh_gencontrol -pfonts-opensymbol -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell debian/scripts/get_ttf_version.pl debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -plibreoffice-wiki-publisher -- \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/e7870f5a8a249f4e3588052e654c4b815ed59fb8...55857ddfe408243403f59c6f0c192eb9d743e79f
---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/e7870f5a8a249f4e3588052e654c4b815ed59fb8...55857ddfe408243403f59c6f0c192eb9d743e79f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180108/8e3ba127/attachment-0001.html>
More information about the Pkg-openoffice-commits
mailing list