The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 97a7a14d385187bb461cff502df7d76340fdb777
Merge: f1a216d2894b4e23feb4cded4752027d26aa4f3f
950311bcfae87b64ed7bbff147c3ac7b64f15aa6
Author: Rene Engelhard <[email protected]>
Date: Tue Jun 14 02:31:11 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index 8acdc85,b168a4e..8d7cae8
--- a/changelog
+++ b/changelog
@@@ -1,47 -1,31 +1,49 @@@
-libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
+libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
- * new upstream release candidate
-
- [ Rene Engelhard ]
- * debian/patches/disable-optional-outplace-ole.diff: as name says; makes
- toolbars work in e.g. Base edit forms (closes: #617319)
+ * new upstream release
+ - handles various tble columns differing in case correct
+ (closes: #617596)
+ - should fix embedding of (some) fonts in PDFs (closes: #616117)
+ - (still) use libreoffice-build for now; not tagged,
+ use 911ac4027469bbe7c18c257ab4b3b084c856f31f
+ - disables optional-outplace-ole.diff; fixes toolbars in Base when
+ creating/editing forms (closes: #617319)
* debian/rules:
- - disable -sdbc-postgresql until fixed (closes: #620100)
+ - bump build-dep on libmdds-dev to >= 0.5.0
+ - build-depend on libgraphite2-dev instead of libgraphite-dev
+ - update for new extension and mingw configure switches
+ - temporarily build only for en-US
+ - remove SMALL_SYMBOLS option, gone upstream
+ - temporarily disable -evolution and -filter-binfilter until we get
+ the (de-)registering of them fixed
+ - temprarily don't install gengal, not built anymore since the switch to
+ GNU Make...
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
+ - adapt GCJ_JAWT_DIR handling for new multiarch dirs and explicitely
+ give -l to the libgcj_bc.so.1 multiarch dir to dh_shlibdeps...
- * debian/control.in:
- - build-conflict against libmdds-dev (>= 0.4.0)
+ * debian/control.sdk.in, debian/rules:
+ - stop building with STLport on i386, just create a symlink in ure.
+ Should suffice for compat with binary-only OOo extensions
+ * debian/control.in, debian/rules:
+ - the script providers are now extensions. split js and bsh out into
+ extra packages (also closes: #603595)
+ * debian/rules, debian/patches/disable-sdbc-postgresql.diff:
+ - disable -sdbc-postgresql until fixed (closes: #620100)
+ * debian/uno-libs3.symbols: update
* debian/rules, debian/*lintian-overrides:
fix/override (some) new Java related lintian warnings
- * debian/rules, debian/libreoffice-filter-binfilter*.in:
- oops, we forgot to do (de-)registering for libbindet*.so
+ * debian/rules, debian/patches/packcomponents-remove-split-components.diff:
+ remove evoab, binfilter and kdeab deregistering into patch patching
+ the new packcomponents
[ Björn Michaelsen ]
* debian/patches/jurt-soffice-location.diff: add the fallback
/usr/lib/libreoffice/program/soffice to jurts NativeLibraryLoader;
- we know where it is
- -- Rene Engelhard <[email protected]> Tue, 14 Jun 2011 00:18:33 +0000
+ -- Rene Engelhard <[email protected]> Tue, 14 Jun 2011 01:24:58 +0200
libreoffice (1:3.3.2-4) unstable; urgency=low
diff --combined rules
index 531f264,a79beee..f4d3bab
--- a/rules
+++ b/rules
@@@ -24,10 -24,10 +24,10 @@@ BASE_VERSION:=$(shell echo $(SOURCE_VER
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 |
tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=3.3
+#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 |
tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=3.4
#VER:=3
-OOVER:=3.3
+OOVER:=3.4
BASIS_VERSION:=$(OOVER)
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
NEXT_BASIS_VERSION:=$(NEXT_OOVER)
@@@ -77,12 -77,12 +77,12 @@@ export QUILT_OPTIONS="-p1 -F0
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=OOO330
-MILESTONE=m19
+MWS=OOO340
+MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-3-3
-OOO_BUILD_VERSION=3.3.3.1
+OOO_BUILD_BRANCH=libreoffice-3-4-0
+OOO_BUILD_VERSION=3.4.0.2
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
@@@ -126,8 -126,8 +126,8 @@@ PACKAGE_TTF_OPENSYMBOL=
ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
BUILD_JARS_NATIVE=y
endif
-BUILD_BINFILTERS=y
-BUILD_ONLY_EN_US=n
+BUILD_BINFILTERS=n
+BUILD_ONLY_EN_US=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
@@@ -150,6 -150,8 +150,6 @@@ LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11
LIBHYPHEN_MINVER= (>= 2.4)
USE_AGG=n
# SYSTEM_STUFF += agg
-USE_STLPORT=n
-USE_SYSTEM_STLPORT=y
SYSTEM_STUFF += boost
BOOST_VERSION=default
ifeq "$(BOOST_VERSION)" "default"
@@@ -205,7 -207,11 +205,7 @@@ ifeq "$(ENABLE_JAVA)" "y
else
RUN_SMOKETEST=n
endif
- ifneq (,$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
- RUN_SUBSEQUENT_TESTS=y
- else
- RUN_SUBSEQUENT_TESTS=n
- endif
+ RUN_SUBSEQUENT_TESTS=y
else
ifneq ($(ON_BUILDD),y)
RUN_SMOKETEST=n
@@@ -247,7 -253,7 +247,7 @@@ ENABLE_MINIMIZER=
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
-ENABLE_EVO2=y
+ENABLE_EVO2=n
ENABLE_GVFS=y
ENABLE_GCONF=y
# broken!
@@@ -270,7 -276,7 +270,7 @@@ SYSTEM_STUFF += cppuni
# otherwise
INTERNAL_STDLIBS=n
DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen classic
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@@ -329,7 -335,7 +329,7 @@@ PLATFORMID := $(shell grep PLATFORMID d
# ABI-compatability
OOO_STLPORT_ARCHS= i386
ifeq "$(ARCH)" "i386"
- USE_STLPORT=y
+ LINK_TO_STLPORT=y
endif
ifeq "$(ENABLE_OPENGL)" "y"
@@@ -427,7 -433,7 +427,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:[email protected]
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes libtextcat,
$(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat
graphite, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
endif
@@@ -486,19 -492,22 +486,19 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-minimizer
+ CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-presenter-console
+ CONFIGURE_FLAGS += --enable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- CONFIGURE_FLAGS += --enable-pdfimport
+ CONFIGURE_FLAGS += --enable-ext-pdfimport
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
endif
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite-dev
- ifeq "$(USE_STLPORT)" "y"
- ADDITIONAL_SECTIONS += SystemBitsWithSTLport
- endif
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -527,7 -536,17 +527,7 @@@ endi
BUILD_DEPS += , libdb-dev
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{
print $$2 }' | sed -e s/dev/dbg/)
-ifneq "$(BUILD_DBG_PACKAGE)" "y"
- # build with small symbols anyway
- SMALL_SYMBOLS = y
-else
- # -g gives a far too big deb (>400M, ca. 1GB I-S)
- ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- # ooo-build defaults to --enable-symbols (without SMALL)
- SMALL_SYMBOLS = n
- else
- SMALL_SYMBOLS = y
- endif
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg,
libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg,
libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
@@@ -535,6 -554,10 +535,6 @@@
DBG_DBG_SUGGESTS+= , libcurl4-dbg
endif
endif
-# Small symbols?
-ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
-endif
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
@@@ -584,6 -607,9 +584,6 @@@ ifeq "$(RUN_TESTTOOL)" "y
endif
ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= 1.12)
- ifeq "$(USE_STLPORT)" "y"
- ADDITIONAL_SECTIONS += SystemBitsWithSTLport
- endif
endif
ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
BUILD_DEPS += , tcsh
@@@ -664,6 -690,7 +664,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
TEST_JAVA_HOME=$(JAVA_HOME)
ifeq "$(BUILD_JARS_NATIVE)" "y"
- CONFIGURE_FLAGS += --enable-gcjaot
BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>=
1:4.4.1)$(OOO_NO_GCJ_ARCHS)
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@@ -676,7 -703,7 +676,7 @@@
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e
s/gcj-//)
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink
/usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture
-qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 |
sed -e s/$$/-awt/)
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e
s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
# ifneq (,$(GCJ_JAWT_DEPENDS))
@@@ -705,14 -732,11 +705,14 @@@ export JAVA_HOM
ifeq "$(DIST)" "Debian"
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS),
mingw32-runtime$(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --enable-build-unowinreg
- CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
+ CONFIGURE_FLAGS += --with-mingw=i586-mingw32msvc-g++
+ # this normally is done in configure with sed -e s/[cg]++/strip/ but
that somehow
+ # doesn't work. Workaround. FIXME.
+export MINGWSTRIP = i586-mingw32msvc-strip
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- CONFIGURE_FLAGS += --enable-wiki-publisher
+ CONFIGURE_FLAGS += --enable-ext-wiki-publisher
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS),
libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS),
libcommons-lang-java$(OOO_NO_JAVA_ARCHS),
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
@@@ -737,13 -761,13 +737,13 @@@
CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
- CONFIGURE_FLAGS += --enable-report-builder
+ CONFIGURE_FLAGS += --enable-ext-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
BUILD_DEPS += , javahelper
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean
-Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev
-Nlibreoffice$(VER)-gcj
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean
-Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev
-Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh
-Nlibreoffice$(VER)-script-provider-js
endif
ifneq "$(MOZILLA)" ""
@@@ -823,8 -847,19 +823,8 @@@ ifeq "$(USE_AGG)" "y
endif
ifneq "$(OOO_STLPORT_ARCHS)" ""
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER)
[$(OOO_STLPORT_ARCHS)]
- DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
[$(OOO_STLPORT_ARCHS)]
- endif
-endif
-ifneq "$(USE_STLPORT)" "y"
- CONFIGURE_FLAGS += --without-stlport
-else
- CONFIGURE_FLAGS += --with-stlport
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
- endif
endif
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
@@@ -846,7 -881,7 +846,7 @@@
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev
+ BUILD_DEPS += , libmdds-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -916,7 -951,7 +916,7 @@@ els
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-mysql-connector
+ CONFIGURE_FLAGS += --enable-ext-mysql-connector
ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlclient-dev
endif
@@@ -950,13 -985,12 +950,13 @@@ endi
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
-else
- DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-filter-binfilter
endif
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno
+ CONFIGURE_FLAGS += --disable-python
+else
+ CONFIGURE_FLAGS += --enable-ext-scripting-python
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -974,11 -1008,9 +974,11 @@@
endif
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
- COMMON_BSH_DEPENDS = bsh (>= 2.0b4)
+ BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj
+ CONFIGURE_FLAGS += --enable-ext-scripting-beanshell
endif
+ CONFIGURE_FLAGS += --enable-ext-scripting-javascript
endif
ifneq (,$(filter lpsolve, $(SYSTEM_STUFF)))
@@@ -1092,8 -1124,7 +1092,8 @@@ els
endif
endif
endif
- CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
+# disabled for now. needs fixed GNU make (#622644)
+# CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
# breaks. At least with 2
# CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
@@@ -1431,10 -1462,6 +1431,10 @@@ ifeq "$(ENABLE_EVO2)" "y
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.evolution.in
endif
+ifeq "$(BUILD_BINFILTERS)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.binfilter.in
+endif
ifeq "$(ENABLE_KDEAB)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.kab.in
@@@ -1477,8 -1504,10 +1477,8 @@@ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF
perl -pi -e "s/(Build-Conflicts: .*)/\1, libhsqldb-java (>=
$(HSQLDB_TOONEWVER)~)/" debian/control
endif
-ifneq "$(USE_SYSTEM_STLPORT)" "y"
# at least here it crashes the build in some funny way.
perl -pi -e "s/(Build-Conflicts: .*)/\1, libstlport4.6-dev/"
debian/control
-endif
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
@@@ -1573,6 -1602,17 +1573,6 @@@ ifneq ($(GCC_VERSION),
endif
endif
-ifeq "$(USE_STLPORT)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # stlport home
- if [ ! -d stlport ]; then \
- mkdir -p stlport; \
- ln -sf /usr/include/stlport stlport/stlport; \
- ln -sf /usr/lib stlport/lib; \
- fi
- endif
-endif
-
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(LANGPACKISOS)" "en-US"
# copy and extract extra GSIs
@@@ -1649,9 -1689,9 +1649,9 @@@ ifeq "$(BUILD_KDE)" "n
endif
ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
endif
# apparently setting this here globally doesn't work, so hack around.
@@@ -1738,18 -1778,10 +1738,18 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
# somehow in the installer LD_LIBRARY_PATH doesn't contain
# /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
# ld.so. Set LD_PRELOAD to the full path here manually.
- cd $(OOO_BUILD_TREE)/; PATH=$(BUILD_PATH) \
+ cd $(SOURCE_TREE)/; \
+ . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ PATH=$(BUILD_PATH) \
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell
update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
+ DESTDIR=$(CURDIR)/debian/tmp \
+ solenv/bin/ooinstall /$(OOBRANDDIR)
+ # FIXME: Move here so that we don't rely on libreoffice-build here.
+ # Would also obsolete disable-ooinstall-in-package-ooo.diff
+ cd $(OOO_BUILD_TREE)/bin; \
+ export OODESTDIR=$(CURDIR)/debian/tmp; \
+ ./package-ooo
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -1894,7 -1926,7 +1894,7 @@@ endi
rm -f $(PKGDIR)-common/$(OODIR)/program/.testtoolrc
ifeq "$(BUILD_GTK)" "y"
- # Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
+ # Gtk quickstarter, so to -gtk (via -gnome)
mkdir -p -m755 $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
mv $(PKGDIR)-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
$(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
@@@ -1904,17 -1936,17 +1904,17 @@@
$(PKGDIR)-gnome/$(OODIR)/share/registry
endif
-ifeq "$(PACKAGE_SDK)" "y"
- # move gengal stuff into -dev
- mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
- $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/program/gengal \
- $(PKGDIR)-dev/$(OODIR)/program
-else
- rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
- rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+# # move gengal stuff into -dev
+# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+# mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
+# $(PKGDIR)-dev/$(OODIR)/program
+# mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+# $(PKGDIR)-dev/$(OODIR)/program
+#else
+# rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
+# rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
+#endif
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
@@@ -2111,6 -2143,32 +2111,6 @@@ $(STAMP_DIR)/install-arch: $(STAMP_DIR)
dh_testroot
umask 022
-ifeq "$(ENABLE_EVO2)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libevoab$(LIBSUFFIX).so'
-endif
-ifeq "$(ENABLE_KDEAB)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libkab1.so'
-endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libbf_migratefilter$(LIBSUFFIX).so'
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libbindet$(LIBSUFFIX).so'
-endif
-
- # the regcomps above fail after done once, force install again
- rm -f $(STAMP_DIR)/install
-
# move the URE to /usr/lib/ure
mv debian/ure/$(OOBRANDDIR)/ure debian/ure/usr/lib
rmdir debian/ure/$(OOBRANDDIR)
@@@ -2191,7 -2249,9 +2191,7 @@@ ifeq "$(BUILD_GTK)" "y
for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
- for f in libeggtray* libqstart_gtk*; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f
$(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
- done
+ mv $(PKGDIR)-core/$(OODIR)/program/libqstart_gtk*
$(PKGDIR)-gnome/$(OODIR)/program || exit 1
endif
# split out gtk stuff
@@@ -2274,10 -2334,10 +2274,10 @@@ endi
$(PKGDIR)-base/$(OODIR)/program; \
# linked (amongst others) to libsc*
- mv $(PKGDIR)-core/$(OODIR)/program/libvbaobj*uno.so \
+ mv $(PKGDIR)-core/$(OODIR)/program/vbaobj*uno.so \
$(PKGDIR)-calc/$(OODIR)/program
# linked (amongst others) to libsw*
- mv $(PKGDIR)-core/$(OODIR)/program/libvbaswobj*uno.so \
+ mv $(PKGDIR)-core/$(OODIR)/program/vbaswobj*uno.so \
$(PKGDIR)-writer/$(OODIR)/program
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2389,9 -2449,6 +2389,9 @@@ ifeq "$(BUILD_PYUNO)" "y
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python
\
+ debian/python-uno/$(OOBRANDDIR)/share/extensions
mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
@@@ -2408,6 -2465,8 +2408,6 @@@ ifeq "$(ENABLE_MONO)" "y
mkdir -p -m755 debian/cli-uno-bridge/$(OOUREDIR)/lib
mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll \
debian/cli-uno-bridge/$(OOUREDIR)/lib
- mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll.config \
- debian/cli-uno-bridge/$(OOUREDIR)/lib
mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
debian/cli-uno-bridge/$(OOUREDIR)/lib
@@@ -2424,6 -2483,12 +2424,6 @@@ endi
rm -rf $(PKGDIR)-core/$(OOBRANDDIR)/ure
ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # when we use external stlport, we just can and should do a symlink
- # for the SDK includes
- cd $(PKGDIR)-dev/usr/include/$(OODIRNAME) && \
- rm -rf stl && ln -s /usr/include/stlport stl
- endif
ifeq "$(ENABLE_JAVA)" "y"
# move SDK Java stuff into /usr/share/java
rm -f $(PKGDIR)-dev/$(OOSDKDIR)/classes
@@@ -2466,7 -2531,6 +2466,7 @@@
rm docs
# install gsicheck into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
@@@ -2494,10 -2558,12 +2494,10 @@@ ifeq "$(INTERNAL_STDLIBS)" "y
echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
-ifeq "$(USE_STLPORT)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
+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
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2822,10 -2888,15 +2822,10 @@@ endi
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
ifeq "$(ENABLE_JAVA)" "y"
- # symlink jars we use externally
ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
ln -sf /usr/share/java/saxonb.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/saxon9.jar
endif
- ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- ln -sf /usr/share/java/bsh.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/bsh.jar
- endif
endif
# remove extra license files
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/licenses
@@@ -2910,6 -2981,7 +2910,6 @@@ endi
for i in $(IMAGES); do \
z=images_$$i.zip; p=$$i; \
case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
- case "$$i" in classic) p=andromeda; esac; \
mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
$(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e
s/lib/share/)/share/config/; \
@@@ -2952,28 -3024,6 +2952,28 @@@ ifeq "$(PACKAGE_SDK)" "y
ln -s /$(OOSDKDIR)/index.html index.html
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ rm -rf $(PKGDIR)-script-provider-bsh
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ mv
debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell \
+ $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
+ ln -sf /usr/share/java/bsh.jar \
+
$(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/bsh.jar
+ endif
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
+ $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
+
+ rm -rf $(PKGDIR)-script-provider-js
+ mkdir -p $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
+ mv
debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-javascript \
+ $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
+ mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
+ $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
+endif
+
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
rm -rf $(PKGDIR)-report-builder
@@@ -3040,13 -3090,16 +3040,13 @@@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n
-e 's/ / /' \
< $$dirname/extension.desktop \
>
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
|| exit 1
perl -pi -e
"s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/"
$(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
endif
- # fix permission
- chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#ifeq "$(PACKAGE_SDK)" "y"
+# # fix permission
+# chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#endif
# install extension shell lib for use by extensions not from here
install -D -m644 debian/shell-lib-extensions.sh \
@@@ -3153,8 -3206,8 +3153,8 @@@ ifeq "$(ENABLE_MONO)" "y
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0 -v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`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 }'))" --
-v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-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 }'))" --
-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 && \
@@@ -3177,7 -3230,7 +3177,7 @@@ endi
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program"
\
dh_shlibdeps -s -Nlibreoffice$(VER)-officebean \
-Lure -Luno-libs3 \
-
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program
\
+
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell
dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep
_bc)) \
$(SHLIBS_OVERRIDE)
ifneq (,$(filter redland, $(SYSTEM_STUFF)))
# dpkg-shlibdeps "in practice" always will look for this in
@@@ -3196,9 -3249,6 +3196,9 @@@ 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_MONO)" "y"
dh_makeclilibs -s
dh_clideps -s
@@@ -3212,9 -3262,10 +3212,9 @@@ endi
-Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-sdbc-postgresql \
-Nlibreoffice$(VER)-mysql-connector -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
- -V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)
$(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
@@@ -3260,8 -3311,8 +3260,8 @@@ ifeq "$(PACKAGE_BASE)" "y
endif
endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
- -v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -v"`echo $(BINARY_VERSION) | cut -d: -f2`"
dh_md5sums -s -X$(shell echo $(OOBASISDIR) | sed -e
s/usr/var/)/program/services.rdb
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
@@@ -3360,7 -3411,7 +3360,7 @@@ endi
-V'basis-version=$(BASIS_VERSION)' \
-V'next-basis-version=$(NEXT_BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
- -V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
+ -V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
