------------------------------------------------------------
revno: 811
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-07-31 12:52:31 +0200
message:
merge 2.2.1-7; --with-drink=coffee ;)
removed:
openoffice.org-filter-binfilter.mime
added:
openoffice.org-filter-binfilter.mime
modified:
README.Debian
changelog
control
control.in
rules
------------------------------------------------------------
revno: 772.1.13
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-22 12:14:10 +0200
message:
merge etch backport fixces from 2.3 branch
modified:
changelog
rules
------------------------------------------------------------
revno: 772.1.14
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-22 12:17:11 +0200
message:
merge löibc*-dbg suggestion from 2.3 branch
modified:
changelog
rules
------------------------------------------------------------
revno: 772.1.15
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2007-07-26 15:48:23 +0200
message:
update ooo-build
modified:
changelog
------------------------------------------------------------
revno: 772.1.16
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2007-07-27 12:50:19 +0200
message:
reenable km, suggest openoffice.org-ctl-he, build-conflict against broken
libxul-dev, update dict/hyph info
modified:
README.Debian
changelog
control
control.in
rules
------------------------------------------------------------
revno: 772.1.17
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2007-07-28 17:48:07 +0200
message:
add he GSI from Issue 79651
modified:
changelog
------------------------------------------------------------
revno: 772.1.18
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-29 12:52:33 +0200
message:
Help->About is also fixed
modified:
changelog
------------------------------------------------------------
revno: 772.1.19
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-30 14:10:34 +0200
message:
- move Star* into a -filter-binfilter.mime
added:
openoffice.org-filter-binfilter.mime
modified:
changelog
openoffice.org-calc.mime
openoffice.org-draw.mime
openoffice.org-impress.mime
openoffice.org-math.mime
openoffice.org-writer.mime
------------------------------------------------------------
revno: 772.1.20
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-30 14:23:21 +0200
message:
oops
modified:
changelog
------------------------------------------------------------
revno: 772.1.21
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-30 22:17:32 +0200
message:
remove bogus TKOS_BUILD_DATE
modified:
changelog
rules
------------------------------------------------------------
revno: 772.1.22
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-30 23:01:50 +0200
message:
eh, this actually should hardcode he
modified:
changelog
rules
=== removed file 'openoffice.org-filter-binfilter.mime'
--- a/openoffice.org-filter-binfilter.mime 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-filter-binfilter.mime 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-application/vnd.stardivision.calc; soffice -calc '%s';edit=soffice -calc
'%s';test=test "$DISPLAY" != "" ;description="StarCalc 5.0";
nametemplate=%s.sdc; priority=5
-application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="StarChart 5.0";
nametemplate=%s.sds; priority=5
-application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="StarDraw 5.0";
nametemplate=%s.sda; priority=5
-application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=5
-application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test "$DISPLAY" != "" ; description="StarMath 5.0";
nametemplate=%s.sdf; priority=5
-application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=5
-application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=5
-
=== added file 'openoffice.org-filter-binfilter.mime'
--- a/openoffice.org-filter-binfilter.mime 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-filter-binfilter.mime 2007-07-30 12:10:34 +0000
@@ -0,0 +1,8 @@
+application/vnd.stardivision.calc; soffice -calc '%s';edit=soffice -calc
'%s';test=test "$DISPLAY" != "" ;description="StarCalc 5.0";
nametemplate=%s.sdc; priority=5
+application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="StarChart 5.0";
nametemplate=%s.sds; priority=5
+application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="StarDraw 5.0";
nametemplate=%s.sda; priority=5
+application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=5
+application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test "$DISPLAY" != "" ; description="StarMath 5.0";
nametemplate=%s.sdf; priority=5
+application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=5
+application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=5
+
=== modified file 'README.Debian'
--- a/README.Debian 2007-04-24 14:02:57 +0000
+++ b/README.Debian 2007-07-27 10:50:19 +0000
@@ -108,12 +108,13 @@
Spellcheck dictionaries, Hyphenation patterns and Thesauri
----------------------------------------------------------
-Currently, there are dictionaries available for Bulgarian, Catalan, Croatian,
Czech,
-Danish, Dutch, English (AUS/GB/US), Esperanto, Estonian, Finnish, French,
Galician,
-German (DE/CH/AT), Greek, Hebrew, Hungarian, Irish (Gaeilge), Italian,
-Kurdish, Latvian, Lithuanian, Manx Gaelic, Norwegian Bokmal, Norwegian Nynorsk,
-Polish, Portuguese, Portuguese (Brazilian), Russian, Scots Gaelic, Slovak,
-Slovenian, Spanish, Swahili, Swedish, Thai, Ukrainian and Uzbek.
+Currently, there are dictionaries available for Afrikaans, Bulgarian, Catalan,
+Croatian, Czech, Danish, Dutch, English (AUS/GB/US), Esperanto, Estonian,
+Finnish, French, Galician, German (DE/CH/AT), Greek, Hebrew, Hungarian,
+Irish (Gaeilge), Italian, Kurdish, Latvian, Lithuanian, Manx Gaelic,
+Norwegian Bokmal, Norwegian Nynorsk, Polish, Portuguese,
+Portuguese (Brazilian), Russian, Scots Gaelic, Slovak, Slovenian, Spanish,
+Swahili, Swedish, Thai, Ukrainian and Uzbek.
Dictionaries are packaged as myspell-<lang> (or, for newer ones improved
for hunspell hunspell-<lang>).
@@ -122,7 +123,7 @@
Thesauri are packaged as openoffice.org-thesaurus-<lang>
Currently, there are hyphenation patterns available for Croatian, Estonian,
-German, Hungarian, Polish and Lithuanian.
+German, Hungarian, Italian, Polish and Lithuanian.
Hyphenation patterns are packaged as openoffice.org-hyphenation-<lang>.
Help packages
=== modified file 'changelog'
--- a/changelog 2007-07-31 06:41:46 +0000
+++ b/changelog 2007-07-31 10:52:31 +0000
@@ -1,4 +1,4 @@
-openoffice.org (2.3.0~src680m222-0.1pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m222-1) experimental; urgency=low
* new upstream snapshot (SRC680_m222)
- fixes joining cells in writer tables (closes: #218281)
@@ -9,16 +9,13 @@
(closes: #386250)
* ooo-build:
- use trunk again
- - update (r9962)
+ - update (r9964)
+ apply Split section. Fixes the binfilter split so that StarWriter
3.0-5.0 etc. do not appear anymore when -filter-binfilter is not
installed (indirectly closes: #421274)
- src/:
+ add updated GSIs from ftp.linux.cz:
af bg cs cy da dz eo et fi ga ku lt mk tg
- + add he GSI from Issue 79651
- . fixes hardcoded 2.0.3 in recovery dialog (closes: #432770)
- . removes bogus 2.0.3 from Help->About ttle (closes: #432771)
* debian/rules, debian/Adobe-Core35_AFMs-314.tar.gz.uu: remove, unneeded
[RE]
* debian/rules:
@@ -72,13 +69,37 @@
libuno_purpenvhelpergcc3 [RE]
* debian/rules, debian/openoffice.org-reportdesigner*: properly
install/package the reportdesigner extension [RE]
- * debian/*.mime: move Star* into a -filter-binfilter.mime [RE]
* debian/rules, debian/*.menu.in, debian/*.overrides.lintian.in:
add version number to the icon= entry dynamically
(CC = Chris Cheney)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 30 Jul 2007 11:40:17 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 31 Jul 2007 09:14:24 +0200
+
+openoffice.org (2.2.1-7) unstable; urgency=low
+
+ * ooo-build:
+ + update (r9936)
+ + src:
+ - add he GSI from Issue 79651
+ . fixes hardcoded 2.0.3 in recovery dialog (closes: #432770)
+ . removes bogus 2.0.3 from Help->About ttle (closes: #432771)
+ * merge from 2.3/experimental branch:
+ - debian/rules:
+ + fix some stuff for etch backports
+ + suggest libc*-dbg
+ + reenable km again due to demand of the Khmer people...
+ - debian/*.mime: move Star* into a -filter-binfilter.mime [RE]
+ * debian/control.in:
+ - add build-conflicts against
+ libxul-dev (= 1.8.0.13~pre070720-0etch1) - broken security update, see
+ #434844
+ * debian/README.Debian: update for myspell-af and
+ openoffice.org-hyphenation-it
+ * debian/rules:
+ - suggest openoffice.org-ctl-he at -l10n-he
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 30 Jul 2007 22:17:05 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-28 12:02:50 +0000
+++ b/control 2007-07-31 10:52:31 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64
ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386
powerpc sparc amd64 ppc64], , libcurl4-gnutls-dev [i386 powerpc sparc amd64
ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper
(>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev
(>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64
ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>=
0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc
sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64
ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64
ppc64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64],
libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64],
cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386
powerpc sparc amd64 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc
sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64
ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev
[i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc
amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386
powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc sparc amd64 ppc64] ,
libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc
sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java
(>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] ,
libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>=
0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev
[i386 powerpc sparc amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64
ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
-Build-Conflicts: libcairo2 (= 1.4.8-1)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1)
Standards-Version: 3.7.2
XS-Python-Version: current
XS-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
@@ -204,7 +204,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij |
java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends},
${java-common-depends} (>> 2.2.0-4)
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij |
java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends},
${java-common-depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${Source-Version}), openoffice.org-common (= 2.0.4-4)
@@ -396,7 +396,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc amd64 ppc64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${jawt-depends}, ${java-common-depends} (>> 2.2.0-4)
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${jawt-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -429,7 +429,7 @@
Package: openoffice.org-filter-mobiledev
Section: misc
Architecture: all
-Depends: gij | java-gcj-compat | j2re1.4 | java2-runtime,
${java-common-depends} (= ${Binary-Version})
+Depends: gij | java-gcj-compat | j2re1.4 | java2-runtime,
${java-common-depends}
Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178),
openoffice.org-common (<< 2.0.3+2.0.4m178)
Description: Mobile Devices Filters for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -1234,7 +1234,7 @@
Depends: locales | belocs-locales-data | locales-all
Recommends: openoffice.org-core (>> ${base-version}) | language-support-he ,
culmus
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-he
-Suggests: hunspell-dictionary-he | myspell-dictionary-he,
openoffice.org-hyphenation-he, openoffice.org2-thesaurus-he,
openoffice.org-help-he
+Suggests: hunspell-dictionary-he | myspell-dictionary-he,
openoffice.org-hyphenation-he, openoffice.org2-thesaurus-he,
openoffice.org-help-he, openoffice.org-ctl-he
Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-he
Replaces: openoffice.org2-l10n-he
Description: Hebrew language package for OpenOffice.org
=== modified file 'control.in'
--- a/control.in 2007-07-31 06:41:46 +0000
+++ b/control.in 2007-07-31 10:52:31 +0000
@@ -51,7 +51,7 @@
libxml-parser-perl [%OOO_ARCHS%],
gperf [%OOO_ARCHS%],
%BUILD_DEPS%
-Build-Conflicts: libcairo2 (= 1.4.8-1)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1)
Standards-Version: 3.7.2
XS-Python-Version: current
XS-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
=== modified file 'rules'
--- a/rules 2007-07-31 06:27:50 +0000
+++ b/rules 2007-07-31 10:52:31 +0000
@@ -157,7 +157,8 @@
--disable-strip \
--enable-atkbridge \
--enable-lockdown \
- --enable-openxml
+ --enable-openxml \
+ --with-drink=coffee
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -1161,6 +1162,10 @@
perl -pi -e 's/Conflicts: openoffice.org-thesaurus/Conflicts:
openoffice.org-thesaurus, ooqstart-gnome <= 0.8.3-8), oooqs-kde (<< 2.0.3-7)/'
debian/control
endif
+ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he,
openoffice.org-ctl-he/' debian/control
+endif
+
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
@@ -1259,6 +1264,12 @@
grep -v OOO_LICENSE ooo-build/src/GSI_$$iso.sdf \
> $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \
done
+ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ # TKOS_BUILD_DATE is bogus, too
+ TMP=`mktemp -q`; \
+ sed -e "s/TKOS_BUILD_DATE//g" < ooo-build/src/GSI_he.sdf \
+ > $$TMP && mv $$TMP ooo-build/src/GSI_he.sdf
+endif
endif
endif
