r828 ./packages/openofficeorg/2.3/experimental: remove debian/rules-increasing/complicating Ubuntu stuff again; update xulrunner conditional for this and a upstream change anyway (simplify), OPENGL_SUPPORT should default to no
------------------------------------------------------------
revno: 828
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-07 00:43:37 +0200
message:
remove debian/rules-increasing/complicating Ubuntu stuff again; update xulrunner conditional for this and a upstream change anyway (simplify), OPENGL_SUPPORT should default to no
removed:
control.2.in
control.help.in
control.l10n.in
control.ubuntu.in
convert2po
gsifilter.py
modified:
changelog
control
control.in
rules
soffice.sh
=== removed file 'control.2.in'
--- a/control.2.in 2007-08-06 15:19:00 +0000
+++ b/control.2.in 1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-Package: openoffice.org2
-Architecture: all
-Depends: openoffice.org (>> ${base-version})
-Description: Transitional package to openoffice.org
- This package is a transitional package for upgrading to the new
- openoffice.org.
- .
- It can be safely removed when openoffice.org is installed.
-
-Package: openoffice.org2-writer
-Architecture: all
-Depends: openoffice.org-writer (>> ${base-version})
-Description: Transitional package to openoffice.org-writer
- This package is a transitional package for upgrading to the new
- openoffice.org-writer.
- .
- It can be safely removed when openoffice.org-writer is installed.
-
-Package: openoffice.org2-calc
-Architecture: all
-Depends: openoffice.org-calc (>> ${base-version})
-Description: Transitional package to openoffice.org-calc
- This package is a transitional package for upgrading to the new
- openoffice.org-calc.
- .
- It can be safely removed when openoffice.org-calc is installed.
-
-Package: openoffice.org2-impress
-Architecture: all
-Depends: openoffice.org-impress (>> ${base-version})
-Description: Transitional package to openoffice.org-impress
- This package is a transitional package for upgrading to the new
- openoffice.org-impress.
- .
- It can be safely removed when openoffice.org-impress is installed.
-
-Package: openoffice.org2-draw
-Architecture: all
-Depends: openoffice.org-draw (>> ${base-version})
-Description: Transitional package to openoffice.org-draw
- This package is a transitional package for upgrading to the new
- openoffice.org-draw.
- .
- It can be safely removed when openoffice.org-draw is installed.
-
-Package: openoffice.org2-base
-Architecture: all
-Depends: openoffice.org-base (>> ${base-version})
-Description: Transitional package to openoffice.org-base
- This package is a transitional package for upgrading to the new
- openoffice.org-base.
- .
- It can be safely removed when openoffice.org-base is installed.
-
-Package: openoffice.org2-math
-Architecture: all
-Depends: openoffice.org-math (>> ${base-version})
-Description: Transitional package to openoffice.org-math
- This package is a transitional package for upgrading to the new
- openoffice.org-math.
- .
- It can be safely removed when openoffice.org-math is installed.
-
-Package: openoffice.org2-gnome
-Architecture: all
-Depends: openoffice.org-gnome (>> ${base-version})
-Section: gnome
-Description: Transitional package to openoffice.org-gnome
- This package is a transitional package for upgrading to the new
- openoffice.org-gnome.
- .
- It can be safely removed when openoffice.org-gnome is installed.
-
-Package: openoffice.org2-kde
-Architecture: all
-Depends: openoffice.org-kde (>> ${base-version})
-Section: kde
-Description: Transitional package to openoffice.org-kde
- This package is a transitional package for upgrading to the new
- openoffice.org-kde.
- .
- It can be safely removed when openoffice.org-kde is installed.
-
-Package: openoffice.org2-evolution
-Architecture: i386 powerpc sparc
-Depends: openoffice.org-evolution (>> ${base-version})
-Section: gnome
-Description: Transitional package to openoffice.org-evolution
- This package is a transitional package for upgrading to the new
- openoffice.org-evolution.
- .
- It can be safely removed when openoffice.org-evolution is installed.
-
=== removed file 'control.help.in'
--- a/control.help.in 2007-08-01 18:14:46 +0000
+++ b/control.help.in 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Package: openoffice.orgVER-help-@LCODE@
-Architecture: all
-Section: doc
-Recommends: openoffice.orgVER-core (>> ${base-version}) | language-support-@CCODE@
-Depends: openoffice.orgVER-writer, openoffice.orgVER-l10n-@LCODE@
-Conflicts: openoffice.org-common (<= 2.0.0-1),
- openoffice.org-core (<< ${base-version})
-Provides: openoffice.org-help-${help-l10n-virtual-version}
-Description: @LNAME@ help for OpenOffice.org
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the help of OpenOffice.org in
- @LNAME@.
-
=== removed file 'control.l10n.in'
--- a/control.l10n.in 2007-08-06 15:19:00 +0000
+++ b/control.l10n.in 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Package: openoffice.orgVER-l10n-common
-Pre-Depends: dpkg (>= 1.10.24)
-Conflicts: openoffice.org-l10n-km, openoffice.org-l10n-ar, openoffice.org-l10n-sh-yu
-Architecture: all
-Description: common files for OpenOffice.org language and help packages
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains common files for the OpenOffice.org language
- and help packages.
-
=== removed file 'control.ubuntu.in'
--- a/control.ubuntu.in 2007-08-06 15:19:00 +0000
+++ b/control.ubuntu.in 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Package: openoffice.orgVER-l10n-en-us
-Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version}) | language-support-en
-Description: English_american language package for OpenOffice.org
- This package is a transitional package for upgrading to the new
- openoffice.orgVER-common containing the -l10n-en-us files.
- .
- It can be safely removed when openoffice.orgVER-common is installed.
-
-Package: openoffice.orgVER-style-default
-Architecture: all
-Depends: openoffice.orgVER-style-andromeda (= ${Source-Version})
-Description: Default symbol style for OpenOffice.org
- This package is a transitional package for upgrading to the renamed
- openoffice.orgVER-style-andromeda style package.
- .
- It can be safely removed when openoffice.orgVER-style-andromeda is installed.
-
=== removed file 'convert2po'
--- a/convert2po 2007-08-06 15:19:00 +0000
+++ b/convert2po 1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-#! /bin/bash
-
-basedir=debian/l10n
-
-_convert2po()
-{
- local lc=${1#*_*}
- lc=${lc%*.sdf}
-
- rm -rf $basedir/$lc
- mkdir -p $basedir/$lc
- $basedir/../splitgsi $basedir/export/GSI_$lc.sdf $basedir/$lc
- cd $basedir/$lc
- for f in *.sdf; do
- d=${f%*.sdf}
- mkdir -p ../$d $d
- if [ "$lc" = en-US ]; then
- oo2po -P --progress=names --multifile=onefile -o ../$d/$d.pot $f
- else
- oo2po --progress=names --multifile=onefile -l $lc -o ../$d/$lc.po $f
- fi
- rmdir $d
- done
- cd - >/dev/null
- rm -rf $basedir/$lc
-}
-
-_convert2po_nosplit()
-{
- local lc=${1#*_*}
- lc=${lc%*.sdf}
-
- rm -rf $basedir/$lc
- mkdir -p $basedir/$lc
- gsi=$basedir/export/GSI_$lc.sdf
- if [ "$lc" = en-US ]; then
- oo2po -P --progress=names --multifile=single -o $basedir/$lc $gsi
- for f in $(cd $basedir/$lc && find * -type f); do
- d=${f%*.pot}
- mkdir -p $basedir/po/$d
- mv -f $basedir/$lc/$f $basedir/po/$d/${f##*/}
- done
- else
- oo2po --progress=names --multifile=single -l $lc -o $basedir/$lc $gsi
- for f in $(cd $basedir/$lc && find * -type f); do
- d=${f%*.po}
- mkdir -p $basedir/po/$d
- mv -f $basedir/$lc/$f $basedir/po/$d/$lc.po
- done
- fi
- rm -rf $basedir/$lc
-}
-
-lc2rlc()
-{
- local rlc
- lc=$(echo $1 | tr - _)
- case "$lc" in
- *_IN) lc=${lc%*_IN};;
- be_BY) lc=be;;
- sr_CS) lc=sr;;
- ti_ER) lc=ti;;
- esac
- echo $lc
-}
-
-export PYTHONPATH=~/translate
-
-oldbasedir=../source/debian/l10n
-newbasedir=$(pwd)/ubuntu/l10n
-rosettadir=$(pwd)/../ooo-dapper-2006-08-30
-
-_convert2oo()
-{
- local lc=$1
- [ "$lc" = en-US ] && return
- rm -rf $newbasedir/$lc
- mkdir -p $newbasedir/$lc
- $basedir/../splitgsi $oldbasedir/export/GSI_$lc.sdf $newbasedir/$lc
- rlc=$(lc2rlc $lc)
- cd $newbasedir/$lc
- for f in *.sdf; do
- d=${f%*.sdf}
- po=$rosettadir/rosetta-$d/$lc.po
- if [ $lc != $rlc ]; then
- ln -sf $rlc.po $rosettadir/rosetta-$d/$lc.po
- fi
- [ -f $po ] || continue
- echo $d
- cp -p $d.sdf $d.oo
- po2oo --multifile=onefile -l $lc -i $po -o ${f}2 -t $d.oo
- rm -f $d.oo
- done
- mkdir unused
- mv ooo-guide-* ooo-help-* unused/
- cat *.sdf2 > ../GSI_$lc.sdf
- cd - >/dev/null
-}
-
-convert=`basename $0`
-
-for lc in "$@"; do
- echo $convert $lc
- _${convert}_nosplit $lc
-done
=== removed file 'gsifilter.py'
--- a/gsifilter.py 2007-08-06 15:19:00 +0000
+++ b/gsifilter.py 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-#! /usr/bin/python
-
-import os
-import sys
-from translate.storage import oo
-
-debug = False
-
-def dupfilter(mf, comment, fn):
- n_all = n_translated = n_untranslated = n_same = 0
- new_sources = []
- for oofile in mf.listsubfiles():
- of = mf.getoofile(oofile)
- if oofile.startswith('helpcontent2'):
- try:
- elements = of.ooelements
- except:
- elements = of.units
- for el in elements:
- n_all += 1
- if len(el.lines) == 1:
- if debug:
- print "WARNING: %s: no translation (%d lines)" % (helpfile, len(el.lines))
- n_untranslated += 1
- continue
- if len(el.lines) > 2:
- if debug:
- print "WARNING: %s: too many translations (%d lines)" % (helpfile, len(el.lines))
- print " ", el.lines[0].project, el.lines[0].sourcefile, el.lines[0].groupid,el.lines[0].localid
- continue
- if el.lines[0].text == el.lines[1].text \
- and el.lines[0].helptext == el.lines[1].helptext \
- and el.lines[0].quickhelptext == el.lines[1].quickhelptext:
- n_same += 1
- if debug:
- print "Not translated: %s/%s/%s" % (el.lines[0].text, el.lines[0].helptext, el.lines[0].quickhelptext)
- print " %s/%s/%s" % (el.lines[1].text, el.lines[1].helptext, el.lines[1].quickhelptext)
- el.lines = [line for line in el.lines if line.languageid == "en-US"]
- else:
- n_translated += 1
- new_sources.append(str(of))
-
- try:
- ratio = n_translated / float(n_all) * 100
- except:
- ratio = 0.0
- print "%s: %15s: %4.1f%%, lines=%5d, translated=%5d, untranslated=%5d, same=%5d" \
- % (comment, os.path.basename(fn), ratio, n_all, n_translated, n_untranslated, n_same)
- print "\tremoved %d translations with same text" % n_same
- sys.stdout.flush()
-
- return ''.join(new_sources)
-
-if __name__ == '__main__':
- for fn in sys.argv[1:]:
- try:
- mf = oo.oomultifile(fn)
- except Exception, msg:
- sys.stdout.write("ERROR reading %s: %s\n" % (fn, msg))
- sys.stdout.flush()
- sys.exit(1)
-
- filtered = dupfilter(mf, "help", fn)
-
- fd = file(fn + '.tmp', 'w')
- fd.write(filtered)
- fd.close()
=== modified file 'changelog'
--- a/changelog 2007-08-06 15:19:00 +0000
+++ b/changelog 2007-08-06 22:43:37 +0000
@@ -2,33 +2,16 @@
* debian/control.in:
- build-conflict against gjdoc (= 0.7.8-2) [RE]
- * debian/control.2.in:
- - added from Ubuntu [CC]
- * debian/control.l10n.in:
- - added from Ubuntu [CC]
- * debian/control.ubuntu.in:
- - added from Ubuntu [CC]
- * debian/convert2po:
- - added from Ubuntu [CC]
- * debian/deppackage.postinst.in:
- - added from Ubuntu [CC]
- * debian/gsifilter.py:
- - added from Ubuntu [CC]
- * debian/gsistat.py:
- - added from Ubuntu [CC]
- * debian/module-po.map:
- - added from Ubuntu [CC]
* debian/rules:
- - add images_human support [CC]
- - add Ubuntu translations support [CC]
- - add openoffice.org-l10n source support [CC]
- clean up multi-threaded build support [CC]
- * debian/soffice.sh:
- - added from Ubuntu [CC]
- * debian/splitgsi:
- - added from Ubuntu [CC]
+ * debian/*:
+ - remove Ubuntu conditionals added in -1 again, it makes
+ the rules for Debian even harder to read/understand than
+ it's even now...
+ * debian/soffice.sh, debian/rules:
+ - install /etc/openoffice/soffice.sh, merged from Ubuntu. [CC, RE]
- -- Rene Engelhard <rene@debian.org> Mon, 6 Aug 2007 16:24:17 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 6 Aug 2007 18:20:32 +0200
openoffice.org (2.3.0~src680m224-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2007-08-06 14:38:36 +0000
+++ b/control 2007-08-06 22:43:37 +0000
@@ -119,7 +119,7 @@
Recommends: openoffice.org-style-industrial, openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-hicontrast
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<< 2.2.0-1), openoffice.org-calc (<< 2.2.0-1), openoffice.org-impress (<< 2.2.0-1), openoffice.org-draw (<< 2.2.0-1), openoffice.org-math (<< 2.2.0-1)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
-Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.3+2.0.4m180), openoffice.org-base (<< 2.0.3+2.0.4m180), openoffice.org-math (<< 2.0.3+2.0.4m180), broffice.org (<< 2.2.1~rc1-1)
+Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1)
Description: OpenOffice.org office suite architecture independent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -319,7 +319,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-tango, ${shlibs:Depends}
Section: gnome
Enhances: openoffice.org
-Replaces: openoffice.org-gnome (<< 2.0.4~ood680m2-2)
+Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0)
Description: GTK Integration for OpenOffice.org (Widgets, Dialogs, Quickstarter)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -348,7 +348,7 @@
Enhances: openoffice.org
Conflicts: openoffice.org2-gnome (<< ${Source-Version})
Provides: openoffice.org-gtk-gnome, openoffice.org2-gnome
-Replaces: openoffice.org-gtk-gnome, openoffice.org2-gnome (<< ${Source-Version}), openoffice.org-kde (= 2.0.1-1), openoffice.org-common (<< 2.0.2)
+Replaces: openoffice.org-gtk-gnome, openoffice.org2-gnome (<< ${Source-Version}), openoffice.org-kde (= 2.0.1-1), openoffice.org-common (<< 2.0.4~rc1-0)
Description: GNOME Integration for OpenOffice.org (VFS, GConf)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2007-08-06 15:28:57 +0000
+++ b/control.in 2007-08-06 22:43:37 +0000
@@ -481,7 +481,8 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "tango" symbol style.
+ This package contains the "tango" symbol style, default style
+ for GTK/Gnome.
Package: openoffice.orgVER-style-hicontrast
Architecture: all
@@ -498,8 +499,8 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
Depends: openoffice.orgVER-common (= ${Source-Version})
-Replaces: openoffice.orgVER-common (<< 2.1~m190), openoffice.orgVER-style-default (<< ${Source-Version})
-Conflicts: openoffice.orgVER-style-default (<< ${Source-Version})
+Replaces: openoffice.orgVER-common (<< 2.1~m190), openoffice.orgVER-style-default
+Conflicts: openoffice.orgVER-style-default
Provides: openoffice.orgVER-style-default
Description: Default symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'rules'
--- a/rules 2007-08-06 15:19:00 +0000
+++ b/rules 2007-08-06 22:43:37 +0000
@@ -117,8 +117,6 @@
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
-USE_FIREFOX=n
-USE_XULRUNNER=n
KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
@@ -137,6 +135,8 @@
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
DBVER=4.4
+PARALLEL_BUILD=y
+MOZILLA=xulrunner
# 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 openoffice.org2), we need to set this. Don't touch
@@ -180,63 +180,6 @@
endif
SYSTEM_AGG=y
USE_SYSTEM_HUNSPELL=y
- USE_XULRUNNER=y
-endif
-
-ifeq "$(DIST)" "Ubuntu"
- # common settings
- PATCHSET=$(DIST)$(shell perl -e 'print ucfirst("$(DISTREL)");')
- CONFIGURE_FLAGS += \
- --with-intro-bitmaps=$(CURDIR)/ubuntu/openintro_ubuntu.bmp \
- --with-about-bitmaps=$(CURDIR)/ubuntu/openabout_ubuntu.bmp
-
- BUILD_DEPS += , translate-toolkit
-
- HUMAN=human
- IMAGES_HUMAN_ZIP=images_human.zip
-
- BUILD_DBG_PACKAGE=n
- PRUNE_OOOBUILD=n
- SYSTEM_ALTLINUXHYPH=n
- USE_BZIP_COMPRESS=y
- USE_FIREFOX=y
- USE_OOO_BUILD_DESKTOPS=y
- USE_PYCENTRAL=y
- USE_SYSTEM_LPSOLVE=n
- USE_SYSTEM_PORTAUDIO=n
- USE_SYSTEM_XMLSEC=n
-
- ifeq "$(DISTREL)" "gutsy"
-
- else ifeq "$(DISTREL)" "feisty"
-
- else ifeq "$(DISTREL)" "edgy"
- ENABLE_MONO=n
- USE_SYSTEM_HUNSPELL=n
-
- else ifeq "$(DISTREL)" "dapper"
- DBVER=4.3
-
- BUILD_CAIROCANVAS=n
- CAIRO_FONTS_PATCH=n
- ENABLE_MONO=n
- USE_BZIP_COMPRESS=n
- USE_DBUS=n
- USE_PYCENTRAL=n
- USE_SYSTEM_DMAKE=n
- USE_SYSTEM_HUNSPELL=n
- USE_SYSTEM_LIBWPS=n
- USE_SYSTEM_LPSOLVE=n
-
- else # fallback
-
- endif
-
- ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- INSTALLED_ODK=n
- export OOO_RUN_SDK_INSTALLER = no
- endif
-
endif
# Debian Etch backport
@@ -406,15 +349,6 @@
ka km ko ku lo lt lv mk ml-IN mr-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
-
- ifeq "$(DIST)" "Ubuntu"
- # additional things built in Ubuntu, having belocs-locales
- ISOS := en-US $(sort $(filter-out en-US, $(ISOS)) kn sw ti-ER ur-IN)
- HELPISOS := en-US $(sort $(filter-out en-US, $(HELPISOS)) br)
- LANGPACKISOS := en-US $(sort $(filter-out en-US, $(LANGPACKISOS)) kn sw ti-ER ur-IN)
- REMOVE_HELP := bs cy fi lt lv sh-YU sr-CS ur-IN
- FILTER_HELP := ga hr pl rw sk th tr vi
- endif
endif
else
ISOS=en-US
@@ -423,25 +357,6 @@
endif
BUILD_ISOS = $(ISOS)
-ifeq "$(DIST)" "Ubuntu"
- LANGUAGES := $(ISOS)
- ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"
- BUILD_ONLY_EN_US=y
- ISOS := en-US
- LANGPACKISOS := $(ISOS)
- HELPISOS :=
- OOO_L10N_DIR = $(CURDIR)/debian/l10n
- ifeq (,$(findstring nogsi, $(DEB_BUILD_OPTIONS)))
- GSI_EXPORT_STAMP = $(STAMP_DIR)/gsi-export
- endif
- endif
- ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- PACKAGE_QA_TOOLS=n
-
- DEBHELPER_OPTIONS += $(foreach p, $(shell echo $(PACKAGES) | egrep -v l10n) openoffice.org$(VER)-l10n-en-us,-N$(p))
- endif
-endif
-
ifeq "$(VER)" ""
CONFIGURE_FLAGS += --with-binsuffix=no
else
@@ -484,9 +399,6 @@
ifeq "$(SYSTEM_XT)" "y"
CONFIGURE_FLAGS += --with-system-xt
BUILD_DEPS += , libxt-java (>= 0.20050823) [$(OOO_JAVA_ARCHS)]
- ifeq "$(DIST)" "Ubuntu"
- JAVA_GCJ_DEPENDS += , libxt-java-gcj
- endif
endif
ifeq "$(SYSTEM_XERCES)" "y"
CONFIGURE_FLAGS += --with-system-xerces
@@ -520,17 +432,16 @@
HELPISOS=
endif
-ifeq "$(USE_FIREFOX)" "y"
- CONFIGURE_FLAGS+= --with-system-mozilla=firefox
- BUILD_DEPS+= , firefox-dev [$(OOO_ARCHS)]
-else
- ifeq "$(USE_XULRUNNER)" "y"
- CONFIGURE_FLAGS+= --with-xulrunner
+ifneq "$(MOZILLA)" ""
+ ifeq "$(MOZILLA)" "xulrunner"
BUILD_DEPS+= , libxul-dev [$(OOO_ARCHS)], libnss3-dev [$(OOO_ARCHS)]
DBG_DBG_SUGGESTS+= , libnss3-0d-dbg, libnspr4-0d-dbg
else
+ BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
+ endif
+else
CONFIGURE_FLAGS += --disable-mozilla
- endif
endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
@@ -649,7 +560,7 @@
endif
ifeq "$(USE_SYSTEM_XMLSEC)" "y"
- ifeq "$(USE_XULRUNNER)" "y"
+ ifeq "$(MOZILLA)" "xulrunner"
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1) [$(OOO_ARCHS)], libxmlsec1-nss (>= 1.2.9-1.1) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9-1.1) [$(OOO_ARCHS)]
else
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9) [$(OOO_ARCHS)], libxmlsec1-nss (>= 1.2.9) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9) [$(OOO_ARCHS)]
@@ -691,9 +602,6 @@
BUILD_DEPS += , libhsqldb-java (>= 1.8.0.0-2) [$(OOO_JAVA_ARCHS)]
BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.0-2)
CONFIGURE_FLAGS+= --with-system-hsqldb
- ifneq "$(DIST)" "Ubuntu"
- JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
- endif
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)]
@@ -775,7 +683,7 @@
NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?num-cpus=\([0-9]\+\).*$$/\2/p')
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
- ifeq "$(DIST)" "Ubuntu"
+ ifeq "$(PARALLEL_BUILD)" "y"
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifneq ($(AVAIL_CPUS),1)
NUM_CPUS := $(shell expr $(AVAIL_CPUS) + 1)
@@ -1053,24 +961,6 @@
fi ; \
done
-ifeq "$(DIST)" "Ubuntu"
- # uuencode ubuntu binary files
- set -e; \
- cd ubuntu ; \
- for f in \
- *.bmp \
- *.bz2 \
- *.otp \
- ; do \
- if [ -s $$f ]; then \
- uuencode $$f $$f > $$f.uu.tmp && \
- ../debian/scripts/move-if-change $$f.uu.tmp $$f.uu; \
- touch -r $$f $$f.uu ; \
- rm -f $$f ; \
- fi ; \
- done
-endif
-
dh_clean
# Files created in debian directory
@@ -1222,10 +1112,6 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.debug.in
endif
- ifeq "$(DIST)" "Ubuntu"
- sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
- >> debian/control < debian/control.ubuntu.in
- endif
ifeq "$(PACKAGE_SDK)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.sdk.in
@@ -1289,12 +1175,6 @@
mkdir -p $(STAMP_DIR)
-ifeq "$(PKGSOURCE)" "openoffice.org$(VER)-l10n"
- ifeq "$(DIST)" "Ubuntu"
- cp -p ooo-build/distro-configs/Ubuntu.conf.in ooo-build/distro-configs/UbuntuL10n.conf.in
- endif
-endif
-
# uudecode files, omit GSI files
set -e; \
for uu in \
@@ -1340,17 +1220,6 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(LANGPACKISOS)" "en-US"
- ifeq "$(DIST)" "Ubuntu"
- cd ooo-build; for uu in src/GSI*.uu; do \
- iso=$$(echo $$uu | sed -n 's/.*GSI_\(.*\)\.sdf.*/\1/p'); \
- case " $(LANGPACKISOS) " in *\ $$iso\ *) ;; *) continue; esac; \
- orig="`echo "$$uu" |sed -e 's#.uu$$##'`" ;\
- if [ ! -s $$orig ]; then \
- uudecode -o $$orig $$uu ;\
- touch -r $$uu $$orig ;\
- fi ;\
- done
- endif
# extract extra GSIs
find ooo-build/src -name "*.sdf.bz2" -exec bunzip2 -k \{\} \;
for i in `find ooo-build/src/*.sdf.gz`; do gunzip -dc "$$i" > \
@@ -1598,9 +1467,6 @@
# 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; do \
MAINTSCRIPT=debian/$$PKG.$$FILE ; \
if [ -e $$MAINTSCRIPT.in ]; then \
@@ -1696,20 +1562,6 @@
> l10n.fdupes
debian/scripts/cleandupes --base=openoffice.org$(VER) --prefix=debian < l10n.fdupes
- # install Ubuntu templates
-ifeq "$(DIST)" "Ubuntu"
- otps=`cd 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
-
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@ -2520,10 +2372,8 @@
| perl -p -e 's/(.*)=(.*)/$$1=\$${\$$FHS_CONFIG_FILE:Bootstrap:$$1}/' \
>> $(PKGDIR)-common/$(OODIR)/program/sofficerc
-ifeq "$(DIST)" "Debian"
install -m 644 debian/soffice.sh \
$(PKGDIR)-common/etc/openoffice$(VER)/soffice.sh
-endif
ifeq "$(HELPISOS)" ""
# the helpimgs are not included when we don't build with help here.
@@ -2551,16 +2401,6 @@
$(PKGDIR)-style-$$s/$(OODIR)/share/config/; \
done
-ifeq "$(DIST)" "Ubuntu"
- rm -rf images
- mkdir -p images
- cd images; \
- unzip -q $(CURDIR)/$(PKGDIR)-style-tango/$(OODIR)/share/config/images_tango.zip; \
- tar xf ../ubuntu/images_new.tar.bz2; \
- zip -q -r $(CURDIR)/$(PKGDIR)-style-human/$(OODIR)/share/config/images_human.zip *
- rm -rf images
-endif
-
rm -rf $(PKGDIR)-dtd-officedocument1.0
mkdir -p $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
mv $(PKGDIR)-common/$(OODIR)/share/dtd/officedocument \
@@ -2634,6 +2474,7 @@
endif
ifneq "$(DIST)" "Ubuntu"
+ # ooo-build has a patch with this hardcoded.
perl -pi -e "s/Ubuntu helper/helper/" $(PKGDIR)-common/$(OODIR)/program/soffice
perl -pi -e "s/Ubuntu config/config/" $(PKGDIR)-common/$(OODIR)/program/soffice
perl -pi -e "s/Ubuntu stuff/stuff/" $(PKGDIR)-common/$(OODIR)/program/soffice
=== modified file 'soffice.sh'
--- a/soffice.sh 2007-08-06 15:19:00 +0000
+++ b/soffice.sh 2007-08-06 22:43:37 +0000
@@ -18,4 +18,4 @@
# If the environment variable SAL_NOOPENGL is set,
# the setting if OPENGL_SUPPORT has no effect.
-OPENGL_SUPPORT=yes
+OPENGL_SUPPORT=no
Reply to: