------------------------------------------------------------
revno: 2187
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-11-12 08:54:04 +0100
message:
broffice.org -> broffice
renamed:
broffice.org.bug-control => broffice.bug-control
broffice.org.lintian-overrides => broffice.lintian-overrides
broffice.org.postinst.in => broffice.postinst.in
broffice.org.postrm.in => broffice.postrm.in
broffice.org.preinst.in => broffice.preinst.in
modified:
changelog
control
control.in
rules
broffice.postinst.in
=== renamed file 'broffice.org.bug-control' => 'broffice.bug-control'
=== renamed file 'broffice.org.lintian-overrides' =>
'broffice.lintian-overrides'
=== renamed file 'broffice.org.postinst.in' => 'broffice.postinst.in'
--- a/broffice.org.postinst.in 2010-11-02 01:55:54 +0000
+++ b/broffice.postinst.in 2010-11-12 07:54:04 +0000
@@ -2,7 +2,7 @@
set -e
-THIS_PACKAGE=broffice.org
+THIS_PACKAGE=broffice
THIS_SCRIPT=postinst
#INCLUDE_SHELL_LIB#
=== renamed file 'broffice.org.postrm.in' => 'broffice.postrm.in'
=== renamed file 'broffice.org.preinst.in' => 'broffice.preinst.in'
=== modified file 'changelog'
--- a/changelog 2010-11-11 21:24:29 +0000
+++ b/changelog 2010-11-12 07:54:04 +0000
@@ -44,6 +44,9 @@
* debian/watch: update to look for libreoffice-build
* debian/smoketest/smoketest-disable-db-insert-delete-seek-tests.diff:
rediff (closes: #603008)
+ * debian/control.in, debian/rules: remove .org from BrOffice stuff
+ * debian/broffice.org.*: move ...
+ * debian/broffice.* ... here
-- Rene Engelhard <r...@debian.org> Thu, 11 Nov 2010 19:33:46 +0100
=== modified file 'control'
--- a/control 2010-11-04 08:40:29 +0000
+++ b/control 2010-11-12 07:54:04 +0000
@@ -65,16 +65,19 @@
* libldap-2.4-2: LDAP client library; needed for OOo getting its profiles
from LDAP
-Package: broffice.org
+Package: broffice
Priority: extra
Architecture: all
Depends: libreoffice, libreoffice-l10n-pt-br, libreoffice-help-pt-br,
myspell-pt-br, ${misc:Depends}
-Description: office productivity suite -- BrOffice.org branding
+Conflicts: broffice.org
+Provides: broffice.org
+Replaces: broffice.org
+Description: office productivity suite -- BrOffice branding
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
LibreOffice is called BrOffice.org in Brazil and this metapackage
- changes an LibreOffice installation into a BrOffice.org branded one once
+ changes an LibreOffice installation into a BrOffice branded one once
installed.
Package: libreoffice-l10n-za
=== modified file 'control.in'
--- a/control.in 2010-11-03 18:47:51 +0000
+++ b/control.in 2010-11-12 07:54:04 +0000
@@ -140,17 +140,20 @@
* gstreamer0.10-plugins-*: GStreamer plugins for use with OOos media backend
* libpaper-utils: papersize detection support via paperconf
-Package: broffice.orgVER
+Package: brofficeVER
Priority: extra
Architecture: all
Depends: libreofficeVER, libreofficeVER-l10n-pt-br, libreofficeVER-help-pt-br,
myspell-pt-br,
${misc:Depends}
-Description: office productivity suite -- BrOffice.org branding
+Conflicts: broffice.org
+Provides: broffice.org
+Replaces: broffice.org
+Description: office productivity suite -- BrOffice branding
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
LibreOffice is called BrOffice.org in Brazil and this metapackage
- changes an LibreOffice installation into a BrOffice.org branded one once
+ changes an LibreOffice installation into a BrOffice branded one once
installed.
Package: libreofficeVER-l10n-za
=== modified file 'rules'
--- a/rules 2010-11-12 07:33:33 +0000
+++ b/rules 2010-11-12 07:54:04 +0000
@@ -1693,7 +1693,7 @@
debian/control: $(wildcard debian/control*in)
$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang debian/rules
chmod 755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
sed -e "s#libreofficeVER#libreoffice$(VER)#g" \
- -e "s#broffice.orgVER#broffice.org$(VER)#g" \
+ -e "s#brofficeVER#broffice$(VER)#g" \
-e "s#libreofficeVER#libreoffice$(VER)#g" \
-e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
@@ -3054,66 +3054,66 @@
dh_testroot
# BrOffice.org
- rm -rf debian/broffice.org
- mkdir -p debian/broffice.org$(VER)/usr/bin
- mkdir -p debian/broffice.org$(VER)/usr/share/applications
- mkdir -p debian/broffice.org$(VER)/usr/share/application-registry
- mkdir -p debian/broffice.org$(VER)/usr/share/mimelnk/application
- mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource
- mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry
+ rm -rf debian/broffice
+ mkdir -p debian/broffice$(VER)/usr/bin
+ mkdir -p debian/broffice$(VER)/usr/share/applications
+ mkdir -p debian/broffice$(VER)/usr/share/application-registry
+ mkdir -p debian/broffice$(VER)/usr/share/mimelnk/application
+ mkdir -p debian/broffice$(VER)/$(OOBRANDDIR)/program/resource
+ mkdir -p debian/broffice$(VER)/$(OOBRANDDIR)/share/registry
ifeq "$(BUILD_KDE)" "y"
- mkdir -p debian/broffice.org$(VER)/usr/share/templates
+ mkdir -p debian/broffice$(VER)/usr/share/templates
endif
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
- | sed -e "s/LibreOffice/BrOffice.org/" | sed -e
"s/libreoffice/broffice.org/" \
- > debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
+ | sed -e "s/LibreOffice/BrOffice/" | sed -e
"s/libreoffice/broffice/" \
+ > debian/broffice$(VER)/$(OOBRANDDIR)/program/bootstraprc
cat $(PKGDIR)-common/$(OOBRANDDIR)/share/registry/brand.xcd \
- | sed -e 's,<prop
oor:name="ooName"><value>LibreOffice</value>,<prop
oor:name="ooName"><value>BrOffice.org</value>,' \
- >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/brand.xcd
+ | sed -e 's,<prop
oor:name="ooName"><value>LibreOffice</value>,<prop
oor:name="ooName"><value>BrOffice</value>,' \
+ > debian/broffice$(VER)/$(OOBRANDDIR)/share/registry/brand.xcd
ifeq "$(BUILD_KDE)" "y"
for i in odt ods odp odg; do \
cat $(PKGDIR)-kde/usr/share/templates/soffice.$${i}.desktop \
- | sed -e "s/LibreOffice/BrOffice.org/" \
- >
debian/broffice.org$(VER)/usr/share/templates/soffice.$${i}.desktop; \
+ | sed -e "s/LibreOffice/BrOffice/" \
+ >
debian/broffice$(VER)/usr/share/templates/soffice.$${i}.desktop; \
done
endif
for i in writer calc draw impress math base startcenter javafilter; do \
case "$$i" in startcenter) d=common ;; javafilter)
d=filter-mobiledev ;; *) d=$$i;; esac; \
cat
$(PKGDIR)-$$d/usr/share/applications/libreoffice$(VER)-$$i.desktop \
- | sed -e "s/Icon=libreoffice\(.*\)/Icon=brofficeorg\1/"
\
- | sed -e "s/libreoffice/broffice/" | sed -e
"s/LibreOffice/BrOffice.org/" \
- >
debian/broffice.org$(VER)/usr/share/applications/libreoffice$(VER)-$$i.desktop;
\
+ | sed -e "s/Icon=libreoffice\(.*\)/Icon=broffice\1/" \
+ | sed -e "s/libreoffice/broffice/" | sed -e
"s/LibreOffice/BrOffice/" \
+ >
debian/broffice$(VER)/usr/share/applications/libreoffice$(VER)-$$i.desktop; \
done
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/misc/broffice.org >/dev/null; pwd`" ;\
- mkdir -p -m755 debian/broffice.org/usr/share/mimelnk/application ;\
- sed -e 's,Comment=Extension,Comment=BrOffice.org $(VER) Extension,' \
- -e
's,Icon=brofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,'
\
+ mkdir -p -m755 debian/broffice/usr/share/mimelnk/application ;\
+ sed -e 's,Comment=Extension,Comment=BrOffice $(VER) Extension,' \
+ -e
's,Icon=broffice[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,'
\
-e 's/ / /' \
< $$dirname/extension.desktop \
- >
debian/broffice.org/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
|| exit 1
- mkdir -p debian/broffice.org/usr/share/application-registry && \
+ >
debian/broffice/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
|| exit 1
+ mkdir -p debian/broffice/usr/share/application-registry && \
cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo
$$OUTPATH$$PROEXT)/misc/broffice.org/openoffice.applications \
| sed -e s/OFFICENAME/broffice/g \
- | sed -e s/\%PRODUCTNAME/BrOffice.org/g \
- >
debian/broffice.org/usr/share/application-registry/openoffice.applications
- rm -f debian/broffice.org/usr/share/mime-info/openoffice.keys; \
- mkdir -p debian/broffice.org/usr/share/mime-info/
+ | sed -e s/\%PRODUCTNAME/BrOffice/g \
+ >
debian/broffice/usr/share/application-registry/openoffice.applications
+ rm -f debian/broffice/usr/share/mime-info/openoffice.keys; \
+ mkdir -p debian/broffice/usr/share/mime-info/
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo
$$OUTPATH$$PROEXT)/misc/broffice.org/*.keys; do \
- cat $$i >>
debian/broffice.org/usr/share/mime-info/openoffice.keys; \
+ cat $$i >> debian/broffice/usr/share/mime-info/openoffice.keys;
\
done
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/intro-pt_BR.png \
- debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro-pt_BR.png
+ debian/broffice$(VER)/$(OOBRANDDIR)/program/intro-pt_BR.png
mv $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png \
- debian/broffice.org$(VER)/$(OOBRANDDIR)/program/about-pt_BR.png
- cd debian/broffice.org$(VER)/$(OOBRANDDIR)/program/ && \
+ debian/broffice$(VER)/$(OOBRANDDIR)/program/about-pt_BR.png
+ cd debian/broffice$(VER)/$(OOBRANDDIR)/program/ && \
ln -s intro-pt_BR.png intro.png; \
ln -s about-pt_BR.png about.png
- cd debian/broffice.org$(VER)/usr/bin && ln -s ooffice$(VER)
broffice$(VER)
+ cd debian/broffice$(VER)/usr/bin && ln -s ooffice$(VER) broffice$(VER)
# this is referenced in .keys/.applications
for i in `find $(PKGDIR)-common/usr/share/icons -name
"libreoffice*png"`; do \
- mkdir -p `dirname $$i | sed -e
s,libreoffice-common,broffice.org,`; \
- ln -s `basename $$i` `echo $$i | sed -e
s,libreoffice-common,broffice.org, | sed -e s/libreoffice/brofficeorg/`; \
+ mkdir -p `dirname $$i | sed -e s,libreoffice-common,broffice,`;
\
+ ln -s `basename $$i` `echo $$i | sed -e
s,libreoffice-common,broffice, | sed -e s/libreoffice/broffice/`; \
done
touch $@
