The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit f8e7a7883ccc784791bfc36df507b808591ef797
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Aug 18 14:31:11 2011 +0200
some additional l10n/non-l10n merge fixes
diff --git a/rules b/rules
index 5f90143..4fdadf6 100755
--- a/rules
+++ b/rules
@@ -2116,13 +2116,13 @@ endif
# but the link is in -common so we need to do it here.
cd $(PKGDIR)-common/$(OOBASISDIR) && \
rm ure-link && ln -sf /$(OOUREDIR) ure-link
-endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p $(PKGDIR)-evolution/$(OODIR)/presets/database
mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
+endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
find debian/tmp ! -perm -200 | xargs -r chmod u+w
@@ -2245,9 +2245,9 @@ ifeq "$(DIST)" "Ubuntu"
endif
ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
+ mkdir -p $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program
ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
# move pt-BR ("BrOffice") splashs into -l10n-pt-br
- mkdir -p $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png \
$(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/intro-pt_BR.png
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
