[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-118-g75990ad
The following commit has been merged in the debian-experimental-3.7 branch:
commit 75990ad417c1a8e683651953baa5e4e3d81adbbc
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 13 08:05:20 2012 +0100
git update; update for 3.7->4.0 change; reenable mozilla plugin
diff --git a/changelog b/changelog
index ef5f84a..6104ff2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121109-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha0~git20121112-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -18,6 +18,7 @@ libreoffice (1:3.7.0~alpha0~git20121109-1) UNRELEASED; urgency=low
- use gstreamer1.0
- temporarily disable python3-uno as the new python-based wizards
(in comon!) don't work with it...
+ - reenable mozilla plugin
* 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 722abea..ad8a478 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, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default
-jdk, 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), 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.3), 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~), l
ibebook1.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, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default
-jdk, 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.3), 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-d
ev (>= 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), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -568,6 +568,29 @@ Description: LibreOffice UNO runtime environment -- debug symbols
.
This package contains the (detached) debug symbols for the URE.
+Package: mozilla-libreoffice
+Section: net
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Enhances: iceape-browser,
+ iceweasel,
+ mozilla-browser,
+ firefox,
+ libreoffice,
+ libreoffice-core
+Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta~), ${misc:Depends}
+Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins, libreoffice-writer, libreoffice-calc, libreoffice-draw, libreoffice-impress, libreoffice-math, libreoffice-base
+Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
+Xb-Npp-Name: LibreOffice Plug-in
+Xb-Npp-MimeType: application/vnd.stardivision.calc, application/vnd.stardivision.chart, application/vnd.stardivision.draw, application/vnd.stardivision.impress, application/vnd.stardivision.impress-packed, application/vnd.stardivision.math, application/vnd.stardivision.writer, application/vnd.stardivision.writer-global, application/vnd.staroffice.writer, application/vnd.sun.xml.calc, application/vnd.sun.xml.calc.template, application/vnd.sun.xml.draw, application/vnd.sun.xml.draw.template, application/vnd.sun.xml.impress, application/vnd.sun.xml.impress.template, application/vnd.sun.xml.math, application/vnd.sun.xml.writer, application/vnd.sun.xml.writer.global, application/vnd.sun.xml.writer.template, application/vnd.oasis.opendocument.text, application/vnd.oasis.opendocument.text-template, application/vnd.oasis.opendocument.text-master, application/vnd.oasis.opendocument.text-web, application/vnd.oasis.opendocument.spreadsheet, application/vnd.oasis.opendocument.spreadshee
t-template, application/vnd.oasis.opendocument.graphics, application/vnd.oasis.opendocument.graphics-template, application/vnd.oasis.opendocument.presentation, application/vnd.oasis.opendocument.presentation-template, application/vnd.oasis.opendocument.formula
+Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
+Replaces: mozilla-openoffice.org
+Description: office productivity suite -- Mozilla plugin
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a Mozilla/Netscape compatible plugin which can handle
+ all OOo documents.
+
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 30cf6f5..36c3e1b 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -145,14 +145,14 @@ index 024ec68..a46e972 100644
gid_File_Lib_Vclplug_Svp,
gid_File_Lib_Basctl,
gid_File_Lib_CanvasTools,
-@@ -354,7 +354,6 @@
+@@ -337,7 +327,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Evtatt,
gid_File_Lib_Fileacc,
gid_File_Lib_Filterconfig1,
- gid_File_Lib_Dbodbcbase,
gid_File_Lib_I18npool,
- gid_File_Lib_I18nregexp,
gid_File_Lib_I18nsearch,
+ gid_File_Lib_I18nisolang,
@@ -385,7 +374,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_DeploymentGui,
gid_File_Lib_Expwrap_Uno,
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index 0dbce5b..ff81bb5 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -1,13 +1,13 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -125,6 +125,7 @@ padmin\
+@@ -140,6 +140,7 @@ padmin\
postgresql\
psprint_config\
pyuno\
+py3uno\
qadevOOo\
readlicense_oo\
- regexp\
+ registry\
diff --git a/Repository.mk b/Repository.mk
index 3609d09..c0b11c2 100644
--- a/Repository.mk
diff --git a/rules b/rules
index 918cf68..c6de26e 100755
--- a/rules
+++ b/rules
@@ -21,9 +21,9 @@ CURDIR ?= $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/..)
BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=3.7
-#VER:=3
-OOVER:=3.7
+HELP_L10N_VIRTUAL_VERSION:=4.0
+#VER:=4
+OOVER:=4.0
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -70,7 +70,7 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.7.0.0.alpha
+lo_sources_ver=4.0.0.0.alpha
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
#GIT_TAG=libreoffice-$(lo_sources_ver)
@@ -271,7 +271,7 @@ ENABLE_GCONF=y
ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
- PACKAGE_NSPLUGIN=n
+ PACKAGE_NSPLUGIN=y
ifeq "$(PACKAGE_NSPLUGIN)" "y"
SYSTEM_STUFF += mozilla-headers
endif
@@ -2823,8 +2823,8 @@ else
endif
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
- 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 -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)~)" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ 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`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
diff --git a/uno-libs3.symbols b/uno-libs3.symbols
index edf2277..0158115 100644
--- a/uno-libs3.symbols
+++ b/uno-libs3.symbols
@@ -13,8 +13,8 @@ libuno_cppuhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3.6 1.7.0
*@UDK_3.7 3.4.0
*@UDK_3.8 3.5.0~beta
- *@UDK_3.9 3.7.0~alpha
- *@LIBO_UDK_3.9 3.7.0~alpha
+ *@UDK_3.9 4.0.0~alpha
+ *@LIBO_UDK_3.9 4.0.0~alpha
libuno_sal.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
@@ -32,8 +32,8 @@ libuno_sal.so.3 uno-libs3 #MINVER#, ure
osl_setEnvironment@UDK_3.11 1.7.0+LibO3.3.0~beta3
*@UDK_3.11 1.8.0
*@LIBO_UDK_3.5 3.5.0~beta
- *@LIBO_UDK_3.6 3.7.0~alpha
- *@LIBO_UDK_3.7 3.7.0~alpha
+ *@LIBO_UDK_3.6 4.0.0~alpha
+ *@LIBO_UDK_3.7 4.0.0~alpha
libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#, ure
*@UDK_3_0_0 1.4.0
*@UDK_3.1 1.4.0
--
LibreOffice packaging repository
Reply to: