------------------------------------------------------------
revno: 977
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-01-23 16:27:02 +0100
message:
OOH680_m4
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-01-21 12:34:58 +0000
+++ b/changelog 2008-01-23 15:27:02 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:2.4.0~ooh680m3-0.1pre) experimental; urgency=low
+openoffice.org (1:2.4.0~ooh680m4-0.1pre) experimental; urgency=low
- * new upstream snapshot (OOH680_m3)
+ * new upstream snapshot (OOH680_m4)
- adds https support for WebDAV (closes: #244280)
- officially adds possibility to input formulas starting with -/+
(closes: #433360)
@@ -8,7 +8,7 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11336)
+ - use trunk again (r11372)
- use new OOH680 GSIs from ftp.linux.cz
* debian/rules, debian/scripts/vars.mips{,el}, debian/scripts/vars.arm{,el}:
(re)add conditionals and vars for new mips(el)/armel and revived arm
@@ -53,7 +53,7 @@
- suggest only ttf-dejavu instead of ttf-dejavu | ttf-bitstream-vera;
OOo now contains the DejaVu fonts. Closes: #461279
- add USE_SYSTEM_JFREEREPORT conditional
- - temporarily build-depend on flex-old instead of flex, see Issue 85371
+ - temporarily build-depend on flex-old instead of flex, see Issue 85508
* debian/control.ogltrans.in:
- depend on openoffice.orgVER-core and openoffice.orgVER-impress
>> 2.4.0~m237
@@ -65,7 +65,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 21 Jan 2008 13:33:43 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Jan 2008 10:22:20 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-21 12:34:58 +0000
+++ b/control 2008-01-23 15:27:02 +0000
@@ -2068,14 +2068,14 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-sr-cs
+Package: openoffice.org-l10n-sr
Architecture: all
-Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all
+Depends: locales (>= 2.3.6.ds1-5) | belocs-locales-data | locales-all
Recommends: openoffice.org-core (>> ${base-version}) | language-support-sr
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-sr-cs
-Suggests: hunspell-dictionary-sr-cs | myspell-dictionary-sr-cs,
openoffice.org-hyphenation-sr-cs, openoffice.org2-thesaurus-sr-cs,
openoffice.org-help-sr-cs
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-sr-cs
-Replaces: openoffice.org2-l10n-sr-cs
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-sr, openoffice.org-l10n-sr-cs
+Suggests: hunspell-dictionary-sr | myspell-dictionary-sr,
openoffice.org-hyphenation-sr, openoffice.org2-thesaurus-sr,
openoffice.org-help-sr
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-sr, openoffice.org-l10n-sr-cs
+Replaces: openoffice.org2-l10n-sr, openoffice.org-l10n-sr-cs
Description: Serbian language package for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3145,3 +3145,12 @@
OpenOffice.org without any wrapper layer such as ODBC or JDBC.
Homepage: http://dba.openoffice.org/drivers/postgresql/
+Package: openoffice.org-l10n-sr-cs
+Architecture: all
+Depends: openoffice.org-l10n-sr
+Description: transitional package to openoffice.org-l10n-sr
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-sr.
+ .
+ It can be safely removed when openoffice.org-l10n-sr is installed.
+
=== modified file 'rules'
--- a/rules 2008-01-20 22:46:42 +0000
+++ b/rules 2008-01-23 15:27:02 +0000
@@ -472,7 +472,7 @@
ISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
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 ro ru rw sk sl sr-CS ss st sv \
+ pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
HELPISOS:=en-US cs da de dz en-GB es et fr gl hi-IN hu it ja km ko nl \
@@ -481,7 +481,7 @@
LANGPACKISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
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 ro ru rw sk sl sr-CS ss st sv \
+ pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
endif
else
@@ -1171,9 +1171,12 @@
rw) \
LOCALES_DEPENDS="locales (>= 2.3.6) |
belocs-locales-data | locales-all (>= 2.3.6)" \
;; \
- ss|ts|km|sr-cs|ns|tn) \
+ ss|ts|km|ns|tn) \
LOCALES_DEPENDS="locales (>= 2.3.5-12) |
belocs-locales-data | locales-all" \
;; \
+ sr) \
+ LOCALES_DEPENDS="locales (>= 2.3.6.ds1-5) |
belocs-locales-data | locales-all" \
+ ;; \
as-in|or-in|nr) \
LOCALES_DEPENDS="locales (>= 2.3.6.ds1-1) | locales-all
(>= 2.3.6.ds1-1)" \
;; \
@@ -1255,6 +1258,13 @@
endif
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.postgresql.in
+ifeq "$(DIST)" "Debian"
+ if echo $(LANGPACKISOS) | grep -q sr; then \
+ sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+ >> debian/control <
debian/control.etch_lenny_transitional.in; \
+ perl -pi -e 's/(openoffice.org2-l10n-sr)/\1,
openoffice.org-l10n-sr-cs/' debian/control; \
+ fi
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
@@ -2422,11 +2432,6 @@
chmod 644 `find
$(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/java/EmbedDocument -type f | xargs`
rm -f $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc/LICENSE
- # replace href's to the non-free DevelopersGuide with links to the
- # online docs
- find $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs -name
'*.html' \
- | xargs sed -ri
's,href="[^"]*DevelopersGuide/([^"]*\.(xhtml|pdf)[^"]*")(.*),href="http://api.openoffice.org/docs/DevelopersGuide/\1\3,g'
-
ifeq "$(ENABLE_JAVA)" "y"
# fix links
cd $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/java/ref && \
