[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-193-gbd0c67c
The following commit has been merged in the debian-experimental-4.0 branch:
commit d148b8c84a187704542ea0dd7945b02a9d3c6c61
Author: Rene Engelhard <rene@debian.org>
Date: Tue Dec 18 01:14:35 2012 +0100
git update; prepare for beta2
diff --git a/changelog b/changelog
index e0d1279..40c5cc1 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:4.0.0~beta1-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~beta2~git20121217-1) UNRELEASED; urgency=low
- * new upstream beta release
+ * new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
this closes: #321099
- now has a basic(!) gnumeric import in experimental mode
@@ -24,6 +24,7 @@ libreoffice (1:4.0.0~beta1-1) UNRELEASED; urgency=low
- python3 is default now; reverse logic (use python3 per default and
and build python2 in a extra step)
- add option to build with --enable-mergelibs, not yet enabled.
+ - remove stlport hacks for i386 - not used/needed anymore upstream
* debian/uno-libs3.symbols: update
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
diff --git a/control b/control
index 1eedac3..dddd299 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, python (>= 2.6.6-3+squeeze4), python3-dev (>= 3.3), python-dev (>= 2.6), debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-j
dk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libmspub-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, liblangtag-dev (>= 0.4) [!armel !armhf], libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.1
0), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, python (>= 2.6.6-3+squeeze4), python3-dev (>= 3.3), python-dev (>= 2.6), debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-j
dk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libmspub-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, liblangtag-dev (>= 0.4) [!armel !armhf], libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2
-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh (>= 2.0b
4), fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), base-files (= 7.1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/patches/make-pyuno-work-with-system-wide-module-install.diff b/patches/make-pyuno-work-with-system-wide-module-install.diff
index c2e8ba3..3317b3c 100644
--- a/patches/make-pyuno-work-with-system-wide-module-install.diff
+++ b/patches/make-pyuno-work-with-system-wide-module-install.diff
@@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o
index 610ac5f..df243d0 100755
--- a/scripting/source/pyprov/officehelper.py
+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
+@@ -44,7 +44,7 @@ def bootstrap():
if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"]
else:
- sOffice = "" # lets hope for the best
+ sOffice = "/usr/lib/libreoffice/program"
sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
+ if platform.startswith("win"):
sOffice += ".exe"
diff --git a/patches/poppler_0_21_x.diff b/patches/poppler_0_21_x.diff
deleted file mode 100644
index e1fe162..0000000
--- a/patches/poppler_0_21_x.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
---- b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -34,7 +34,16 @@
- #pragma warning(push, 1)
- #endif
-
-+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
-+// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
-+// because the internal poppler does not provide poppler-version.h and the macro always returns 0
-+#if POPPLER_CHECK_VERSION(0, 21, 1)
- #include "UTF8.h"
-+#elif POPPLER_CHECK_VERSION(0, 21, 0)
-+#include "UTF.h"
-+#else
-+#include "UTF8.h"
-+#endif
-
- #if defined __SUNPRO_CC
- #pragma enable_warn
diff --git a/patches/series b/patches/series
index f98b090..874b44c 100644
--- a/patches/series
+++ b/patches/series
@@ -26,4 +26,3 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
-we-dont-need-wget.diff
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 7908414..1d2bfa6 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -13,15 +13,15 @@
.END
--- libreoffice-3.5.0/postprocess/packregistry/makefile.mk-old 2011-12-20 04:49:53.000000000 +0100
+++ libreoffice-3.5.0/postprocess/packregistry/makefile.mk 2011-12-20 04:52:13.000000000 +0100
-@@ -41,6 +41,7 @@ MY_XCDS = \
+@@ -32,6 +32,7 @@ MY_XCDS = \
$(MISC)/ctl.xcd \
$(MISC)/ctlseqcheck.xcd \
$(MISC)/draw.xcd \
+ $(MISC)/evoab.xcd \
$(MISC)/graphicfilter.xcd \
$(MISC)/impress.xcd \
- $(MISC)/korea.xcd \
-@@ -334,8 +335,8 @@ ERROR : unknown-GUIBASE
+ $(MISC)/librelogo.xcd \
+@@ -337,8 +338,8 @@ ERROR : unknown-GUIBASE
MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
diff --git a/patches/we-dont-need-wget.diff b/patches/we-dont-need-wget.diff
deleted file mode 100644
index 2343757..0000000
--- a/patches/we-dont-need-wget.diff
+++ /dev/null
@@ -1,36 +0,0 @@
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-New commits:
-commit 3c64d866379c3ae78b95b68fffe62685037da707
-Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Mon Dec 10 19:06:48 2012 +0100
-
- no need for wget/curl when not fetching anything
-
- Change-Id: I097675450a0eed87eccf90356c81657485609d13
-
-diff --git a/configure.ac b/configure.ac
-index caac659..2b12bca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11753,6 +11753,10 @@ AC_SUBST(SCPDEFS)
- #
- WGET=
- MD5SUM=
-+CURL=
-+
-+if test "$enable_fetch_external" != "no"; then
-+
- CURL=`which curl 2>/dev/null`
-
- for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
-@@ -11794,6 +11798,8 @@ if test -z "$MD5SUM"; then
- add_warning "no md5sum: found!"
- fi
-
-+fi
-+
- AC_SUBST(WGET)
- AC_SUBST(CURL)
- AC_SUBST(MD5SUM)
diff --git a/rules b/rules
index 8439114..37abf02 100755
--- a/rules
+++ b/rules
@@ -372,13 +372,6 @@ endef
PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
-# ./configure defaults to STLport on i386 and we should keep it for
-# ABI-compatability
-OOO_STLPORT_ARCHS= i386
-ifeq "$(DEB_HOST_ARCH)" "i386"
- LINK_TO_STLPORT=y
-endif
-
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
@@ -896,12 +889,6 @@ ifneq (,$(filter altlinuxhyph, $(SYSTEM_STUFF)))
endif
CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
-ifneq "$(OOO_STLPORT_ARCHS)" ""
- LIBSTLPORT_MINVER= (>= 4.6.2-3)
- BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
- CONFIGURE_FLAGS += --without-stlport
-endif
-
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
ifeq "$(BOOST_VERSION)" "1.34"
ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
@@ -1486,7 +1473,6 @@ endif
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NSPLUGIN_ARCHS%,$(OOO_NSPLUGIN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_STLPORT_ARCHS%,$(OOO_STLPORT_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
@@ -2328,12 +2314,6 @@ ifeq "$(PACKAGE_SDK)" "y"
rm -f $(PKGDIR)-dev//usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
-ifeq "$(LINK_TO_STLPORT)" "y"
- rm -f debian/ure/$(OOUREDIR)/lib/libstlport*
- ln -s `readlink -f /usr/lib/libstlport_gcc.so` \
- debian/ure/$(OOUREDIR)/lib/libstlport_gcc.so
-endif
-
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
rm -rf $(PKGDIR)-gcj/usr/lib/gcj
@@ -2912,9 +2892,6 @@ ifeq "$(ENABLE_JAVA)" "y"
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
endif
-ifeq "$(LINK_TO_STLPORT)" "y"
- perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/' debian/ure.substvars
-endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_DEP_PACKAGES); do \
if [ "$$p" = "libreoffice$(VER)-presentation-console" ]; then continue; fi; \
--
LibreOffice packaging repository
Reply to: