The following commit has been merged in the debian-experimental-4.2 branch:
commit 2373697f6ca95e992e2ec4dfb3394b2875511964
Merge: fd04f16563d02fab459376152da9160c9c231ef8
c39600b164ba7f0948ce8f7048d1001a3d96ce1c
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jun 17 23:31:47 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into
debian-experimental-4.2
Conflicts:
changelog
control
diff --combined changelog
index e664120,c56704e..c4ef492
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,37 +1,49 @@@
+libreoffice (1:4.2.0~alpha0~git20130604-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got deplaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <r...@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0~beta2~git20130604-1) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0~rc1~git20130710-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/control.sdk.in:
+ - also replace libreoffice-common (<< 4.1.0~beta1) (closes: #710767)
+ * debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
+ * debian/control:
+ - fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
+ - temporarily force gcc-4.6(!) (instead of build-conflicting
+ against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
+ all bridges are ported to the new gcc 4.7+ behaviour
+ - remove last buildd special-caing: build --enable-verbose everyhwere,
+ also on the buildds
+
+ -- Rene Engelhard <r...@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
+
+ libreoffice (1:4.1.0~beta2-2) experimental; urgency=low
+
+ * debian/rules:
+ - revert back to using gcj on kfreebsd-*, OpenJDK7 doesn't work (hangs) or
+ still isn't available... (kfreebsd-i386)
+ - fix librpt* move, install path differs between binary-only and full
+ builds, sigh.
+
+ -- Rene Engelhard <r...@debian.org> Mon, 10 Jun 2013 15:31:07 +0200
+
+ libreoffice (1:4.1.0~beta2-1) experimental; urgency=low
* debian/patches/show-the-startcenter.diff: as name says, remove
NoDisplay=true from startcenter.desktop
- * new upstream snapshot
+ * new upstream beta release
- make distro-pack-install installs .desktop again (closes: #710591)
* rebuild against libharfbuzz0a/libharfbuzz-icu0 (closes: #710847)
@@@ -25,7 -41,7 +53,7 @@@
* debian/rules:
- enable graphite2 on all archs now that it's fixed on armel/sparc
- -- Rene Engelhard <r...@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 05 Jun 2013 18:52:33 +0200
libreoffice (1:4.1.0~beta1-2) experimental; urgency=low
diff --combined control
index af1630a,f90f664..401d63b
--- a/control
+++ b/control
@@@ -16,10 -16,11 +16,12 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
+ g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcj-jdk [hppa],
- gcj-native-helper [hppa],
+ gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
+ gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
+ gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
gettext,
gperf,
@@@ -43,7 -44,7 +45,7 @@@
libexttextcat-dev (>= 3.1.1),
libfontconfig1-dev,
libfreetype6-dev,
- libgcj-common (>= 1:4.4.1) [hppa],
+ libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
libgconf2-dev,
libgl1-mesa-dev [!armel !mips !mipsel],
libglib2.0-dev (>= 2.15.0),
@@@ -107,7 -108,7 +109,7 @@@
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
- openjdk-7-jdk [amd64 armel armhf i386 ia64 kfreebsd-amd64
kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc],
+ openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe
ppc64 s390 s390x sparc],
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
@@@ -121,36 -122,35 +123,35 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
- libbase-java [!hppa],
+ libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9),
- libflute-java (>= 1.1.6) [!hppa],
- libfonts-java (>= 1.1.6) [!hppa],
- libformula-java (>= 1.1.7) [!hppa],
- liblayout-java (>= 0.2.10) [!hppa],
- libloader-java (>= 1.1.6) [!hppa],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa],
- librepository-java (>= 1.1.6) [!hppa],
- libsac-java [!hppa],
- libserializer-java (>= 1.1.6) [!hppa],
+ libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
+ libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
+ libformula-java (>= 1.1.7) [!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],
+ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa
!kfreebsd-amd64 !kfreebsd-i386],
+ librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
+ libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
libservlet3.0-java,
- libxml-java (>= 1.1.6) [!hppa],
+ libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386],
xml-core
- Build-Conflicts: ant (= 1.8.0-1) [hppa],
- ant (= 1.8.0-2) [hppa],
- ant (= 1.8.0-3) [hppa],
+ Build-Conflicts: 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],
flex (= 2.5.34-1) [amd64],
g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@@ -183,7 -183,7 +184,7 @@@ Depends: fonts-sil-gentium-basic
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa],
+ libreoffice-report-builder-bin [!hppa !kfreebsd-amd64
!kfreebsd-i386],
libreoffice-writer,
${dejavu-depends},
${java-common-depends},
@@@ -2007,6 -2007,37 +2008,37 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
+ Package: libreoffice-l10n-kk
+ Section: localization
+ Architecture: all
+ Depends: libreoffice-common,
+ locales | belocs-locales-data | locales-all,
+ ${misc:Depends}
+ Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-kk
+ Provides: libreoffice-l10n-${help-l10n-virtual-version}
+ Suggests: hunspell-dictionary-kk | myspell-dictionary-kk,
+ hyphen-kk,
+ libreoffice-grammarcheck-kk,
+ libreoffice-help-kk,
+ mythes-kk
+ Description: office productivity suite -- Kazakh language package
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of LibreOffice in
+ Kazakh.
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages).
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+
Package: libreoffice-l10n-km
Section: localization
Architecture: all
@@@ -4187,7 -4218,7 +4219,7 @@@ Description: LibreOffice component for
Package: libreoffice-report-builder-bin
Section: misc
- Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+ Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc
Depends: libreoffice-base, libreoffice-core, ${misc:Depends},
${shlibs:Depends}
Description: LibreOffice component for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
@@@ -4299,7 -4330,7 +4331,7 @@@ Depends: libreoffice-core (= ${binary:V
${shlibs:Depends}
Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreoffice-dev-doc
- Replaces: libreoffice-core (<< 1:4.1.0~beta1)
+ Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<<
1:4.1.0~beta1)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -4412,13 -4443,14 +4444,15 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
+ g++-4.6,
g++-mingw-w64-i686,
+ gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
diff --combined rules
index 79fee58,3302c8b..d19f555
--- a/rules
+++ b/rules
@@@ -23,7 -23,7 +23,7 @@@ BASE_VERSION:=$(shell echo $(DEB_VERSIO
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d:
-f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=4.1
-OOVER:=4.1
+OOVER:=4.2
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -37,9 -37,6 +37,6 @@@ export gb_SHELL:=$(SHELL
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
- # Debian buildds run as user `buildd', other are using /CurrentlyBuilding
- ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] ||
echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
-
PKGDIR:=debian/libreoffice
OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
@@@ -154,7 -151,7 +151,7 @@@ ENABLE_JAVA=
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
JAVA_MAINVER=7
- ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
+ ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
endif
@@@ -173,7 -170,7 +170,7 @@@ els
BOOST_VERSION=1.53
endif
ifeq "$(BOOST_VERSION)" "default"
- ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo
true)" "true"
BOOST_MINVER= (>= 1.53)
else
BOOST_MINVER= (>= 1.38)
@@@ -187,7 -184,6 +184,6 @@@ endi
SYSTEM_STUFF += mdds
SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
- #SYSTEM_STUFF += sablot
SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
ICU_MINVER= (>= 4.6)
@@@ -204,7 -200,7 +200,7 @@@ CAIRO_FONTS_PATCH=
BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
- ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo
true)" "true"
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
else
@@@ -400,9 -396,7 +396,7 @@@ ifeq "$(shell echo $(DEB_VERSION_UPSTRE
CONFIGURE_FLAGS += --enable-release-build
endif
- ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
- endif
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
@@@ -450,7 -444,7 +444,7 @@@ $(eval $(call gen_no_archs,OOO_JAVA_ARC
OOO_GCJ_ARCHS = $(filter-out $(OOO_OPENJDK_ARCHS), $(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
- OOO_GCJ_JDK_ARCHS := hppa
+ OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
@@@ -549,7 -543,6 +543,7 @@@ endi
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:debian-backpo...@lists.debian.org
SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw
libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
@@@ -560,6 -553,14 +554,14 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64]
,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+ GCC_VERSION := 4.6
+ endif
+ endif
+ endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@@ -587,7 -588,7 +589,7 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
else
ifeq "$(PACKAGE_SDK_DOCS)" "y"
- BUILD_DEPS_INDEP += , doxygen
+ BUILD_DEPS_INDEP += , doxygen (>= 1.8.4)
endif
endif
@@@ -680,10 -681,12 +682,12 @@@ PYMAJOR:=$(shell $(PYTHON) -c "import s
PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print
(sys.version_info[1]+1)")
PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+ ifeq "$(ENABLE_PYTHON2)" "y"
PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
PY2MINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print
sys.version_info[1]+1")
PYTHON2_SITE:=debian/python-uno/$(shell $(PYTHON2) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+ endif
else
PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")
@@@ -703,7 -706,7 +707,7 @@@ ifeq "$(ENABLE_PYTHON)" "y
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
# for dh_python3
BUILD_DEPS += , python3
- DBG_DBG_SUGGESTS+= , python-dbg
+ DBG_DBG_SUGGESTS+= , $(PYTHON)-dbg
ifneq "$(WHEEZY_BACKPORT)" "y"
BUILD_DEPS += , $(PYTHON)-dev (>= 3.3)
ifeq "$(ENABLE_PYTHON2)" "y"
@@@ -733,11 -736,6 +737,11 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , ttf-liberation
+ else
+ BUILD_DEPS += , fonts-liberation
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
@@@ -765,7 -763,7 +769,7 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
#ISOS=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
ISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
ifeq "$(ENABLE_HELP)" "n"
@@@ -778,7 -776,7 +782,7 @@@
#LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz
el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
endif
@@@ -969,9 -967,15 +973,15 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
ifneq "$(BOOST_VERSION)" "default"
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER),
libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev,
libboost-program-options$(BOOST_VERSION)-dev
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
+ endif
else
BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev
$(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER)
+ endif
endif
endif
endif
@@@ -996,9 -1000,6 +1006,6 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpd-dev (>= 0.9.0)
endif
- ifneq (,$(filter sablot, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libsablot0-dev (>= 1.0.2-4)
- endif
ifneq (,$(filter mythes, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmythes-dev (>= 2:1.2)
endif
@@@ -2322,11 -2323,6 +2329,6 @@@ endi
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
- for f in `find debian -name 'xdg/*.desktop' ! -name "*soffice.od*"`; do
\
- if ! grep -q X-KDE-Protocols $$f; then \
- echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f;
\
- fi; \
- done
sed -i -e 's/Office;/Office;Graphics;/'
$(PKGDIR)-draw/$(OODIR)/share/xdg/draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
@@@ -2484,7 -2480,11 +2486,11 @@@ els
# move rpt stuff into -report-builder-bin
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
- mv $(PKGDIR)-report-builder/$(OODIR)/program/librpt* \
+ # FIXME: it seems that --enable/--disable-reportbuiler affects the
install
+ # location. sigh.
+ if [ -e $(PKGDIR)-core/$(OODIR)/program/librptlo.so ]; then \
+ i=core; else i=report-builder; fi; \
+ mv $(PKGDIR)-$$i/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uoh1u-0004vm...@vasks.debian.org
