[SCM] LibreOffice packaging repository branch, master, updated. 886dc4173abc4a02153e60c12aeeaf4aea5a426a
The following commit has been merged in the master branch:
commit 65bdfaec985da1ec831ce68caa81823f5048718d
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 12 20:44:07 2011 +0200
don't reference -ctl-he anymore and update settings in ctl_he.xcd (closes: #622301)
diff --git a/changelog b/changelog
index aa65424..056c0a1 100644
--- a/changelog
+++ b/changelog
@@ -8,12 +8,14 @@ libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
as otherwise it's not installed on the buildds (and we end up with a
eventually "wrong" gcc).
- restrict parallel=x to 2, at least 6 breaks, and don't experiment :)
+ - don't reference -ctl-he anymore and update settings in ctl_he.xcd
+ (closes: #622301)
* debian/control.in:
- build-conflict against at3-dev-tools, it installs a moc-qt3 alternative
for moc, which might hose the KDE VCLplug build - and configure insists
on ../bin/moc relative to libQt.so (thus /usr/bin/moc) now
- -- Rene Engelhard <rene@debian.org> Thu, 07 Apr 2011 17:28:59 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Apr 2011 20:43:38 +0200
libreoffice (1:3.3.2-2) unstable; urgency=medium
diff --git a/rules b/rules
index 08ad2d5..5549cf9 100755
--- a/rules
+++ b/rules
@@ -1472,10 +1472,6 @@ endif
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
-ifeq (he,$(findstring he,$(LANGPACKISOS)))
- perl -pi -e 's/libreoffice-help-he$$/libreoffice-help-he, libreoffice-ctl-he/' debian/control
-endif
-
ifeq (sk,$(findstring sk,$(HELPISOS)))
perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control
endif
@@ -2079,6 +2075,11 @@ else
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png
endif
+ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ perl -pi -e 's#<prop oor:name="CTLSequenceChecking"><value>true</value></prop>#<prop oor:name="CTLSequenceChecking"><value>false</value></prop>#' $(PKGDIR)-l10n-he/$(OOBASISDIR)/share/registry/ctl_he.xcd
+ perl -pi -e 's#</oor:component-data>#<node oor:name="General"><prop oor:name="DefaultLocale_CTL"><value>he-IL</value></prop></node></oor:component-data>#' $(PKGDIR)-l10n-he/$(OOBASISDIR)/share/registry/ctl_he.xcd
+endif
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
--
LibreOffice packaging repository
Reply to: