------------------------------------------------------------
revno: 2334
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2011-01-19 10:36:41 +0100
message:
rm -f {intro,about}-pt_BR.png from -common when we don't build with pt-BR
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-18 20:58:27 +0000
+++ b/changelog 2011-01-19 09:36:41 +0000
@@ -9,10 +9,12 @@
* debian/rules:
- also substitute ${PRODUCTNAME_BR} ${PRODUCTVERSION} correctly
(closes: #610345)
+ - fix to not install {intro,about}-pt_BR.png into -common if not
+ building pt-BR (file conflict common/-l10n-pt-br)
* debian/control.in:
- add Vcs-Browser:, thanks Nelson A. de Oliveira
- -- Rene Engelhard <r...@debian.org> Mon, 17 Jan 2011 22:41:13 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 19 Jan 2011 10:03:33 +0100
libreoffice (1:3.3.0~rc3-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2011-01-18 20:58:27 +0000
+++ b/rules 2011-01-19 09:36:41 +0000
@@ -2117,6 +2117,10 @@
$(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/intro-pt_BR.png
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png \
$(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/about-pt_BR.png
+else
+ # remove them, unneeded and would gerate file conflicts
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png
endif
touch $@
