./packages/libreoffice/3.3.0/experimental r2237: remove broffice package
------------------------------------------------------------
revno: 2237
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-12-16 18:45:55 +0100
message:
remove broffice package
removed:
broffice.bug-control
broffice.lintian-overrides
broffice.postinst.in
broffice.postrm.in
broffice.preinst.in
added:
patches/broffice-desktop-name.diff
modified:
changelog
control
control.in
rules
=== removed file 'broffice.bug-control'
--- a/broffice.bug-control 2010-11-12 07:54:04 +0000
+++ b/broffice.bug-control 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-report-with: libreoffice
=== removed file 'broffice.lintian-overrides'
--- a/broffice.lintian-overrides 2010-11-18 17:21:50 +0000
+++ b/broffice.lintian-overrides 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-broffice: remove-of-unknown-diversion
-broffice: diversion-for-unknown-file
-broffice: orphaned-diversion
-broffice: binary-without-manpage usr/bin/broffice
-
=== removed file 'broffice.postinst.in'
--- a/broffice.postinst.in 2010-11-12 07:54:04 +0000
+++ b/broffice.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=broffice
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in configure)
- if [ -n "$2" ]; then
- if dpkg --compare-versions $2 lt 1:3.3.0~beta3; then
- dpkg-divert --package $THIS_PACKAGE --remove --rename --divert /@OOBRANDDIR@/program/intro.bmp.ooo /@OOBRANDDIR@/program/intro.bmp
- dpkg-divert --package $THIS_PACKAGE --remove --rename --divert /@OOBRANDDIR@/program/versionrc.ooo /@OOBRANDDIR@/program/versionrc
- for i in $LANGPACKISOS; do
- dpkg-divert --package $THIS_PACKAG --remove --rename --divert /@OOBRANDDIR@/program/resource/ooo$i.res.ooo /@OOBRANDDIR@/program/resource/ooo$i.res
- done
- fi
- fi
-esac
-
-#DEBHELPER#
-
=== removed file 'broffice.postrm.in'
--- a/broffice.postrm.in 2010-11-12 07:54:04 +0000
+++ b/broffice.postrm.in 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/share/registry/brand.xcd /usr/share/applications/libreoffice@VER@-calc.desktop /usr/share/applications/libreoffice@VER@-writer.desktop /usr/share/applications/libreoffice@VER@-draw.desktop /usr/share/applications/libreoffice@VER@-base.desktop /usr/share/applications/libreoffice@VER@-impress.desktop /usr/share/applications/libreoffice@VER@-math.desktop /usr/share/applications/libreoffice@VER@-extensionmgr.desktop /usr/share/applications/libreoffice@VER@-startcenter.desktop /usr/share/applications/libreoffice@VER@-javafilter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /usr/share/templates/soffice.odg.desktop"
-DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.png /@OOBRANDDIR@/program/about.png"
-
-LANGPACKISOS="@LANGPACKISOS@"
-
-if [ "$1" = "remove" -o "$1" = "abort-install" -o "$1" = "disappear" ]; then
- for i in $DIVERSIONS; do
- dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove --rename --divert $i.ooo $i
- done
-fi
-
-#DEBHELPER#
-
=== removed file 'broffice.preinst.in'
--- a/broffice.preinst.in 2010-11-12 07:54:04 +0000
+++ b/broffice.preinst.in 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/share/registry/brand.xcd /usr/share/applications/libreoffice@VER@-calc.desktop /usr/share/applications/libreoffice@VER@-writer.desktop /usr/share/applications/libreoffice@VER@-draw.desktop /usr/share/applications/libreoffice@VER@-base.desktop /usr/share/applications/libreoffice@VER@-impress.desktop /usr/share/applications/libreoffice@VER@-math.desktop /usr/share/applications/libreoffice@VER@-extensionmgr.desktop /usr/share/applications/libreoffice@VER@-startcenter.desktop /usr/share/applications/libreoffice@VER@-javafilter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /usr/share/templates/soffice.odg.desktop"
-DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.png /@OOBRANDDIR@/program/about.png"
-
-LANGPACKISOS="@LANGPACKISOS@"
-
-case "$1" in
-install|upgrade)
- for i in $DIVERSIONS; do
- dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --add --rename --divert $i.ooo $i
- done
- ;;
-esac
-
-#DEBHELPER#
-
=== modified file 'changelog'
--- a/changelog 2010-12-15 16:18:50 +0000
+++ b/changelog 2010-12-16 17:45:55 +0000
@@ -7,6 +7,11 @@
as releases of them now match LibO releases, makes building from git
easier, thanks Chris Halls
+ * stop building a broffice package. Most BrOffice things is now at
+ runtime (LANG=pt-BR), which is apparently what the BrOffice people
+ wanz. Put intro and about for pt-BR into -l10n-pt-br. fix .desktop files
+ (closes: #593123)
+
* debian/rules:
- re-enable sdbc-postgresql
- add conditional for squeeze-backports (Daniel Baumann)
@@ -18,7 +23,7 @@
- remove libreoffice-core conflicts against itself, thanks Julian
Andres Klode (closes: #606480)
- -- Rene Engelhard <rene@debian.org> Tue, 14 Dec 2010 23:39:57 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 16 Dec 2010 13:23:33 +0100
libreoffice (1:3.3.0~rc1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-12-15 16:15:39 +0000
+++ b/control 2010-12-16 17:45:55 +0000
@@ -65,21 +65,6 @@
* libldap-2.4-2: LDAP client library; needed for OOo getting its profiles
from LDAP
-Package: broffice
-Priority: extra
-Architecture: all
-Depends: libreoffice, libreoffice-l10n-pt-br, libreoffice-help-pt-br, myspell-pt-br, ${misc:Depends}
-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 branded one once
- installed.
-
Package: libreoffice-l10n-za
Section: localization
Architecture: all
@@ -122,9 +107,9 @@
Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-style-crystal, libreoffice-style-oxygen
Recommends: xfonts-mathml, ${textcat-data-recommends}
-Conflicts: libreoffice-debian-files, libreoffice-mimelnk, libreoffice2-common, openclipart-libreoffice (<= 0.17+dfsg-4), libreoffice-l10n-en-us, libreoffice-debian-menus, libreoffice-base (<< ${base-version}), libreoffice-writer (<< ${base-version}), libreoffice-calc (<< ${base-version}), libreoffice-impress (<< ${base-version}), libreoffice-draw (<< ${base-version}), libreoffice-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-libreoffice (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), libreoffice-core (<< 1:${basis-version}), libreoffice-core (>= 1:${next-basis-version}~), libreoffice-writer2latex (<< 1.0-5), libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data
+Conflicts: libreoffice-debian-files, libreoffice-mimelnk, libreoffice2-common, openclipart-libreoffice (<= 0.17+dfsg-4), libreoffice-l10n-en-us, libreoffice-debian-menus, libreoffice-base (<< ${base-version}), libreoffice-writer (<< ${base-version}), libreoffice-calc (<< ${base-version}), libreoffice-impress (<< ${base-version}), libreoffice-draw (<< ${base-version}), libreoffice-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-libreoffice (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), libreoffice-core (<< 1:${basis-version}), libreoffice-core (>= 1:${next-basis-version}~), libreoffice-writer2latex (<< 1.0-5), libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data, broffice
Provides: libreoffice2-common, libreoffice-l10n-en-us
-Replaces: libreoffice-debian-files, libreoffice-mimelnk, libreoffice (<< 1.9), libreoffice2-common, libreoffice-l10n-en-us, libreoffice-l10n-en, libreoffice-calc (<< 2.0.4~rc1), libreoffice-base (<< 2.0.4~rc1), libreoffice-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), libreoffice-core (<< 1:3.0.1~rc1-3), openoffice.org-common (<< 1:3.3.0~)
+Replaces: libreoffice-debian-files, libreoffice-mimelnk, libreoffice (<< 1.9), libreoffice2-common, libreoffice-l10n-en-us, libreoffice-l10n-en, libreoffice-calc (<< 2.0.4~rc1), libreoffice-base (<< 2.0.4~rc1), libreoffice-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), libreoffice-core (<< 1:3.0.1~rc1-3), openoffice.org-common (<< 1:3.3.0~), broffice (<< 1:3.3.0~rc2~)
Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
libreoffice-style-oxygen (<< 1:${basis-version}~),
libreoffice-style-industrial,
@@ -2088,10 +2073,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt
-Provides: libreoffice-l10n-${help-l10n-virtual-version}, libreoffice2-l10n-pt-br
+Provides: libreoffice-l10n-${help-l10n-virtual-version}, libreoffice2-l10n-pt-br, broffice
Suggests: hunspell-dictionary-pt-br | myspell-dictionary-pt-br, libreoffice-hyphenation-pt-br, libreoffice2-thesaurus-pt-br, libreoffice-help-pt-br
-Conflicts: libreoffice-core (<< ${base-version}), libreoffice-core (>= ${base-version}.1), libreoffice2-l10n-pt-br
-Replaces: libreoffice2-l10n-pt-br
+Conflicts: libreoffice-core (<< ${base-version}), libreoffice-core (>= ${base-version}.1), libreoffice2-l10n-pt-br, broffice
+Replaces: libreoffice2-l10n-pt-br, broffice
Description: office productivity suite -- Portuguese_brazilian language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2010-12-13 18:28:31 +0000
+++ b/control.in 2010-12-16 17:45:55 +0000
@@ -140,22 +140,6 @@
* gstreamer0.10-plugins-*: GStreamer plugins for use with OOos media backend
* libpaper-utils: papersize detection support via paperconf
-Package: brofficeVER
-Priority: extra
-Architecture: all
-Depends: libreofficeVER, libreofficeVER-l10n-pt-br, libreofficeVER-help-pt-br, myspell-pt-br,
- ${misc:Depends}
-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 branded one once
- installed.
-
Package: libreofficeVER-l10n-za
Section: localization
Architecture: all
@@ -296,7 +280,8 @@
libreofficeVER-core (>= 1:${next-basis-version}~),
libreoffice-writer2latex (<< 1.0-5),
libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8),
- libtextcat-data
+ libtextcat-data,
+ broffice
Provides: libreoffice2-common,
libreoffice-l10n-en-us
Replaces: libreoffice-debian-files,
@@ -310,7 +295,8 @@
libreoffice-math (<< 2.0.4~rc1),
broffice.org (<< 2.2.1~rc1-1),
libreoffice-core (<< 1:3.0.1~rc1-3),
- openoffice.org-common (<< 1:3.3.0~)
+ openoffice.org-common (<< 1:3.3.0~),
+ broffice (<< 1:3.3.0~rc2~)
Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
libreofficeVER-style-oxygen (<< 1:${basis-version}~),
libreofficeVER-style-industrial,
=== added file 'patches/broffice-desktop-name.diff'
--- a/patches/broffice-desktop-name.diff 1970-01-01 00:00:00 +0000
+++ b/patches/broffice-desktop-name.diff 2010-12-16 17:45:55 +0000
@@ -0,0 +1,120 @@
+--- /dev/null 2010-12-12 16:38:37.939206435 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/broffice-desktop-name.diff 2010-12-15 18:36:47.000000000 +0100
+@@ -0,0 +1,104 @@
++diff -u sysui/desktop/menus.old/base.desktop sysui/desktop/menus/base.desktop
++--- sysui/desktop/menus.old/base.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/base.desktop 2010-12-15 18:33:14.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -base %U
++ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
++ Name=%PRODUCTNAME Base
+++Name[pt-BR]=%PRODUCTNAME_BR Base
++ GenericName=Database Development
++ Comment=Manage databases, create queries and reports to track and manage your information by using Base.
++ InitialPreference=5
++diff -u sysui/desktop/menus.old/calc.desktop sysui/desktop/menus/calc.desktop
++--- sysui/desktop/menus.old/calc.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/calc.desktop 2010-12-15 18:33:28.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -calc %U
++ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
++ Name=%PRODUCTNAME Calc
+++Name[pt-BR]=%PRODUCTNAME_BR Calc
++ GenericName=Spreadsheet
++ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
++ InitialPreference=5
++diff -u sysui/desktop/menus.old/draw.desktop sysui/desktop/menus/draw.desktop
++--- sysui/desktop/menus.old/draw.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/draw.desktop 2010-12-15 18:33:38.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -draw %U
++ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
++ Name=%PRODUCTNAME Draw
+++Name[pt-BR]=%PRODUCTNAME_BR Draw
++ GenericName=Drawing Program
++ Comment=Create and edit drawings, flow charts, and logos by using Draw.
++ InitialPreference=5
++diff -u sysui/desktop/menus.old/impress.desktop sysui/desktop/menus/impress.desktop
++--- sysui/desktop/menus.old/impress.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/impress.desktop 2010-12-15 18:33:47.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -impress %U
++ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
++ Name=%PRODUCTNAME Impress
+++Name[pt-BR]=%PRODUCTNAME_BR Impress
++ GenericName=Presentation
++ Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
++ InitialPreference=5
++diff -u sysui/desktop/menus.old/javafilter.desktop sysui/desktop/menus/javafilter.desktop
++--- sysui/desktop/menus.old/javafilter.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/javafilter.desktop 2010-12-15 18:33:59.000000000 +0100
++@@ -5,5 +5,6 @@
++ Exec=openoffice -writer %U
++ MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
++ Name=%PRODUCTNAME Small Device Format Importer
+++Name[pt-BR]=%PRODUCTNAME_BR Small Device Format Importer
++ GenericName=Small Device Format Importer
++ NoDisplay=true
++diff -u sysui/desktop/menus.old/math.desktop sysui/desktop/menus/math.desktop
++--- sysui/desktop/menus.old/math.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/math.desktop 2010-12-15 18:34:17.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -math %U
++ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
++ Name=%PRODUCTNAME Math
+++Name[pt-BR]=%PRODUCTNAME_BR Math
++ GenericName=Formula Editor
++ Comment=Create and edit scientific formulas and equations by using Math.
++ InitialPreference=5
++diff -u sysui/desktop/menus.old/printeradmin.desktop sysui/desktop/menus/printeradmin.desktop
++--- sysui/desktop/menus.old/printeradmin.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/printeradmin.desktop 2010-12-15 18:34:34.000000000 +0100
++@@ -6,3 +6,5 @@
++ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;
++ Exec=${UNIXBASISROOTNAME}-printeradmin
++ Name=%PRODUCTNAME Printer Administration
+++Name[pt-BR]=%PRODUCTNAME_BR Printer Administration
+++
++diff -u sysui/desktop/menus.old/qstart.desktop sysui/desktop/menus/qstart.desktop
++--- sysui/desktop/menus.old/qstart.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/qstart.desktop 2010-12-15 18:34:54.000000000 +0100
++@@ -6,4 +6,5 @@
++ Exec=${UNIXBASISROOTNAME} -quickstart -nologo -nodefault
++ NoDisplay=true
++ Name=%PRODUCTNAME Quickstarter
+++Name[pt-BR]=%PRODUCTNAME_BR Quickstarter
++ Comment=Hook for quickstarter startup
++diff -u sysui/desktop/menus.old/startcenter.desktop sysui/desktop/menus/startcenter.desktop
++--- sysui/desktop/menus.old/startcenter.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/startcenter.desktop 2010-12-15 18:35:16.000000000 +0100
++@@ -7,5 +7,6 @@
++ Exec=${UNIXBASISROOTNAME} %U
++ MimeType=application/vnd.openofficeorg.extension;
++ Name=%PRODUCTNAME
+++Name[pt-BR]=%PRODUCTNAME_BR
++ GenericName=Office
++ Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems.
++diff -u sysui/desktop/menus.old/writer.desktop sysui/desktop/menus/writer.desktop
++--- sysui/desktop/menus.old/writer.desktop 2010-12-14 19:15:31.000000000 +0100
+++++ sysui/desktop/menus/writer.desktop 2010-12-15 18:35:28.000000000 +0100
++@@ -7,6 +7,7 @@
++ Exec=${UNIXBASISROOTNAME} -writer %U
++ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
++ Name=%PRODUCTNAME Writer
+++Name[pt-BR]=%PRODUCTNAME_BR Writer
++ GenericName=Word Processor
++ Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
++ InitialPreference=5
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index e66f188..61ddf28 100755
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
+@@ -345,6 +345,8 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
+ #Fix version number bug in patch for old libxml2
+ libxmlsec-olderlibxml2patch-fix.diff, jopsen
+
++broffice-desktop-name.diff
++
+ [ LinuxOnly ]
+ # fix that allows OOo to work with a standard (unpatched) libjpeg,
+ jpegc.c.diff, i#80674, n#272574, flr
=== modified file 'rules'
--- a/rules 2010-12-15 16:18:50 +0000
+++ b/rules 2010-12-16 17:45:55 +0000
@@ -1888,7 +1888,11 @@
ifeq (sk,$(findstring sk,$(HELPISOS)))
perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control
endif
-
+ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
+ perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
+ perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
+ perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
+endif
perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nReplaces: libreoffice$(VER)-common (<< 1:3.0.0~dev300m28)/' debian/control
ifeq "$(ENABLE_GIO)" "y"
@@ -2490,6 +2494,14 @@
done
endif
+ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
+ # move pt-BR ("BrOffice") splashs into -l10n-pt-br
+ 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 \
+ $(PKGDIR)-l10n-pt-br/$(OOBRANDDIR)/program/about-pt_BR.png
+endif
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@ -3079,76 +3091,6 @@
touch $@
-broffice: $(STAMP_DIR)/broffice
-$(STAMP_DIR)/broffice: $(STAMP_DIR)/install $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep $(STAMP_DIR)/langpacks
- dh_testdir
- dh_testroot
-
- # BrOffice.org
- 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$(VER)/usr/share/templates
-endif
- cat $(PKGDIR)-common/$(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</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/" \
- > 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=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 >/dev/null; pwd`" ;\
- 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/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/openoffice.applications \
- | sed -e s/OFFICENAME/broffice/g \
- | 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/*.keys; do \
- cat $$i >> debian/broffice/usr/share/mime-info/openoffice.keys; \
- done
- mv $(PKGDIR)-common/$(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$(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$(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,`; \
- ln -s `basename $$i` `echo $$i | sed -e s,libreoffice-common,broffice, | sed -e s/libreoffice/broffice/`; \
- done
-
- touch $@
-
# Install files generated by setup into arch-independent package directories
install-indep: $(STAMP_DIR)/install-indep
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).install
Reply to: