[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 2b2187411303454d41f6ed212db974370ecc0363
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jan 12 14:23:32 2012 +0100
get rid of obsolete BrOffice specialcasing (LP: #884786)
diff --git a/changelog b/changelog
index 9a42dc3..284be8e 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
* enable l10n
+ * get rid of obsolete BrOffice specialcasing (LP: #884786)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 12 Jan 2012 10:45:07 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 12 Jan 2012 14:23:06 +0100
libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
diff --git a/rules b/rules
index 884c225..8c614c0 100755
--- a/rules
+++ b/rules
@@ -1893,19 +1893,6 @@ ifeq "$(DEB_VENDOR)" "Debian"
done
endif
-ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
- # move pt-BR ("BrOffice") splashs into -l10n-pt-br
- mkdir -p $(PKGDIR)-l10n-pt-br/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/program/intro-pt_BR.png \
- $(PKGDIR)-l10n-pt-br/$(OODIR)/program/intro-pt_BR.png
- mv $(PKGDIR)-common/$(OODIR)/program/about-pt_BR.png \
- $(PKGDIR)-l10n-pt-br/$(OODIR)/program/about-pt_BR.png
-else
- # remove them, unneeded and would gerate file conflicts
- rm -f $(PKGDIR)-common/$(OODIR)/program/intro-pt_BR.png
- rm -f $(PKGDIR)-common/$(OODIR)/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/$(OODIR)/share/registry/ctl_he.xcd
endif
--
LibreOffice packaging repository
Reply to: