[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-23-g2b27adc
The following commit has been merged in the debian-experimental-3.5 branch:
commit 2b27adc777eeb6fc8b0b6709701e2ff26e28350c
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 10 23:07:41 2012 +0100
update to beta3
diff --git a/changelog b/changelog
index 2a19bd7..1ae7f78 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
-libreoffice (1:3.5.0~beta2-3) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
+
+ * new upstream beta release
- * debian/patches/conditionalize-qadevOOo-build.diff: build qadevOOo only
- when OOO_JUNIT_JAR is not empty
* debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
* debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
fix armhf build in bridges...
diff --git a/patches/conditionalize-qadevOOo-build.diff b/patches/conditionalize-qadevOOo-build.diff
deleted file mode 100644
index 59412ee..0000000
--- a/patches/conditionalize-qadevOOo-build.diff
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
-index f59b2e0..5f7fa6f 100644
---- a/RepositoryModule_ooo.mk
-+++ b/RepositoryModule_ooo.mk
-@@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
- package \
- padmin \
- psprint_config \
-- qadevOOo \
- regexp \
- reportdesign \
- sane \
-@@ -108,6 +107,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
- xmlscript \
- ))
-
-+ifneq ($(SOLAR_JAVA),)
-+ ifneq "$(OOO_JUNIT_JAR)" ""
-+$(eval $(call gb_Module_add_moduledirs,ooo,\
-+ qadevOOo \
-+))
-+ endif
-+endif
-+
- # these have only migrated subsequentcheck for now
- $(eval $(call gb_Module_add_moduledirs,ooo,\
- configmgr \
-diff --git a/configure.in b/configure.in
-index 0a39ef4..290b294 100644
---- a/configure.in
-+++ b/configure.in
-@@ -9137,6 +9137,9 @@ provide a full junit jar or use --without-junit])
- location (/usr/share/java), specify its pathname via
- --with-junit=..., or disable it via --without-junit])
- fi
-+ if test $OOO_JUNIT_JAR != ""; then
-+ BUILD_TYPE="$BUILD_TYPE QADEVOOO"
-+ fi
- fi
- AC_SUBST(OOO_JUNIT_JAR)
-
-diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
-index fd358fa..f4851c5 100644
---- a/connectivity/prj/build.lst
-+++ b/connectivity/prj/build.lst
-@@ -1,4 +1,4 @@
--cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
-+cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
- cn connectivity usr1 - all cn_mkout NULL
- cn connectivity\inc nmake - all cn_inc NULL
- cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
-diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
-index 45372a7..ce429ec 100644
---- a/dbaccess/prj/build.lst
-+++ b/dbaccess/prj/build.lst
-@@ -1,3 +1,3 @@
--ba dbaccess : TRANSLATIONS:translations BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL
-+ba dbaccess : TRANSLATIONS:translations BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL
- ba dbaccess usr1 - all ba_mkout NULL
- ba dbaccess\prj nmake - all ba_prj NULL
-diff --git a/forms/prj/build.lst b/forms/prj/build.lst
-index 819a57c..131e8e4 100644
---- a/forms/prj/build.lst
-+++ b/forms/prj/build.lst
-@@ -1,4 +1,4 @@
--fm forms : TRANSLATIONS:translations oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL
-+fm forms : TRANSLATIONS:translations oovbaapi svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL
- fm forms usr1 - all fm_mkofrm NULL
- fm forms\prj nmake - all fm_prj NULL
-
-diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
-index 72e90b4..394ac7d 100644
---- a/tail_build/prj/build.lst
-+++ b/tail_build/prj/build.lst
-@@ -1,2 +1,2 @@
--tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
- tb tail_build\prj nmake - all tb_prj NULL
-diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst
-index 75878a6..d7b1a92 100644
---- a/testgraphical/prj/build.lst
-+++ b/testgraphical/prj/build.lst
-@@ -1,4 +1,4 @@
--gfxcmp testgraphical : instsetoo_native qadevOOo NULL
-+gfxcmp testgraphical : instsetoo_native QADEVOOO:qadevOOo NULL
- gfxcmp testgraphical usr1 - all gfxcmp_mkout NULL
- #gfxcmp testgraphical\prechecks nmake - all gfxcmp_pre NULL
- gfxcmp testgraphical\ui\java\ConvwatchGUIProject nmake - all gfxcmp_java_ui NULL
-diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
-index a0ddbff..e8a7b48 100644
---- a/toolkit/prj/build.lst
-+++ b/toolkit/prj/build.lst
-@@ -1,2 +1,2 @@
--ti toolkit : LIBXSLT:libxslt vcl qadevOOo test NULL
-+ti toolkit : LIBXSLT:libxslt vcl QADEVOOO:qadevOOo test NULL
- ti toolkit\prj nmake - all ti_prj NULL
-diff --git a/unotest/prj/build.lst b/unotest/prj/build.lst
-index 1cbe6e3..0a60de3 100644
---- a/unotest/prj/build.lst
-+++ b/unotest/prj/build.lst
-@@ -1,4 +1,4 @@
--unote unotest : BOOST:boost cppu cppuhelper comphelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv unoil qadevOOo NULL
-+unote unotest : BOOST:boost cppu cppuhelper comphelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv unoil QADEVOOO:qadevOOo NULL
- unote unotest\source\cpp nmake - all source_cpp NULL
- unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector NULL
- unote unotest\source\java\org\openoffice\test nmake - all source_java NULL
-
-diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
-index d77da7f..897a85f 100755
---- a/connectivity/qa/connectivity/tools/makefile.mk
-+++ b/connectivity/qa/connectivity/tools/makefile.mk
-@@ -38,6 +38,11 @@ all:
- @echo "Java not available. Build skipped"
- .ELSE
-
-+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
-+all:
-+ @echo "QADEVOO not set. Build skipped"
-+.ELSE
-+
- #----- compile .java files -----------------------------------------
-
- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
-@@ -56,6 +61,8 @@ ALL : ALLTAR
- ALL: ALLDEP
- .ENDIF
-
-+.ENDIF # QADEVOOO option
- .ENDIF # "$(SOLAR_JAVA)" == ""
-
- .INCLUDE : target.mk
-+
-diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
-index 3081a75..76028ad 100755
---- a/connectivity/qa/makefile.mk
-+++ b/connectivity/qa/makefile.mk
-@@ -33,6 +33,10 @@ PACKAGE = complex/connectivity
- # --- Settings -----------------------------------------------------
- .INCLUDE: settings.mk
-
-+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
-+all:
-+ @echo "QADEVOO not set. Build skipped"
-+.ELSE
- #----- compile .java files -----------------------------------------
-
- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-@@ -65,6 +69,7 @@ ALL : ALLTAR
- .ELSE
- ALL: ALLDEP
- .ENDIF
-+.ENDIF # QADEVOOO option
-
- .INCLUDE : target.mk
-
-@@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
-
- run_%: $(CLASSDIR)$/$(JARTARGET)
- +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
-+
diff --git a/patches/fix-unordf_complex-check.diff b/patches/fix-unordf_complex-check.diff
deleted file mode 100644
index 298c274..0000000
--- a/patches/fix-unordf_complex-check.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-From 63e2762c4e5ce55aa0ce88f7eff72f90bf4c465a Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Tue, 20 Dec 2011 17:28:58 +0000
-Subject: unordf: tweak SPARQL unit test:
-
-rasqal 0.9.27 returns no variables for a SPARQL SELECT query with no
-results; it is unclear whether that is allowed but it is a corner case
-and probably we should not be testing for that.
-(cherry picked from commit cb1ad8c8df48161917fdb2044ac55d144049d2f4)
----
-diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
-index 7944a0e..d1006c2 100644
---- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
-+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
-@@ -785,15 +785,30 @@ public class RDFRepositoryTest
- String[] vars = (String[]) i_Result.getBindingNames();
- XEnumeration iter = (XEnumeration) i_Result;
- XNode[][] bindings = toSeqs(iter);
-- if (vars.length != i_Vars.length) {
-- System.out.println("var lengths differ");
-- return false;
-- }
- if (bindings.length != i_Bindings.length) {
- System.out.println("binding lengths differ: " + i_Bindings.length +
- " vs " + bindings.length );
- return false;
- }
-+ if (vars.length != i_Vars.length) {
-+ // ignore for empty result: it is unclear to me whether SPARQL
-+ // spec requires returning the variables in this case,
-+ // and evidently newer rasqal versions don't
-+ if (0 != i_Bindings.length || 0 != vars.length)
-+ {
-+ System.out.println("var lengths differ: expected "
-+ + i_Vars.length + " but got " + vars.length);
-+ return false;
-+ }
-+ } else {
-+ for (int i = 0; i < i_Vars.length; ++i) {
-+ if (!vars[i].equals(i_Vars[i])) {
-+ System.out.println("variable names differ: " +
-+ vars[i] + " != " + i_Vars[i]);
-+ return false;
-+ }
-+ }
-+ }
- java.util.Arrays.sort(bindings, new BindingComp());
- java.util.Arrays.sort(i_Bindings, new BindingComp());
- for (int i = 0; i < i_Bindings.length; ++i) {
-@@ -813,13 +828,6 @@ public class RDFRepositoryTest
- }
- }
- }
-- for (int i = 0; i < i_Vars.length; ++i) {
-- if (!vars[i].equals(i_Vars[i])) {
-- System.out.println("variable names differ: " +
-- vars[i] + " != " + i_Vars[i]);
-- return false;
-- }
-- }
- return true;
- }
-
-@@ -839,6 +847,20 @@ public class RDFRepositoryTest
- return namespaces;
- }
-
-+ // useful when debugging
-+ static void dumpRepo(XDocumentRepository xRep) throws Exception
-+ {
-+ XEnumeration xEnum = xRep.getStatements(null, null, null);
-+ while (xEnum.hasMoreElements())
-+ {
-+ Statement s = (Statement) xEnum.nextElement();
-+ System.out.println("STATEMENT IN: " + toS(s.Graph)
-+ + "\n S: " + toS(s.Subject)
-+ + "\n P: " + toS(s.Predicate)
-+ + "\n O: " + toS(s.Object));
-+ }
-+ }
-+
- class TestRange implements XTextRange, XMetadatable, XServiceInfo
- {
- String m_Stream;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 66be5bf..04b460d 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -179,37 +179,12 @@ diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensi
index 7622047..9978cda 100644
--- libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk
+++ libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk
-@@ -37,10 +37,12 @@ docs:
- @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
-
- distro-pack-install: install
-- $(SRCDIR)/bin/distro-install-clean-up
-- $(SRCDIR)/bin/distro-install-desktop-integration
-- $(SRCDIR)/bin/distro-install-sdk
-- $(SRCDIR)/bin/distro-install-file-lists
-+ if [ ! -d "$(SRCDIR)/file-lists" ]; then \
-+ $(SRCDIR)/bin/distro-install-clean-up; \
-+ $(SRCDIR)/bin/distro-install-desktop-integration; \
-+ $(SRCDIR)/bin/distro-install-sdk; \
-+ $(SRCDIR)/bin/distro-install-file-lists; \
-+ fi
-
- $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
- $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download ./ooo.lst && touch $@,touch $@)
-@@ -75,12 +77,14 @@ distclean: clean
+@@ -83,7 +83,7 @@
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
-install: build
+install:
-+ if [ ! -d "$(DESTDIR)/$(INSTALLDIR)" ]; then \
echo "Installing in $(INSTALLDIR)..." && \
ooinstall "$(INSTALLDIR)" && \
echo "" && \
- echo "Installation finished, you can now execute:" && \
-- echo "$(INSTALLDIR)/program/soffice"
-+ echo "$(INSTALLDIR)/program/soffice"; \
-+ fi
-
- endif
-
diff --git a/patches/libebook-1.2.so.12.diff b/patches/libebook-1.2.so.12.diff
deleted file mode 100644
index b8607fa..0000000
--- a/patches/libebook-1.2.so.12.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
-index 1767ec1..f93d67a 100644
---- libreoffice-3.5.0/connectivity/source/drivers/evoab2/EApi.cxx
-+++ libreoffice-3.5.0/connectivity/source/drivers/evoab2/EApi.cxx
-@@ -35,6 +35,7 @@
- #define DECLARE_FN_POINTERS 1
- #include "EApi.h"
- static const char *eBookLibNames[] = {
-+ "libebook-1.2.so.12", // bumped again
- "libebook-1.2.so.10", // bumped again
- "libebook-1.2.so.9", // evolution-2.8
- "libebook-1.2.so.5", // evolution-2.4 and 2.6+
---
-1.7.5.4
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index b406bf1..038c6d3 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -54,6 +54,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20 22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20 22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
++tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/patches/series b/patches/series
index 56fb724..4a658e8 100644
--- a/patches/series
+++ b/patches/series
@@ -7,7 +7,6 @@ split-binfilters-and-evo.diff
debian-debug.diff
rhino-build-optional.diff
disable-dynamic-list-cpp.diff
-libebook-1.2.so.12.diff
make-gengal-work-again.diff
fix-system-lpsolve-build.diff
install-fixes.diff
@@ -17,16 +16,13 @@ mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
sensible-browser.diff
-fix-unordf_complex-check.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
mysqlcppconn-mysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-set-correct-icon-names-in-desktop-files.diff
fix-ARM-detection-in-set-soenv.diff
-conditionalize-qadevOOo-build.diff
add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
diff --git a/patches/set-correct-icon-names-in-desktop-files.diff b/patches/set-correct-icon-names-in-desktop-files.diff
deleted file mode 100644
index 96bccd0..0000000
--- a/patches/set-correct-icon-names-in-desktop-files.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From c3569696294bb264a0c645db12f027d44b4e033f Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek@suse.cz>
-Date: Tue, 20 Dec 2011 18:39:57 +0000
-Subject: set correct icon names in desktop files
-
-also use icon names *3.5* instead of *35*; this version is used on another
-locations as well; it allows to reuse the UNIXBASISROOTNAME variable that
-is substituted by the installer
----
-diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
-index cc790f8..398241d 100755
---- a/sysui/desktop/productversion.mk
-+++ b/sysui/desktop/productversion.mk
-@@ -63,18 +63,18 @@ PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
- PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT)
- PKGVERSION.libreoffice = $(PKGVERSION)
- UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSION.libreoffice)
--ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
-+ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice)
-
- PRODUCTNAME.lodev = LibreOfficeDev
- PRODUCTVERSION.lodev = $(PRODUCTVERSION)
- PRODUCTVERSIONSHORT.lodev = $(PRODUCTVERSIONSHORT)
- PKGVERSION.lodev = $(PKGVERSION)
- UNIXFILENAME.lodev = lodev$(PRODUCTVERSION.lodev)
--ICONPREFIX.lodev = $(UNIXFILENAME.lodev:s/.//g)
-+ICONPREFIX.lodev = $(UNIXFILENAME.lodev)
-
- PRODUCTNAME.oxygenoffice = OxygenOffice
- PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION)
- PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT)
- PKGVERSION.oxygenoffice = $(PKGVERSION)
- UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l)$(PRODUCTVERSION.oxygenoffice)
--ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice:s/.//g)
-+ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice)
-diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
-index 88954ae..f6a34b1 100755
---- a/sysui/desktop/share/makefile.mk
-+++ b/sysui/desktop/share/makefile.mk
-@@ -150,7 +150,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
- @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
- @echo Creating desktop entries for $(@:f) ..
- @echo ---------------------------------
-- @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(@:db).$(INPATH).$(@:f)
-+ @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
- @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
---
-cgit v0.9.0.2-2-gbebe
diff --git a/rules b/rules
index 7de406b..fa89077 100755
--- a/rules
+++ b/rules
@@ -63,9 +63,9 @@ export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.4.99.1 libreoffice-3.4.99.1
-GIT_TAG=libreoffice-3.4.99.2
-GIT_BRANCH=tag-libreoffice-3.4.99.2
+# use ./g checkout -b tag-libreoffice-3.4.99.3 libreoffice-3.4.99.3
+GIT_TAG=libreoffice-3.4.99.3
+GIT_BRANCH=tag-libreoffice-3.4.99.3
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
@@ -230,7 +230,9 @@ ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
+#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
+#endif
ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
--
LibreOffice packaging repository
Reply to: