------------------------------------------------------------
revno: 1038
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-03-27 10:07:26 +0100
message:
fixup -sr; -1
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-03-26 20:19:00 +0000
+++ b/changelog 2008-03-27 09:07:26 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:2.4.0-0.1pre) unstable; urgency=low
+openoffice.org (1:2.4.0-1) unstable; urgency=low
* OpenOffice.org 2.4.0 final
* ooo-build:
@@ -21,8 +21,10 @@
- don't build-depend on g{cc,++}-4.3 on s390 anymore as it's the default
now anyway. Build-depend on gcc (>> 4.3.0) and g++ (>> 4.3.0)
instead
+ - fix l10n-sr up to not conflict against -sr-cs as that's our
+ etch->lenny transitional package.
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 25 Mar 2008 12:43:59 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 26 Mar 2008 22:42:18 +0100
openoffice.org (1:2.4.0~rc6-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-03-26 20:19:00 +0000
+++ b/control 2008-03-27 09:07:26 +0000
@@ -2101,9 +2101,9 @@
Architecture: 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, openoffice.org-l10n-sr-cs
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-sr
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
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-sr
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
=== modified file 'rules'
--- a/rules 2008-03-26 20:17:47 +0000
+++ b/rules 2008-03-27 09:07:26 +0000
@@ -1277,7 +1277,7 @@
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; \
+ perl -pi -e 's/\n/, openoffice.org-l10n-sr-cs\n/ if
/^Replaces:.*l10n-sr$$/' debian/control; \
fi
endif
