The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit b226b7aee278b31e61364374e6873e2274ddab26
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Jul 18 15:17:27 2011 +0200
add fix-libreoffice-build-configure-in.diff, release as 3.4.1-1ubuntu1~ppa1
diff --git a/changelog b/changelog
index 5fd1776..0673333 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.1-1ubuntu1) UNRELEASED; urgency=medium
+libreoffice (1:3.4.1-1ubuntu1~ppa1) oneiric; urgency=medium
* merge of ubuntu-natty-3.3.1 and debian-experimental-3.4.0 branches
* remove libmono-dev deps
@@ -8,7 +8,7 @@ libreoffice (1:3.4.1-1ubuntu1) UNRELEASED; urgency=medium
* regenerate control
* refresh patch queue
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 06 Jul 2011
15:29:47 +0200
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Mon, 18 Jul 2011
15:11:52 +0200
libreoffice (1:3.3.3-1ubuntu1) natty; urgency=medium
diff --git a/patches/fix-libreoffice-build-configure-in.diff
b/patches/fix-libreoffice-build-configure-in.diff
new file mode 100644
index 0000000..8bcdd14
--- /dev/null
+++ b/patches/fix-libreoffice-build-configure-in.diff
@@ -0,0 +1,720 @@
+Index: libreoffice-3.4.1/libreoffice-build/configure
+===================================================================
+--- libreoffice-3.4.1.orig/libreoffice-build/configure 2011-07-18
11:56:23.836480512 +0200
++++ libreoffice-3.4.1/libreoffice-build/configure 2011-07-18
11:56:23.916480517 +0200
+@@ -7178,7 +7178,7 @@
+
+ ac_config_files="$ac_config_files intltool-extract intltool-merge
intltool-update"
+
+-ac_config_files="$ac_config_files Makefile bin/setup bin/Makefile
patches/dev300/system-python-ure-bootstrap.diff
patches/dev300/pyuno-ooodir.diff patches/dev300/system-python-uno-path.diff
patches/dev300/split-icons-search-usr-share.diff bin/piece/sys-setup
bin/piece/Makefile distro-configs/Makefile distro-configs/ArchLinux.conf
distro-configs/Ark.conf distro-configs/Common.conf
distro-configs/CommonLinux.conf distro-configs/CommonWin32.conf
distro-configs/CommonMac.conf distro-configs/CrossWin32.conf
distro-configs/DroplineGNOME.conf distro-configs/DroplineGNOME64.conf
distro-configs/Debian.conf distro-configs/DebianEtch.conf
distro-configs/DebianSarge.conf distro-configs/OOo4Kids.conf
distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWindows.conf
distro-configs/UbuntuL10n.conf distro-configs/UbuntuHardy.conf
distro-configs/UbuntuJaunty.conf distro-configs/UbuntuKarmic.conf
distro-configs/UbuntuLucid.conf distro-configs/UbuntuMaverick.conf
distro-configs/Ub
untuNatty.conf distro-configs/SUSE.conf distro-configs/SUSE-reduced.conf
distro-configs/SUSE-9.1.conf distro-configs/SUSE-9.2.conf
distro-configs/SUSE-9.3.conf distro-configs/SUSE-10.0.conf
distro-configs/SUSE-10.1.conf distro-configs/SUSE-10.2.conf
distro-configs/SUSE-10.3.conf distro-configs/SUSE-11.0.conf
distro-configs/SUSE-11.1.conf distro-configs/SUSE-11.2.conf
distro-configs/Slackware.conf distro-configs/Mandriva.conf
distro-configs/Mandriva64.conf distro-configs/NovellWin32.conf
distro-configs/NovellWin32ISO.conf distro-configs/Gentoo.conf
distro-configs/Frugalware.conf distro-configs/openmamba.conf
distro-configs/translate-org-za-linux.conf
distro-configs/translate-org-za-win32.conf distro-configs/rpl2.conf
distro-configs/rpl2-64.conf distro-configs/Pardus2007.conf
distro-configs/Pardus2008.conf distro-configs/PlainLinux.conf
distro-configs/Win32.conf distro-configs/Solaris.conf
distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeLinux.conf
distro-configs
/LibreOfficeLinuxDevel.conf distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeOpenBSD.conf etc/Makefile extensions/Makefile
extensions/tweakconfig/Makefile patches/apply.pl patches/Makefile
patches/dev300/Makefile patches/hotfixes/Makefile patches/vba/Makefile
patches/mono/Makefile patches/postgresql/Makefile patches/64bit/Makefile
po/Makefile po/sdf-templates/Makefile doc/Makefile src/helpcontent2/Makefile
src/icons/Makefile src/icons/tango/Makefile src/layout/Makefile
src/sdf/Makefile stamp/Makefile templates/Makefile man/Makefile"
++ac_config_files="$ac_config_files Makefile bin/setup bin/Makefile
patches/dev300/system-python-ure-bootstrap.diff
patches/dev300/pyuno-ooodir.diff patches/dev300/system-python-uno-path.diff
patches/dev300/split-icons-search-usr-share.diff bin/piece/sys-setup
bin/piece/Makefile distro-configs/Makefile distro-configs/ArchLinux.conf
distro-configs/Ark.conf distro-configs/Common.conf
distro-configs/CommonLinux.conf distro-configs/CommonWin32.conf
distro-configs/CommonMac.conf distro-configs/CrossWin32.conf
distro-configs/DroplineGNOME.conf distro-configs/DroplineGNOME64.conf
distro-configs/Debian.conf distro-configs/DebianEtch.conf
distro-configs/DebianSarge.conf distro-configs/OOo4Kids.conf
distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWindows.conf
distro-configs/UbuntuL10n.conf distro-configs/UbuntuHardy.conf
distro-configs/UbuntuJaunty.conf distro-configs/UbuntuKarmic.conf
distro-configs/UbuntuLucid.conf distro-configs/UbuntuMaverick.conf
distro-configs/Ub
untuNatty.conf distro-configs/SUSE.conf distro-configs/SUSE-reduced.conf
distro-configs/SUSE-9.1.conf distro-configs/SUSE-9.2.conf
distro-configs/SUSE-9.3.conf distro-configs/SUSE-10.0.conf
distro-configs/SUSE-10.1.conf distro-configs/SUSE-10.2.conf
distro-configs/SUSE-10.3.conf distro-configs/SUSE-11.0.conf
distro-configs/SUSE-11.1.conf distro-configs/SUSE-11.2.conf
distro-configs/Slackware.conf distro-configs/Mandriva.conf
distro-configs/Mandriva64.conf distro-configs/NovellWin32.conf
distro-configs/NovellWin32ISO.conf distro-configs/Gentoo.conf
distro-configs/Frugalware.conf distro-configs/openmamba.conf
distro-configs/translate-org-za-linux.conf
distro-configs/translate-org-za-win32.conf distro-configs/rpl2.conf
distro-configs/rpl2-64.conf distro-configs/Pardus2007.conf
distro-configs/Pardus2008.conf distro-configs/PlainLinux.conf
distro-configs/Win32.conf distro-configs/Solaris.conf
distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeLinux.conf
distro-configs
/LibreOfficeLinuxDevel.conf distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeOpenBSD.conf etc/Makefile extensions/Makefile
extensions/tweakconfig/Makefile patches/apply.pl patches/Makefile
patches/dev300/Makefile patches/hotfixes/Makefile patches/vba/Makefile
patches/mono/Makefile patches/postgresql/Makefile patches/64bit/Makefile
po/Makefile po/sdf-templates/Makefile doc/Makefile src/Makefile
src/helpcontent2/Makefile src/icons/Makefile src/icons/tango/Makefile
src/layout/Makefile src/sdf/Makefile stamp/Makefile templates/Makefile
man/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -8019,6 +8019,7 @@
+ "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+ "po/sdf-templates/Makefile") CONFIG_FILES="$CONFIG_FILES
po/sdf-templates/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/helpcontent2/Makefile") CONFIG_FILES="$CONFIG_FILES
src/helpcontent2/Makefile" ;;
+ "src/icons/Makefile") CONFIG_FILES="$CONFIG_FILES src/icons/Makefile" ;;
+ "src/icons/tango/Makefile") CONFIG_FILES="$CONFIG_FILES
src/icons/tango/Makefile" ;;
+Index: libreoffice-3.4.1/libreoffice-build/configure.in
+===================================================================
+--- libreoffice-3.4.1.orig/libreoffice-build/configure.in 2011-07-06
15:39:49.000000000 +0200
++++ libreoffice-3.4.1/libreoffice-build/configure.in 2011-07-18
11:56:23.916480517 +0200
+@@ -1873,6 +1873,7 @@
+ po/Makefile
+ po/sdf-templates/Makefile
+ doc/Makefile
++src/Makefile
+ src/helpcontent2/Makefile
+ src/icons/Makefile
+ src/icons/tango/Makefile
+Index: libreoffice-3.4.1/libreoffice-build/src/Makefile.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.4.1/libreoffice-build/src/Makefile.in 2011-07-18
11:56:23.916480517 +0200
+@@ -0,0 +1,682 @@
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++subdir = src
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
++SOURCES =
++DIST_SOURCES =
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
++ distdir
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++am__relativize = \
++ dir0=`pwd`; \
++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
++ sed_rest='s,^[^/]*/*,,'; \
++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
++ sed_butlast='s,/*[^/]*$$,,'; \
++ while test -n "$$dir1"; do \
++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
++ if test "$$first" != "."; then \
++ if test "$$first" = ".."; then \
++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
++ else \
++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
++ if test "$$first2" = "$$first"; then \
++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
++ else \
++ dir2="../$$dir2"; \
++ fi; \
++ dir0="$$dir0"/"$$first"; \
++ fi; \
++ fi; \
++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
++ done; \
++ reldir="$$dir2"
++ACLOCAL = @ACLOCAL@
++ACONF = @ACONF@
++AGFA_MONOTYPE_FONTS_SOURCE = @AGFA_MONOTYPE_FONTS_SOURCE@
++AMTAR = @AMTAR@
++APACHE_ANT_TARBALL = @APACHE_ANT_TARBALL@
++APPLY_DIR = @APPLY_DIR@
++ARCHITECTURE = @ARCHITECTURE@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++BARCODE_EXTENSION = @BARCODE_EXTENSION@
++BISON = @BISON@
++BUILDDIR = @BUILDDIR@
++BUILD_MOZILLA_SOURCE = @BUILD_MOZILLA_SOURCE@
++BUILD_NCPUS = @BUILD_NCPUS@
++BUILD_WIN32 = @BUILD_WIN32@
++CABEXTRACT = @CABEXTRACT@
++CAIRO_CONFIGURE_FLAG = @CAIRO_CONFIGURE_FLAG@
++CAIRO_ENABLED = @CAIRO_ENABLED@
++CAIRO_VER = @CAIRO_VER@
++CC = @CC@
++CCACHE = @CCACHE@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CLONEDIR = @CLONEDIR@
++COMPAT_OOWRAPPERS = @COMPAT_OOWRAPPERS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEFUZZ_PATCHES = @DEFUZZ_PATCHES@
++DEJAVU_FONTS_PACK_NAME = @DEJAVU_FONTS_PACK_NAME@
++DEJAVU_FONTS_VER = @DEJAVU_FONTS_VER@
++DEPDIR = @DEPDIR@
++DIAGRAM_EXTENSION = @DIAGRAM_EXTENSION@
++DISTCC = @DISTCC@
++DISTRO = @DISTRO@
++DRINK = @DRINK@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_ACCESS = @ENABLE_ACCESS@
++ENABLE_BINFILTER = @ENABLE_BINFILTER@
++ENABLE_CCACHE = @ENABLE_CCACHE@
++ENABLE_DISTCC = @ENABLE_DISTCC@
++ENABLE_EXTENSIONS = @ENABLE_EXTENSIONS@
++ENABLE_GRAPHITE = @ENABLE_GRAPHITE@
++ENABLE_ICECREAM = @ENABLE_ICECREAM@
++ENABLE_MONO = @ENABLE_MONO@
++ENABLE_ODK = @ENABLE_ODK@
++EXEEXT = @EXEEXT@
++FLEX = @FLEX@
++FOO_GTK_CFLAGS = @FOO_GTK_CFLAGS@
++FOO_GTK_LIBS = @FOO_GTK_LIBS@
++GET_CMD = @GET_CMD@
++GITTAG = @GITTAG@
++GNUPATCH = @GNUPATCH@
++GNUTAR = @GNUTAR@
++GOOGLE_DOCS_EXTENSION = @GOOGLE_DOCS_EXTENSION@
++GREP = @GREP@
++HUNART_EXTENSION = @HUNART_EXTENSION@
++ICECREAM_BINDIR = @ICECREAM_BINDIR@
++INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLTOOL_PERL = @INTLTOOL_PERL@
++LANGUAGETOOL_EXTENSION = @LANGUAGETOOL_EXTENSION@
++LDFLAGS = @LDFLAGS@
++LIBERATION_FONTS_VER = @LIBERATION_FONTS_VER@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIGHTPROOF_FILENAMES = @LIGHTPROOF_FILENAMES@
++LIGHTPROOF_LANG = @LIGHTPROOF_LANG@
++LTLIBOBJS = @LTLIBOBJS@
++MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP = @MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@
++MAINT = @MAINT@
++MAKEINFO = @MAKEINFO@
++MAX_JOBS = @MAX_JOBS@
++MDBTOOLS_SRC = @MDBTOOLS_SRC@
++MINIMUM_REQS_CFLAGS = @MINIMUM_REQS_CFLAGS@
++MINIMUM_REQS_LIBS = @MINIMUM_REQS_LIBS@
++MIRROR = @MIRROR@
++MKDIR_P = @MKDIR_P@
++MONO_GAC_ROOT = @MONO_GAC_ROOT@
++NLPSOLVER_EXTENSION = @NLPSOLVER_EXTENSION@
++NUMBERTEXT_EXTENSION = @NUMBERTEXT_EXTENSION@
++OBJEXT = @OBJEXT@
++OOBUILDDIR = @OOBUILDDIR@
++OOOBLOGGER_EXTENSION = @OOOBLOGGER_EXTENSION@
++OOOINSTALLDIRNAME = @OOOINSTALLDIRNAME@
++OOOP_FONTS_PACK = @OOOP_FONTS_PACK@
++OOOP_GALLERY_PACK = @OOOP_GALLERY_PACK@
++OOOP_SAMPLES_PACK = @OOOP_SAMPLES_PACK@
++OOOP_TEMPLATES_PACK = @OOOP_TEMPLATES_PACK@
++OOO_ADDITIONAL_SECTIONS = @OOO_ADDITIONAL_SECTIONS@
++OOO_BINSUFFIX = @OOO_BINSUFFIX@
++OOO_BUILDVERSION = @OOO_BUILDVERSION@
++OOO_BUILD_NOARCH = @OOO_BUILD_NOARCH@
++OOO_CUSTOM_IMAGES = @OOO_CUSTOM_IMAGES@
++OOO_EXTRA_ARTWORK = @OOO_EXTRA_ARTWORK@
++OOO_GIT = @OOO_GIT@
++OOO_GIT_MANAGED = @OOO_GIT_MANAGED@
++OOO_LANGS = @OOO_LANGS@
++OOO_POOR_HELP_LOCALIZATIONS = @OOO_POOR_HELP_LOCALIZATIONS@
++OOO_SOURCEDIRNAME = @OOO_SOURCEDIRNAME@
++OOO_SOURCEVERSION = @OOO_SOURCEVERSION@
++OOO_STRIP = @OOO_STRIP@
++OOO_VERSION = @OOO_VERSION@
++OOO_WIDGET_FLAGS = @OOO_WIDGET_FLAGS@
++OPENCLIPART_DIR = @OPENCLIPART_DIR@
++OPENCLIPART_VER = @OPENCLIPART_VER@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PERL = @PERL@
++PIECE = @PIECE@
++PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
++PREBUILT_WRITINGAIDS_TIMESTAMP = @PREBUILT_WRITINGAIDS_TIMESTAMP@
++PROPAGATED_ARGS = @PROPAGATED_ARGS@
++RAWBUILDDIR = @RAWBUILDDIR@
++RSYNC = @RSYNC@
++RUN_POST_INSTALL_SCRIPTS = @RUN_POST_INSTALL_SCRIPTS@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++SNAPSHOT_TAG = @SNAPSHOT_TAG@
++SOURCE_TYPE = @SOURCE_TYPE@
++SPLIT = @SPLIT@
++SPLIT_APP_MODULES = @SPLIT_APP_MODULES@
++SPLIT_OPT_FEATURES = @SPLIT_OPT_FEATURES@
++SRCDIR = @SRCDIR@
++STRIP = @STRIP@
++SUNTEMPLATES_LANG = @SUNTEMPLATES_LANG@
++SYSTEM_CAIRO = @SYSTEM_CAIRO@
++SYSTEM_GCC = @SYSTEM_GCC@
++SYSTEM_LIBWPD = @SYSTEM_LIBWPD@
++SYSTEM_LIBWPG = @SYSTEM_LIBWPG@
++SYSTEM_LIBWPS = @SYSTEM_LIBWPS@
++SYSTEM_MDBTOOLS = @SYSTEM_MDBTOOLS@
++SYSTEM_MDDS = @SYSTEM_MDDS@
++SYSTEM_ZLIB = @SYSTEM_ZLIB@
++TOOLSDIR = @TOOLSDIR@
++TYPO_EXTENSION = @TYPO_EXTENSION@
++UPSTREAM_NAME = @UPSTREAM_NAME@
++UPSTREAM_URI = @UPSTREAM_URI@
++VALIDATOR_EXTENSION = @VALIDATOR_EXTENSION@
++VENDORNAME = @VENDORNAME@
++VERSION = @VERSION@
++WATCH_WINDOW_EXTENSION = @WATCH_WINDOW_EXTENSION@
++WITH_ARCH_FLAGS = @WITH_ARCH_FLAGS@
++WITH_BARCODE = @WITH_BARCODE@
++WITH_DIAGRAM = @WITH_DIAGRAM@
++WITH_GOOGLE_DOCS = @WITH_GOOGLE_DOCS@
++WITH_HUNART = @WITH_HUNART@
++WITH_LANGUAGETOOL = @WITH_LANGUAGETOOL@
++WITH_NLPSOLVER = @WITH_NLPSOLVER@
++WITH_NUMBERTEXT = @WITH_NUMBERTEXT@
++WITH_OOOBLOGGER = @WITH_OOOBLOGGER@
++WITH_TYPO = @WITH_TYPO@
++WITH_VALIDATOR = @WITH_VALIDATOR@
++WITH_WATCH_WINDOW = @WITH_WATCH_WINDOW@
++XSLTPROC = @XSLTPROC@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
++ac_ct_CC = @ac_ct_CC@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build_alias = @build_alias@
++builddir = @builddir@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++png_CFLAGS = @png_CFLAGS@
++png_LIBS = @png_LIBS@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++SUBDIRS = helpcontent2 icons layout sdf
++EXTRA_DIST = \
++ default_images \
++ ${wildcard *.dic} \
++ Draft.jpg \
++ banner_go-oo.bmp \
++ banner_nld.bmp \
++ cli_uno_bridge.dll.config.in \
++ mono-ooo.pc.in \
++ nologoinstall_go-oo.bmp \
++ nologoinstall_nld.bmp \
++ ooosetup_go-oo.ico \
++ ooobanner_go-oo.bmp \
++ ooobitmap_go-oo.bmp \
++ openintro_go-oo.png \
++ openabout_go-oo.png \
++ ooosetup_nld.ico \
++ ooobanner_nld.bmp \
++ ooobitmap_nld.bmp \
++ openintro_nld.png \
++ openintro_nld_eval.png \
++ openabout_nld.png \
++ openintro_ark.png \
++ openabout_ark.png \
++ openintro_fw.png \
++ openabout_fw.png \
++ openintro_gentoo.png \
++ openintro_translateorgza.png \
++ openabout_translateorgza.png \
++ openintro_pld.png \
++ openabout_pld.png \
++ sg3.sdg sg3.sdv sg3.thm \
++ sofficerc-upstream \
++ tango_mainapp_16.png \
++ glib-1.2.10-ooo.patch \
++ libIDL-0.6.8-ooo.patch \
++ go-oo-team.png
++
++all: all-recursive
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++# (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
++ @fail= failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
++ dot_seen=no; \
++ target=`echo $@ | sed s/-recursive//`; \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ echo "Making $$target in $$subdir"; \
++ if test "$$subdir" = "."; then \
++ dot_seen=yes; \
++ local_target="$$target-am"; \
++ else \
++ local_target="$$target"; \
++ fi; \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || eval $$failcom; \
++ done; \
++ if test "$$dot_seen" = "no"; then \
++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++ fi; test -z "$$fail"
++
++$(RECURSIVE_CLEAN_TARGETS):
++ @fail= failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
++ dot_seen=no; \
++ case "$@" in \
++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++ *) list='$(SUBDIRS)' ;; \
++ esac; \
++ rev=''; for subdir in $$list; do \
++ if test "$$subdir" = "."; then :; else \
++ rev="$$subdir $$rev"; \
++ fi; \
++ done; \
++ rev="$$rev ."; \
++ target=`echo $@ | sed s/-recursive//`; \
++ for subdir in $$rev; do \
++ echo "Making $$target in $$subdir"; \
++ if test "$$subdir" = "."; then \
++ local_target="$$target-am"; \
++ else \
++ local_target="$$target"; \
++ fi; \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || eval $$failcom; \
++ done && test -z "$$fail"
++tags-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
tags); \
++ done
++ctags-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
++ done
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++tags: TAGS
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ set x; \
++ here=`pwd`; \
++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++ include_option=--etags-include; \
++ empty_fix=.; \
++ else \
++ include_option=--include; \
++ empty_fix=; \
++ fi; \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ test ! -f $$subdir/TAGS || \
++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
++ fi; \
++ done; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
++ fi
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ test -z "$(CTAGS_ARGS)$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
++ fi; \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
++ fi; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++ else \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
++ || exit 1; \
++ fi; \
++ done
++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ test -d "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || exit 1; \
++ fi; \
++ done
++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
++ $(am__relativize); \
++ new_distdir=$$reldir; \
++ dir1=$$subdir; dir2="$(top_distdir)"; \
++ $(am__relativize); \
++ new_top_distdir=$$reldir; \
++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
++ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
++ ($(am__cd) $$subdir && \
++ $(MAKE) $(AM_MAKEFLAGS) \
++ top_distdir="$$new_top_distdir" \
++ distdir="$$new_distdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
++ am__skip_mode_fix=: \
++ distdir) \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-recursive
++all-am: Makefile
++installdirs: installdirs-recursive
++installdirs-am:
++install: install-recursive
++install-exec: install-exec-recursive
++install-data: install-data-recursive
++uninstall: uninstall-recursive
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-recursive
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-recursive
++
++clean-am: clean-generic mostlyclean-am
++
++distclean: distclean-recursive
++ -rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-tags
++
++dvi: dvi-recursive
++
++dvi-am:
++
++html: html-recursive
++
++html-am:
++
++info: info-recursive
++
++info-am:
++
++install-data-am:
++
++install-dvi: install-dvi-recursive
++
++install-dvi-am:
++
++install-exec-am:
++
++install-html: install-html-recursive
++
++install-html-am:
++
++install-info: install-info-recursive
++
++install-info-am:
++
++install-man:
++
++install-pdf: install-pdf-recursive
++
++install-pdf-am:
++
++install-ps: install-ps-recursive
++
++install-ps-am:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-recursive
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-generic
++
++pdf: pdf-recursive
++
++pdf-am:
++
++ps: ps-recursive
++
++ps-am:
++
++uninstall-am:
++
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
++ install-am install-strip tags-recursive
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic ctags \
++ ctags-recursive distclean distclean-generic distclean-tags \
++ distdir dvi dvi-am html html-am info info-am install \
++ install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
++ tags-recursive uninstall uninstall-am
++
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
diff --git a/patches/series b/patches/series
index 8ff212e..cd2e28a 100644
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@ mips-openjdk-jre-paths.diff
autogen.diff
ubuntufixes.diff
libreoffice-build-161a3f9f2229675e083e0806e8171cb0b3145168.diff
+fix-libreoffice-build-configure-in.diff
--
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/e1qinjx-0002o2...@vasks.debian.org
