[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-46-ga429566

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit 00bc87cc17655c84cb087c80189ac200489ae957
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 3545a2c..6db43aa 100644
--- a/changelog
+++ b/changelog
@@ -28,6 +28,7 @@ libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
     - add debian multiarch support for Qt4
     - no dependencies needed for full builds
       + propagate gb_FULLDEPS
+    - get rid of obsolete BrOffice specialcasing (LP: #884786)
   * merge from libreoffice_3.5.0_beta2-2ubuntu2
     - enable gio, disable gvfs 
 
diff --git a/rules b/rules
index 3270057..26bc4fb 100755
--- a/rules
+++ b/rules
@@ -1894,19 +1894,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