The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 71b76459bf9127af86cae9e2c2ee101d4c9a9093
Merge: f5b7bd781d853b12772d8b6df9c599acddb7663c
21948d8beeb534d53ef770d93abce6b0e9df0f64
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Feb 21 17:48:41 2011 +0100
starting work on 3.3.1~rc2-1ubuntu1~ppa1
diff --combined changelog
index bf1486c,d928357..a77fe9f
--- a/changelog
+++ b/changelog
@@@ -1,26 -1,13 +1,29 @@@
- libreoffice (1:3.3.1~rc1-2ubuntu1~ppa2) UNRELEASED; urgency=low
++libreoffice (1:3.3.1~rc2-1ubuntu1~ppa1) UNRELEASED; urgency=low
+
+ * moving transitional packages from libreoffice to openoffice.org source
++ * merging all rc2 debian changes
+
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 18 Feb 2011
10:12:08 +0100
++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Mon, 21 Feb 2011
17:02:26 +0100
+
+libreoffice (1:3.3.1~rc1-2ubuntu1~ppa1) natty; urgency=low
+
+ * merging all pre rc2 debian changes
+ * fixing lintian warnings for transistional packages
+ * fixing lintian warnings for armhf arch
+ * regenenerate control file
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 16 Feb 2011
16:21:52 +0100
+
- libreoffice (1:3.3.1~rc1-3) UNRELEASED; urgency=low
+ libreoffice (1:3.3.1~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/control.in:
- update for new git
* debian/rules, debian/soffice.sh, debian/README.DEbian:
- more s/OOo/LibreOffice/ (closes: #613215)
- -- Rene Engelhard <r...@debian.org> Mon, 14 Feb 2011 20:02:55 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 16 Feb 2011 00:53:26 +0100
libreoffice (1:3.3.1~rc1-2) unstable; urgency=low
@@@ -88,14 -75,6 +91,14 @@@ libreoffice (1:3.3.0-2) unstable; urgen
-- Rene Engelhard <r...@debian.org> Sun, 06 Feb 2011 10:34:53 +0000
+libreoffice (1:3.3.0-1ubuntu1) natty; urgency=low
+
+ * Set NO_PKG_MANGLE for -l10n builds.
+ * libreoffice-writer: Suggest -binfilter instead of recommending it.
+ * Fix upper dependency on libreoffice-common in -l10n packages.
+
+ -- Matthias Klose <d...@ubuntu.com> Sat, 22 Jan 2011 01:44:53 +0100
+
libreoffice (1:3.3.0-1) experimental; urgency=low
* LibreOffice 3.3.0 final (identical to rc4)
@@@ -128,20 -107,6 +131,20 @@@
-- Rene Engelhard <r...@debian.org> Tue, 25 Jan 2011 12:42:33 +0100
+libreoffice (1:3.3.0~rc4-1ubuntu1) natty; urgency=low
+
+ * Merge 3.3.0~rc4 changes.
+ * Merged Debian packaging up to r2336.
+ * libreoffice-writer: Make the java stuff a suggestion instead of a
+ recommendation.
+ * Fix libreoffice-base upgrade, overwriting doc file. LP: #705343.
+ * Add initial desktop menu translations. LP: #696549. Still needs
+ rosetta integration. Use the file lo-desktop.pot.
+ * Relax dependencies of libreoffice-l10n-xx on libreoffice-common.
+ * Move the icons zip files back into the libreoffice-style-* packages.
+
+ -- Matthias Klose <d...@ubuntu.com> Fri, 21 Jan 2011 01:37:08 +0100
+
libreoffice (1:3.3.0~rc4-1) experimental; urgency=low
* LibreOffice 3.3.0 rc4
@@@ -160,19 -125,6 +163,19 @@@
-- Rene Engelhard <r...@debian.org> Wed, 19 Jan 2011 10:03:33 +0100
+libreoffice (1:3.3.0~rc3-2ubuntu2) natty; urgency=low
+
+ * Build with internal lucene (still in universe).
+
+ -- Matthias Klose <d...@ubuntu.com> Thu, 20 Jan 2011 03:55:12 +0100
+
+libreoffice (1:3.3.0~rc3-2ubuntu1) natty; urgency=low
+
+ * Merge 3.3.0~rc3 changes.
+ * Merged Debian packaging up to r2330.
+
+ -- Matthias Klose <d...@ubuntu.com> Wed, 19 Jan 2011 15:13:37 +0100
+
libreoffice (1:3.3.0~rc3-2) experimental; urgency=low
* debian/patches/fix-mesa-headers-check.diff: readd, still needed;
@@@ -223,60 -175,6 +226,60 @@@ libreoffice (1:3.3.0~rc3-1) experimenta
-- Rene Engelhard <r...@debian.org> Wed, 12 Jan 2011 02:47:36 +0100
+libreoffice (1:3.3.0~rc2-3natty2) natty; urgency=low
+
+ * First attempt at LibreOffice for Ubuntu. Drop all Ubuntu changes
+ and reapply the single changes to the LibreOffice package. See the
+ Launchpad bug tracker for issues tagged with `lo33', which need
+ to be address for the distribution release.
+ * Merged Debian packaging up to r2296.
+
+ * debian/patches/ubuntu-build-updates.diff: Add configuration for
+ natty and disable most ubuntu-patches for older releases.
+ * debian/rules, debian/control.in: Basic Ubuntu changes.
+ * Disable KDE, doesn't work with snapshot in natty.
+ * Build -l10n and -help packages from a separate source package.
+ * The -help packages suggest instead of recommending ${lucene-depends}
+ and ${java-common-depends}.
+ * Use common doc directories, Ubuntu still cares about the size
+ of ISO images.
+ * Save/restore UbuntuL10n.conf.in to avoid changing source files.
+ * Disable the smoke tests on i386 to build initial binary-indep
+ packages.
+ * Allow the generation of transitional openoffice.org-* packages.
+ * Don't build libreoffice-help-en-us from the -l10n source.
+ * Maverick and Lucid backports.
+ * Disable the smoke tests on armel.
+
+ * Merge from OOo:
+ - debian/control.mozilla.in:Add Xb-Npp-xxx tags according to
+ "firefox distro add-on suport" spec.
+ - Build with -Os apart from ARM to avoid GCC register spill errors
+ (lucid and maverick with Linaro GCC 4.4).
+ - Use lzma instead of bzip2 apart for armel (slow too much build process).
+ - Install Ubuntu presentation templates.
+
+ * debian/rules:
+ - Cleanup architecture specific configuration handling.
+ - Move architecture specific config before distro specific config.
+ - Add build support for dh_python2.
+ - Do not re-introduce arm (old ARM ABI).
+ - Add a helper macro gen_no_archs to generate macros OOO_NO_<foo>_ARCHS
+ from OOO_<foo>_ARCHS. Use these macros in build dependencies.
+ - Factor out SYSTEM_GCC_VERSION macro.
+ - Don't special case CC_PREFIX on sparc, not needed.
+ - Eliminate the explicit macros for the configuration of system
+ components.
+ * debian/control.in:
+ - Remove packages and versions in build dependencies,
+ which are present in the last old stable release.
+ - Avoid empty filed in build dependencies.
+ - Adjust for slightly changed OOO_NO_BASE_ARCHS macro.
+ * debian/scripts/joinctrl.py:
+ - Normalize whitespace in dependencies and similiar fields.
+
+ -- Matthias Klose <d...@ubuntu.com> Sun, 02 Jan 2011 16:55:32 +0100
+
libreoffice (1:3.3.0~rc2-3) experimental; urgency=low
[ Rene Engelhard ]
diff --combined patches/series
index 24bfa92,b8d1e31..dbe71c7
--- a/patches/series
+++ b/patches/series
@@@ -5,6 -5,3 +5,5 @@@ hack-no-rm-fr-of-smoketest-userconfig.d
do-not-switch-workspaces-of-wm.diff
bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
- odk-settings-fix-STLPORTLIB.diff
+desktop-templates.diff
+desktop-translations.diff
diff --combined rules
index 237aca3,13a06a2..c36228d
--- a/rules
+++ b/rules
@@@ -31,7 -31,6 +31,7 @@@ OOVER:=3.
BASIS_VERSION:=$(OOVER)
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
NEXT_BASIS_VERSION:=$(NEXT_OOVER)
+NEXT_BASE_VERSION:=1:$(NEXT_OOVER)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
ARCH_DEP_PACKAGES := $(shell dh_listpackages -s)
@@@ -83,7 -82,7 +83,7 @@@ MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=libreoffice-3-3-1
- OOO_BUILD_VERSION=3.3.1.1
+ OOO_BUILD_VERSION=3.3.1.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)
@@@ -105,11 -104,10 +105,11 @@@ endi
#########
# Default package configuration
#
-OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+OOO_ARCHS = alpha amd64 armel hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
PATCHSET=$(DIST)
BUILD_DEPS=
+
# These are components which can be built from internal copies, or used from
the
# distribution. See configure --help for valid values (--with-system-<value>).
SYSTEM_STUFF = dicts
@@@ -251,7 -249,6 +251,7 @@@ USE_SYSTEM_DMAKE=
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=n
+USE_COMMON_DOCDIR=n
MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
@@@ -287,7 -284,6 +287,7 @@@ SYSTEM_STUFF += graphit
ALLOC=system
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
+L10N_SEPARATE_SOURCE=n
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with libreoffice2), we need to set this.
Don't touch
@@@ -484,72 -480,6 +484,72 @@@ ifeq "$(SQUEEZE_BACKPORT)" "y
JUNIT_MIN_VER=
endif
+# Ubuntu
+ifeq "$(DIST)" "Ubuntu"
+ L10N_SEPARATE_SOURCE=y
+ USE_COMMON_DOCDIR=y
+ ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
+ BUILD_ONLY_EN_US=y
+ endif
+ PATCHSET=$(DIST)$(shell perl -e 'print ucfirst("$(DISTREL)");')
+
+ ifneq (,$(filter $(ARCH), armel))
+ USE_LZMA_COMPRESS=y
+ endif
+
+ CONFIGURE_FLAGS += --with-openldap
+ CONFIGURE_FLAGS += --with-system-python
+
+ ifneq (,$(filter $(DISTREL),dapper hardy jaunty karmic lucid maverick))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps, $(SYSTEM_STUFF))
+ endif
+
+ # Build with -Os apart from ARM to avoid GCC register spill errors
+ ifneq (,$(filter $(DISTREL),lucid maverick))
+ ifneq (,$(filter $(ARCH), arm armel))
+ export ICU_ARCH_FLAGS = -Os
+ endif
+ endif
+
+ ifeq ($(DISTREL),natty)
+ SYSTEM_STUFF := $(filter-out lucene, $(SYSTEM_STUFF))
+ # FIXME: smoketest fails, but we need the indep packages for the other
archs
+ ifneq (,$(filter $(ARCH),armel i386))
+ RUN_SMOKETEST=n
+ endif
+ endif
+
+ ifeq ($(DISTREL),maverick)
+ ifneq (,$(filter $(ARCH),armel i386))
+ RUN_SMOKETEST=n
+ endif
+ endif
+
+ ifeq ($(DISTREL),lucid)
+ SYSTEM_STUFF := $(filter-out mdds mythes, $(SYSTEM_STUFF))
+ BOOST_VERSION=1.40
+ BOOST_MINVER=(>= 1.40.0)
+ USE_SYSTEM_TEXTCAT_DATA=n
+ CONFIGURE_FLAGS += --with-linker-hash-style=gnu
+ # LP: #696299
+ BUILD_KDE=n
+ CONFIGURE_FLAGS += --disable-kde --disable-kde4
+ ifneq (,$(filter $(ARCH),armel))
+ RUN_SMOKETEST=n
+ endif
+ endif
+
+endif
+
+ifeq "$(L10N_SEPARATE_SOURCE)" "y"
+ ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
+ BUILD_ONLY_EN_US=y
+ else
+ L10N_COMMON_DEPENDS = libreoffice$(VER)-l10n-common
+ export NO_PKG_MANGLE=go-away
+ endif
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -578,11 -508,6 +578,11 @@@ ifeq "$(USE_BZIP_COMPRESS)" "y
BUILDDEB_OPTIONS = -- -Zbzip2
endif
+ifeq "$(USE_LZMA_COMPRESS)" "y"
+ DPKG_DEPENDS = dpkg (>= 1.14.12ubuntu3)
+ BUILDDEB_OPTIONS = -- -Zlzma
+endif
+
ifeq "$(LENNY_BACKPORT)" "y"
BUILD_DEPS += , dpkg-dev (>= 1.14.27)
else
@@@ -696,9 -621,7 +696,9 @@@ endi
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
+ ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
+ endif
ifeq "$(NEW_DPKG_SHLIBDEPS)" "n"
BUILD_DEPS += , dpkg-dev (>= 1.13.19)
endif
@@@ -763,10 -686,6 +763,10 @@@ els
endif
BUILD_ISOS = $(ISOS)
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-help-en-us
+endif
+
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(BUILD_ISOS)" "en-US"
CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
@@@ -782,7 -701,7 +782,7 @@@ endi
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
- BUILD_DEPS += , default-jdk$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , default-jdk-builddep$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(JDK)" "java-gcj-compat"
JAVA_HOME=/usr/lib/jvm/java-gcj
@@@ -803,9 -722,9 +803,9 @@@
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , default-jdk-builddep$(OOO_NO_GCJ_ARCHS),
gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>= 1.0.76-7)$(OOO_NO_GCJ_ARCHS),
libgcj-bc$(OOO_GCJ_ARCHS)
+ BUILD_DEPS += , gij$(OOO_NO_GCJ_ARCHS), java-gcj-compat-dev (>=
1.0.76-7)$(OOO_NO_GCJ_ARCHS), libgcj-bc$(OOO_GCJ_ARCHS)
else
- BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>=
1:4.4.1)$(OOO_NO_GCJ_ARCHS)
+ BUILD_DEPS += , gcj-jdk$(OOO_NO_GCJ_ARCHS), libgcj-common (>=
1:4.4.1)$(OOO_NO_GCJ_ARCHS)
endif
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@@ -1310,15 -1229,6 +1310,15 @@@ clean-debdir
dh_testdir
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
debian/*.triggers
rm -f $(STAMP_DIR)/setup
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ rm -rf debian/ttf-opensymbol \
+ debian/libreoffice$(VER)-common \
+ debian/libreoffice$(VER)-dev-doc \
+ debian/libreoffice$(VER)-java-common \
+ debian/libreoffice$(VER)-l10n-en-us \
+ debian/libreoffice$(VER)-core \
+ debian/libuno-cli-basetypes1.0-cil
+endif
dh_clean
# Clean compilation results, but leave solver (about 600Mb in addition to
instsetoo)
@@@ -1369,20 -1279,6 +1369,20 @@@ ifneq "$(OOO_L10N_DIR)" "
rm -rf $(OOO_L10N_DIR)
endif
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ rm -rf debian/ttf-opensymbol \
+ debian/libreoffice$(VER)-common \
+ debian/libreoffice$(VER)-dev-doc \
+ debian/libreoffice$(VER)-java-common \
+ debian/libreoffice$(VER)-l10n-en-us \
+ debian/libreoffice$(VER)-core \
+ debian/libuno-cli-basetypes1.0-cil
+ if [ -f libreoffice-build/distro-configs/UbuntuL10n.conf.in.saved ];
then \
+ mv libreoffice-build/distro-configs/UbuntuL10n.conf.in.saved \
+ libreoffice-build/distro-configs/UbuntuL10n.conf.in; \
+ fi
+endif
+
dh_clean
# Files created in debian directory
@@@ -1454,22 -1350,6 +1454,22 @@@ debian/control: $(wildcard debian/contr
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ awk '{print} /^ *$$/ {exit}' debian/control > debian/control.l10n
+ mv debian/control.l10n debian/control
+
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.l10n.in
+endif
+
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ awk '{print} /^ *$$/ {exit}' debian/control > debian/control.l10n
+ mv debian/control.l10n debian/control
+
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.l10n.in
+endif
+
ifeq "$(ENABLE_LDAP)" "y"
# build-depends might not be satified when running debian/rules
control. prevent bad subsitition with
# nothing (libldap--)
@@@ -1530,19 -1410,10 +1530,19 @@@ endi
LOCALES_DEPENDS="locales | belocs-locales-data |
locales-all" \
;; \
esac; \
+ L10N_COMMON=; \
+ if [ "$(USE_COMMON_DOCDIR)" = y ]; then \
+ case "$$LCODE" in \
+ en-us) ;; \
+ *) L10N_COMMON='libreofficeVER-l10n-common (>=
$${base-version}), '; \
+ esac; \
+ LOCALES_DEPENDS="libreoffice$(VER)-common (>=
\$${base-version}) | language-support-translations-$$CCODE,
libreoffice$(VER)-common (<< 1:\$${next-basis-version}~) |
language-support-translations-$$CCODE"; \
+ fi; \
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
-e "s|@FONT_SUGGESTS@|$$FONT_SUGGESTS|g" \
- -e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
+ -e "s;@LOCALES_DEPENDS@;$$LOCALES_DEPENDS;g" \
+ -e "s:@L10N_COMMON@:$$L10N_COMMON:g" \
-e "s|libreofficeVER|libreoffice$(VER)|g" \
-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
>> debian/control < debian/control.lang.in; \
@@@ -1564,7 -1435,6 +1564,7 @@@ ifneq "$(HELPISOS)" "
perl -pi -e 's|(Depends: libreoffice$(VER)-writer,
libreoffice$(VER)-l10n-en-us)|\1, ttf-devanagari-fonts|' \
debian/control
endif
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1632,7 -1502,6 +1632,7 @@@ ifeq "$(ENABLE_MYSQLNATIVE)" "y
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.mysql.in
endif
+endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
@@@ -1707,7 -1576,7 +1707,7 @@@ ifeq "$(BUILD_KDE)" "y
endif
ifeq "$(ENABLE_LDAP)" "y"
- perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client
library; needed for LibreOffice getting its profiles\n from LDAP/'
debian/control
+ perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client
library; needed for LibreOffice getting its\n profiles from LDAP/'
debian/control
endif
ifneq "$(DICT_DIR)" "/usr/share/hunspell"
@@@ -1748,13 -1617,6 +1748,13 @@@ $(OOO_BUILD_TREE)/config.status: $(OOO_
mkdir -p $(STAMP_DIR)
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ if [ ! -f libreoffice-build/distro-configs/UbuntuL10n.conf.in.saved ];
then \
+ cp -p libreoffice-build/distro-configs/UbuntuL10n.conf.in \
+ libreoffice-build/distro-configs/UbuntuL10n.conf.in.saved; \
+ fi
+endif
+
ifeq "$(USE_SOURCE_TARBALLS)" "y"
cp -a sources/* $(OOO_BUILD_TREE)/src
endif
@@@ -1877,9 -1739,9 +1877,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=/tmp $(MAKE)
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=/tmp $(MAKE)
endif
# apparently setting this here globally doesn't work, so hack around.
@@@ -1931,6 -1793,7 +1931,6 @@@ endi
export TMPDIR=$(CURDIR)/debian/smoketest; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
export SAL_USE_VCLPLUGIN="svp"; \
- export HOME=$(CURDIR)/debian/smoketest; \
../solenv/bin/build.pl
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
cd $(CURDIR)/debian/smoketest && \
@@@ -2031,11 -1894,7 +2031,11 @@@ endi
rm -rf debian/tmp/pkg/libreoffice-qa-tools
dh_installdirs -A
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
dh_install -A --sourcedir=debian/tmp/pkg --fail-missing
+else
+ dh_install -A --sourcedir=debian/tmp/pkg
+endif
rm -rf debian/tmp/pkg
@@@ -2058,7 -1917,6 +2058,7 @@@ endi
# add registered-components dir
mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
ifeq "$(ENABLE_JAVA)" "y"
# move officebean.jar into -officebean (They will be moved out of -core
# in the install-arch target). Do the /usr/share move here already
@@@ -2159,7 -2017,6 +2159,7 @@@ endi
# but the link is in -common so we need to do it here.
cd $(PKGDIR)-common/$(OOBASISDIR) && \
rm ure-link && ln -sf /$(OOUREDIR) ure-link
+endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
find debian/tmp ! -perm -200 | xargs -r chmod u+w
@@@ -2175,9 -2032,6 +2175,9 @@@ $(STAMP_DIR)/maintscripts: $(wildcard d
# generate maintainer scripts from *.in
for PKG in $(PACKAGES); do \
+ if [ "$(DIST)" = Ubuntu ]; then \
+ case $$PKG in *l10n-*|*help-*) continue; esac; \
+ fi; \
for FILE in postinst postrm preinst prerm triggers; do \
MAINTSCRIPT=debian/$$PKG.$$FILE ; \
if [ -e $$MAINTSCRIPT.in ]; then \
@@@ -2268,35 -2122,13 +2268,35 @@@ ifeq "$(DIST)" "Debian
done
endif
+ifeq "$(DIST)" "Ubuntu"
+ # install Ubuntu templates
+ otps=`cd debian/ubuntu; echo *.otp`; \
+ for iso in $(LANGPACKISOS); do \
+ [ "$$iso" = "en-US" ] && continue; \
+ pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+ mkdir -p
$(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
+ for otp in $$otps; do \
+ ln -sf ../../en-US/presnt/$$otp \
+ $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt/$$odt;
\
+ done; \
+ done
+endif
+
ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
+ ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
# move pt-BR ("BrOffice") splashs into -l10n-pt-br
mkdir -p $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png \
$(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/intro-pt_BR.png
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png \
$(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/about-pt_BR.png
+ else
+ # FIXME: -common is not installed
+ cp build/default_images/brand/intro-pt_BR.png \
+ $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/intro-pt_BR.png
+ cp build/default_images/brand/about-pt_BR.png \
+ $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/about-pt_BR.png
+ endif
else
# remove them, unneeded and would gerate file conflicts
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png
@@@ -2356,8 -2188,6 +2356,8 @@@ $(STAMP_DIR)/install-arch: $(STAMP_DIR)
dh_testroot
umask 022
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+
ifeq "$(ENABLE_EVO2)" "y"
debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
-r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
@@@ -2794,21 -2624,12 +2794,21 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
+ifeq "$(USE_COMMON_DOCDIR)" "y"
+ # install some docs (docdir of the uno-libs3 package).
+ mkdir -p $(PKGDIR)-base/usr/share/doc/uno-libs3
+ cp $(OOO_BUILD_TREE)/doc/using-mysql-databases.txt \
+ $(PKGDIR)-base/usr/share/doc/uno-libs3
+ cp $(OOO_BUILD_TREE)/doc/data-from-remote-mysql-server.txt \
+ $(PKGDIR)-base/usr/share/doc/uno-libs3
+else
# install some docs.
mkdir -p $(PKGDIR)-base/usr/share/doc/libreoffice$(VER)-base
cp $(OOO_BUILD_TREE)/doc/using-mysql-databases.txt \
$(PKGDIR)-base/usr/share/doc/libreoffice$(VER)-base
cp $(OOO_BUILD_TREE)/doc/data-from-remote-mysql-server.txt \
$(PKGDIR)-base/usr/share/doc/libreoffice$(VER)-base
+endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2912,7 -2733,6 +2912,7 @@@ endi
fi; \
done
+endif # ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
touch $@
@@@ -2925,7 -2745,6 +2925,7 @@@ $(STAMP_DIR)/install-indep: $(STAMP_DIR
dh_testdir
dh_testroot
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
perl -pi -e 's,/bin,/usr/bin,' \
debian/libreoffice$(VER)-emailmerge/$(OODIR)/program/mailmerge.py
@@@ -3234,12 -3053,6 +3234,12 @@@ ifeq "$(DIST)" "Debian
install -m644 debian/templates/*.otp
$(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
endif
+ifeq "$(DIST)" "Ubuntu"
+ # install Ubuntu templates
+ mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt
+ install -m644 debian/ubuntu/*.otp
$(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
+endif
+
ifeq "$(PACKAGE_SDK)" "y"
# add symlinks for docs and examples
cd $(PKGDIR)-dev-doc/$(OOSDKDIR) && \
@@@ -3372,21 -3185,8 +3372,21 @@@ endi
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/'
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
+endif # ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+
touch $@
+ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+# Simplified packaging, langpacks only
+
+binary-arch: $(STAMP_DIR)/binary-arch
+$(STAMP_DIR)/binary-arch:
+ : # nothing to do
+ touch $(STAMP_DIR)/install-arch
+ touch $@
+
+else
+
binary-arch: $(STAMP_DIR)/binary-arch
$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts
dh_testdir
@@@ -3397,10 -3197,9 +3397,10 @@@
rm -rf debian/$$pkg/DEBIAN;\
done
- dh_installdocs -s -A debian/README.Debian \
+ dh_installdocs -puno-libs3 debian/README.Debian \
$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/en-US/README_en-US
\
$(OOO_BUILD_TREE)/NEWS
+ dh_installdocs -s -Nuno-libs3
dh_installdebconf -s
dh_installman -s
for i in writer calc draw base math impress; do \
@@@ -3412,24 -3211,6 +3412,24 @@@
done; \
done
dh_installchangelogs -s -k
+ifeq "$(USE_COMMON_DOCDIR)" "y"
+ # arch dependent packages (with docdir symlinks)
+ for p in $$(dh_listpackages -s); do \
+ case "$$p" in \
+ uno-libs3) continue;; \
+ *) target=uno-libs3;; \
+ esac; \
+ rm -f
debian/$$p/usr/share/doc/$$p/{changelog.Debian,copyright,README.Debian}; \
+ for i in debian/$$p/usr/share/doc/$$p/*; do \
+ mkdir -p debian/$$p/usr/share/doc/$$target; \
+ mv $$i debian/$$p/usr/share/doc/$$target/; \
+ done; \
+ rmdir debian/$$p/usr/share/doc/$$p; \
+ ln -sf $$target debian/$$p/usr/share/doc/$$p; \
+ sed "s/@PKGNAME@/$$p/g;s/@PKGTARGET@/$$target/g" \
+ debian/deppackage.postinst.in >> debian/$$p.postinst; \
+ done
+endif
dh_installmime -s
dh_installmenu -s
ifeq "$(BUILD_JARS_NATIVE)" "y"
@@@ -3536,9 -3317,6 +3536,9 @@@ endi
-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'base-version=$(BASE_VERSION)' \
+ -V'next-base-version=$(NEXT_BASE_VERSION)' \
+ -V'basis-version=$(BASIS_VERSION)' \
+ -V'next-basis-version=$(NEXT_BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
@@@ -3592,7 -3370,6 +3592,7 @@@ endi
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
touch $@
+endif # binary-arch for openoffice.org source
binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control
$(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
@@@ -3614,7 -3391,6 +3614,7 @@@ endi
rm -rf debian/$$pkg/DEBIAN;\
done
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
ifeq "$(PACKAGE_SDK)" "y"
. $(SOURCE_TREE)/solenv/inc/udkversion.mk && \
for i in common cpp java; do \
@@@ -3646,11 -3422,9 +3646,11 @@@
# But fix it..
perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.udk-common-ref
endif
- dh_installdocs -i -A debian/README.Debian \
+endif
+ dh_installdocs -plibreoffice$(VER)-common debian/README.Debian \
$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/en-US/README_en-US
\
$(OOO_BUILD_TREE)/NEWS
+ dh_installdocs -i -Nlibreoffice$(VER)-common
# note libreoffice.1 is already installed into -common by
libreoffice-builds package-ooo
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
@@@ -3660,58 -3434,6 +3660,58 @@@
fi; \
done
dh_installchangelogs -i -k
+ifeq "$(USE_COMMON_DOCDIR)" "y"
+ ifneq "" "$(findstring openoffice.org$(VER)-common, $(PACKAGES))"
+ mkdir -p $(PKGDIR)-common/usr/share/doc/libreoffice$(VER)-common
+ install -m644 debian/README.Debian debian/copyright \
+ $(PKGDIR)-common/usr/share/doc/libreoffice$(VER)-common/
+ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+ dh_installdocs -pttf-opensymbol
+ dh_installchangelogs -pttf-opensymbol
+ endif
+ endif
+ # l10 & help packages (with docdir symlinks)
+ for PKG in \
+ $(HELP_PACKAGES) $(LANG_PACKAGES); \
+ do \
+ case $$PKG in \
+ *-l10n-in|*-l10n-za) continue;; \
+ *-l10n-en-us) target=libreoffice$(VER)-common;; \
+ *-help-en-us) target=libreoffice$(VER)-common;; \
+ *) target=libreoffice$(VER)-l10n-common; \
+ esac; \
+ rm -rf debian/$$PKG/usr/share/doc/$$PKG; \
+ mkdir -p debian/$$PKG/usr/share/doc; \
+ ln -sf $$target debian/$$PKG/usr/share/doc/$$PKG; \
+ rm -f debian/$$PKG.p*; \
+ rm -f debian/$$PKG/usr/share/doc/$$target/copyright; \
+ rm -f debian/$$PKG/usr/share/doc/$$target/changelog.Debian*; \
+ sed "s/@PKGNAME@/$$PKG/g;s/@PKGTARGET@/$$target/g" \
+ debian/deppackage.postinst.in > debian/$$PKG.postinst; \
+ done
+ # indep packages (with docdir symlinks)
+ for p in $$(dh_listpackages -i); do \
+ case "$$p" in \
+ ttf-opensymbol) continue;; \
+ *-l10n-in|*-l10n-za) target=libreoffice$(VER)-common;; \
+ openoffice.org-l10n-*|openoffice.org-help-*)
target=libreoffice$(VER)-l10n-common;; \
+ *-help-*|*-l10n-*) continue;; \
+
libreoffice$(VER)-common|libuno-cli-basetypes1.0-cil|ttf-opensymbol) continue;;
\
+ broffice) target=libreoffice;; \
+ *-cil) target=libuno-cli-basetypes1.0-cil;; \
+ *) target=libreoffice$(VER)-common;; \
+ esac; \
+ rm -f
debian/$$p/usr/share/doc/$$p/{changelog.Debian,copyright,README.Debian}; \
+ for i in debian/$$p/usr/share/doc/$$p/*; do \
+ mkdir -p debian/$$p/usr/share/doc/$$target; \
+ mv $$i debian/$$p/usr/share/doc/$$target/; \
+ done; \
+ rmdir debian/$$p/usr/share/doc/$$p; \
+ ln -sf $$target debian/$$p/usr/share/doc/$$p; \
+ sed "s/@PKGNAME@/$$p/g;s/@PKGTARGET@/$$target/g" \
+ debian/deppackage.postinst.in >> debian/$$p.postinst; \
+ done
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
@@@ -3722,19 -3444,15 +3722,19 @@@ ifeq "$(LENNY_BACKPORT)" "y
endif
dh_icons -i
dh_installxmlcatalogs -i
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
ifeq "$(ENABLE_MONO)" "y"
dh_installcligac -i
endif
+endif
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -i
dh_clideps -i
endif
+endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
-Nlibreoffice$(VER)-wiki-publisher \
@@@ -3746,11 -3464,9 +3746,11 @@@
-Nttf-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
+ -V'next-base-version=$(NEXT_BASE_VERSION)' \
-V'basis-version=$(BASIS_VERSION)' \
-V'next-basis-version=$(NEXT_BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
+ -V'l10n-common-depends=$(L10N_COMMON_DEPENDS)' \
-V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \
@@@ -3762,7 -3478,6 +3762,7 @@@
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
+ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
ifeq "$(ENABLE_MONO)" "y"
# although this version gets increased before every OOo release
# we need the +LibO anyway when we build milestones..
@@@ -3797,8 -3512,6 +3797,8 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+endif # "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+
dh_md5sums -i -Xjavasettingsunopkginstall.xml
dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
--
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/e1pshsz-0003nd...@alioth.debian.org
