[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. 37057cf04246c698c8a6d1e60f81593155b9851d



The following commit has been merged in the master branch:
commit 517373da63781ff2576dfe9db731776e6aba1f37
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 16 10:03:23 2011 +0000

    remove DefaultLocale_CTL setting again

diff --git a/changelog b/changelog
index 3c294be..577ca9b 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,8 @@ 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)
+     - don't reference -ctl-he anymore and fix CTLSequenceChecking setting 
+       in ctl_he.xcd (closes: #622301)
      - enable is (icelandic) l10n
   * debian/control.in:
     - build-conflict against at3-dev-tools, it installs a moc-qt3 alternative
diff --git a/rules b/rules
index 312c0ca..5d153ba 100755
--- a/rules
+++ b/rules
@@ -2077,7 +2077,6 @@ 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 $@

-- 
LibreOffice packaging repository


Reply to: