[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-33-gd927011
The following commit has been merged in the debian-experimental-4.0 branch:
commit d9270112f87ab99c6d5e56866e6d9b4e9e9e9e13
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 10 14:38:25 2013 +0100
remove VER support, not used anymore...
diff --git a/control.debug.in b/control.debug.in
index d7e4fda..10ddc7c 100644
--- a/control.debug.in
+++ b/control.debug.in
@@ -1,8 +1,8 @@
-Package: libreofficeVER-dbg
+Package: libreoffice-dbg
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: libreofficeVER-core (= ${binary:Version}) | libreofficeVER-dev (= ${binary:Version}) | libreofficeVER-gnome (= ${binary:Version}) | libreofficeVER-kde (= ${binary:Version}) | libreofficeVER-calc (= ${binary:Version}) | libreofficeVER-base-core (= ${binary:Version}) | libreofficeVER-base (= ${binary:Version}) | libreofficeVER-impress (= ${binary:Version}) | libreofficeVER-draw (= ${binary:Version}) | libreofficeVER-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | browser-plugin-libreofficeVER (= ${binary:Version}) | libreofficeVER-ogltrans (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | browser-plugin-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}),
${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
diff --git a/control.evolution.in b/control.evolution.in
index b7583ca..f22bfa3 100644
--- a/control.evolution.in
+++ b/control.evolution.in
@@ -1,15 +1,15 @@
-Package: libreofficeVER-evolution
+Package: libreoffice-evolution
Architecture: %OOO_BASE_ARCHS%
Section: gnome
-Depends: libreofficeVER-base,
- libreofficeVER-common (>= 1:3.4.0~),
- libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-base,
+ libreoffice-common (>= 1:3.4.0~),
+ libreoffice-core (= ${binary:Version}),
${libebook-dep},
${misc:Depends},
${shlibs:Depends}
Recommends: evolution
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: libreofficeVER-common (<< 1:3.3.3-2~)
+Replaces: libreoffice-common (<< 1:3.3.3-2~)
Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.gcj.in b/control.gcj.in
index 6d8935a..9baaace 100644
--- a/control.gcj.in
+++ b/control.gcj.in
@@ -1,19 +1,19 @@
-Package: libreofficeVER-gcj
+Package: libreoffice-gcj
Architecture: %OOO_GCJ_ARCHS%
Section: java
Depends: gcj-jre,
- libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-java-common (= ${source:Version}),
+ libreoffice-core (= ${binary:Version}),
+ libreoffice-java-common (= ${source:Version}),
${java-gcj-depends},
${java:Depends},
${misc:Depends},
${shlibs:Depends}
-Enhances: libreofficeVER-base, libreofficeVER-writer
+Enhances: libreoffice-base, libreoffice-writer
Description: office productivity suite -- Java libraries for GIJ
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the .jars from libreofficeVER-java-common compiled to
+ This package contains the .jars from libreoffice-java-common compiled to
native to make the Java features of LibreOffice faster when using gij.
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
diff --git a/control.help.in b/control.help.in
index 7729952..54e497a 100644
--- a/control.help.in
+++ b/control.help.in
@@ -1,9 +1,9 @@
-Package: libreofficeVER-help-@LCODE@
+Package: libreoffice-help-@LCODE@
Architecture: all
Section: doc
-Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@
-Depends: libreofficeVER-l10n-@LCODE@,
- libreofficeVER-writer | language-support-translations-@CCODE@,
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-@CCODE@
+Depends: libreoffice-l10n-@LCODE@,
+ libreoffice-writer | language-support-translations-@CCODE@,
${misc:Depends}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- @LNAME@ help
diff --git a/control.in b/control.in
index cfcd3a8..f3c5877 100644
--- a/control.in
+++ b/control.in
@@ -1,4 +1,4 @@
-Source: libreofficeVER
+Source: libreoffice
Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
@@ -57,25 +57,25 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
nvidia-glx-legacy-dev,
qt3-dev-tools
Standards-Version: 3.9.4
-XS-Python-Version: @PYTHON2_VERSION@
-XS-Python3-Version: @PYTHON_VERSION_CONTROL@
+XS-Python-Version: @PYTHON2_SION@
+XS-Python3-Version: @PYTHON_SION_CONTROL@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
-Package: libreofficeVER
+Package: libreoffice
Architecture: %OOO_ARCHS%
Section: metapackages
-Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
- libreofficeVER-calc,
- libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-draw,
- libreofficeVER-filter-mobiledev,
- libreofficeVER-impress,
- libreofficeVER-math,
- libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
- libreofficeVER-writer,
+Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
+ libreoffice-calc,
+ libreoffice-core (= ${binary:Version}),
+ libreoffice-draw,
+ libreoffice-filter-mobiledev,
+ libreoffice-impress,
+ libreoffice-math,
+ libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
+ libreoffice-writer,
ttf-dejavu,
fonts-sil-gentium-basic,
${java-common-depends},
@@ -89,9 +89,9 @@ Suggests: cups-bsd,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
libreoffice-grammarcheck,
- libreofficeVER-gnome,
- libreofficeVER-help-${help-l10n-virtual-version},
- libreofficeVER-l10n-${help-l10n-virtual-version},
+ libreoffice-gnome,
+ libreoffice-help-${help-l10n-virtual-version},
+ libreoffice-l10n-${help-l10n-virtual-version},
libsane,
libxrender1,
myspell-dictionary,
@@ -107,25 +107,25 @@ Description: office productivity suite (metapackage)
a near drop-in replacement for Microsoft(R) Office.
.
This metapackage installs all components of libreoffice:
- * libreofficeVER-writer: Word processor
- * libreofficeVER-calc: Spreadsheet
- * libreofficeVER-impress: Presentation
- * libreofficeVER-draw: Drawing
- * libreofficeVER-base: Database
- * libreofficeVER-math: Equation editor
- * libreofficeVER-filter-mobiledev: Mobile Devices filters
+ * libreoffice-writer: Word processor
+ * libreoffice-calc: Spreadsheet
+ * libreoffice-impress: Presentation
+ * libreoffice-draw: Drawing
+ * libreoffice-base: Database
+ * libreoffice-math: Equation editor
+ * libreoffice-filter-mobiledev: Mobile Devices filters
.
You can extend the functionality of LibreOffice by installing these
packages:
* hunspell-*/myspell-*: Hunspell/Myspell dictionaries
for use with LibreOffice
- * libreofficeVER-l10n-*: UI interface translation
- * libreofficeVER-help-*: User help
+ * libreoffice-l10n-*: UI interface translation
+ * libreoffice-help-*: User help
* mythes-*: Thesauri for the use with LibreOffice
* hyphen-*: Hyphenation patterns for LibreOffice
- * libreofficeVER-gtk: Gtk UI Plugin, GNOME File Picker support,
+ * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
- * libreofficeVER-gnome: GNOME VFS, GConf backend
+ * libreoffice-gnome: GNOME VFS, GConf backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@ -143,20 +143,20 @@ Description: office productivity suite (metapackage)
media backend
* libpaper-utils: papersize detection support via paperconf
-Package: libreofficeVER-l10n-za
+Package: libreoffice-l10n-za
Section: metapackages
Architecture: all
-Depends: libreofficeVER-l10n-af,
- libreofficeVER-l10n-en-za,
- libreofficeVER-l10n-nr,
- libreofficeVER-l10n-nso,
- libreofficeVER-l10n-ss,
- libreofficeVER-l10n-st,
- libreofficeVER-l10n-tn,
- libreofficeVER-l10n-ts,
- libreofficeVER-l10n-ve,
- libreofficeVER-l10n-xh,
- libreofficeVER-l10n-zu,
+Depends: libreoffice-l10n-af,
+ libreoffice-l10n-en-za,
+ libreoffice-l10n-nr,
+ libreoffice-l10n-nso,
+ libreoffice-l10n-ss,
+ libreoffice-l10n-st,
+ libreoffice-l10n-tn,
+ libreoffice-l10n-ts,
+ libreoffice-l10n-ve,
+ libreoffice-l10n-xh,
+ libreoffice-l10n-zu,
${misc:Depends}
Description: office productivity suite -- South African language packages
LibreOffice is a full-featured office productivity suite that provides
@@ -165,19 +165,19 @@ Description: office productivity suite -- South African language packages
This package is a metapackage installing l10n packages for all 11 South
African languages.
-Package: libreofficeVER-l10n-in
+Package: libreoffice-l10n-in
Section: metapackages
Architecture: all
-Depends: libreofficeVER-l10n-as,
- libreofficeVER-l10n-bn,
- libreofficeVER-l10n-gu,
- libreofficeVER-l10n-hi,
- libreofficeVER-l10n-ml,
- libreofficeVER-l10n-mr,
- libreofficeVER-l10n-or,
- libreofficeVER-l10n-pa-in,
- libreofficeVER-l10n-ta,
- libreofficeVER-l10n-te,
+Depends: libreoffice-l10n-as,
+ libreoffice-l10n-bn,
+ libreoffice-l10n-gu,
+ libreoffice-l10n-hi,
+ libreoffice-l10n-ml,
+ libreoffice-l10n-mr,
+ libreoffice-l10n-or,
+ libreoffice-l10n-pa-in,
+ libreoffice-l10n-ta,
+ libreoffice-l10n-te,
${misc:Depends}
Recommends: fonts-indic
Description: office productivity suite -- Indic language packages
@@ -187,11 +187,11 @@ Description: office productivity suite -- Indic language packages
This package is a metapackage installing l10n packages for all available
indic languages.
-Package: libreofficeVER-core
+Package: libreoffice-core
Architecture: %OOO_ARCHS%
Depends: fontconfig,
fonts-opensymbol,
- libreofficeVER-common (>> ${base-version}),
+ libreoffice-common (>> ${base-version}),
${misc:Depends},
${shlibs:Depends}
Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
@@ -225,17 +225,17 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
libreoffice-style-hicontrast (<< 1:3.3.0-1),
libreoffice-style-oxygen (<< 1:3.3.0-1),
libreoffice-style-tango (<< 1:3.3.0-1),
- libreofficeVER-base (<< ${binary:Version}),
- libreofficeVER-calc (<< ${binary:Version}),
- libreofficeVER-dev (<< ${binary:Version}),
- libreofficeVER-draw (<< ${binary:Version}),
- libreofficeVER-evolution (<< ${binary:Version}),
- libreofficeVER-gnome (<< ${binary:Version}),
- libreofficeVER-gtk (<< ${binary:Version}),
- libreofficeVER-impress (<< ${binary:Version}),
- libreofficeVER-kde (<< ${binary:Version}),
- libreofficeVER-officebean (<< ${binary:Version}),
- libreofficeVER-writer (<< ${binary:Version}),
+ libreoffice-base (<< ${binary:Version}),
+ libreoffice-calc (<< ${binary:Version}),
+ libreoffice-dev (<< ${binary:Version}),
+ libreoffice-draw (<< ${binary:Version}),
+ libreoffice-evolution (<< ${binary:Version}),
+ libreoffice-gnome (<< ${binary:Version}),
+ libreoffice-gtk (<< ${binary:Version}),
+ libreoffice-impress (<< ${binary:Version}),
+ libreoffice-kde (<< ${binary:Version}),
+ libreoffice-officebean (<< ${binary:Version}),
+ libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
myspell-af (<< 1:3.1.0-3),
@@ -281,10 +281,10 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreofficeVER-unbundled
-Provides: libreofficeVER-bundled
-Replaces: libreofficeVER-calc (<< 1:3.3.2-5),
- libreofficeVER-common (<= 1:4.0.0~beta2-1),
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Provides: libreoffice-bundled
+Replaces: libreoffice-calc (<< 1:3.3.2-5),
+ libreoffice-common (<= 1:4.0.0~beta2-1),
uno-libs3 (<< 1:3.6.1-2),
ure (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
@@ -292,34 +292,34 @@ Description: office productivity suite -- arch-dependent files
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the architecture-dependent core files of
- LibreOffice. See the libreofficeVER package for more information.
+ LibreOffice. See the libreoffice package for more information.
-Package: libreofficeVER-common
+Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: libreofficeVER-style-default | libreofficeVER-style,
+Depends: libreoffice-style-default | libreoffice-style,
ure,
${misc:Depends}
-Suggests: libreofficeVER-style-crystal,
- libreofficeVER-style-hicontrast,
- libreofficeVER-style-oxygen,
- libreofficeVER-style-tango
+Suggests: libreoffice-style-crystal,
+ libreoffice-style-hicontrast,
+ libreoffice-style-oxygen,
+ libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
-Breaks: libreofficeVER-core (<< 1:${oover}~),
- libreofficeVER-core (>= 1:${next-oover}~),
- libreofficeVER-style-andromeda (<< 1:${oover}~),
- libreofficeVER-style-crystal (<< 1:${oover}~),
- libreofficeVER-style-crystal (>= 1:${next-oover}~),
- libreofficeVER-style-galaxy (<< 1:${oover}~),
- libreofficeVER-style-galaxy (>= 1:${next-oover}~),
- libreofficeVER-style-hicontrast (<< 1:${oover}~),
- libreofficeVER-style-hicontrast (>= 1:${next-oover}~),
- libreofficeVER-style-oxygen (<< 1:${oover}~),
- libreofficeVER-style-oxygen (>= 1:${next-oover}~),
- libreofficeVER-style-tango (<< 1:${oover}~),
- libreofficeVER-style-tango (>= 1:${next-oover}~),
+Breaks: libreoffice-core (<< 1:${oover}~),
+ libreoffice-core (>= 1:${next-oover}~),
+ libreoffice-style-andromeda (<< 1:${oover}~),
+ libreoffice-style-crystal (<< 1:${oover}~),
+ libreoffice-style-crystal (>= 1:${next-oover}~),
+ libreoffice-style-galaxy (<< 1:${oover}~),
+ libreoffice-style-galaxy (>= 1:${next-oover}~),
+ libreoffice-style-hicontrast (<< 1:${oover}~),
+ libreoffice-style-hicontrast (>= 1:${next-oover}~),
+ libreoffice-style-oxygen (<< 1:${oover}~),
+ libreoffice-style-oxygen (>= 1:${next-oover}~),
+ libreoffice-style-tango (<< 1:${oover}~),
+ libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
@@ -330,9 +330,9 @@ Description: office productivity suite -- arch-independent files
This package contains the architecture-independent files of
LibreOffice.
-Package: libreofficeVER-java-common
+Package: libreoffice-java-common
Architecture: all
-Depends: libreofficeVER-common, ${java:Depends}, ${misc:Depends}
+Depends: libreoffice-common, ${java:Depends}, ${misc:Depends}
Description: office productivity suite -- arch-independent Java support files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -340,28 +340,28 @@ Description: office productivity suite -- arch-independent Java support files
This package contains the architecture-independent files of
the Java support for LibreOffice (Java classes, scripts, config snippets).
-Package: libreofficeVER-writer
+Package: libreoffice-writer
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
- libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
+ libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreofficeVER-emailmerge,
- libreofficeVER-math,
+Recommends: libreoffice-emailmerge,
+ libreoffice-math,
${java-common-depends},
${java-runtime-depends}
-Replaces: libreofficeVER-core (<< 1:3.3.2-5)
-Suggests: libreofficeVER-base, libreofficeVER-gcj
+Replaces: libreoffice-core (<< 1:3.3.2-5)
+Suggests: libreoffice-base, libreoffice-gcj
Description: office productivity suite -- word processor
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the wordprocessor component for LibreOffice.
-Package: libreofficeVER-calc
+Package: libreoffice-calc
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
- libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
+ libreoffice-core (= ${binary:Version}),
${lpsolve-dep},
${misc:Depends},
${shlibs:Depends}
@@ -371,10 +371,10 @@ Description: office productivity suite -- spreadsheet
.
This package contains the spreadsheet component for LibreOffice.
-Package: libreofficeVER-impress
+Package: libreoffice-impress
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-draw (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-draw (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: office productivity suite -- presentation
@@ -383,9 +383,9 @@ Description: office productivity suite -- presentation
.
This package contains the presentation component for LibreOffice.
-Package: libreofficeVER-draw
+Package: libreoffice-draw
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: office productivity suite -- drawing
@@ -394,10 +394,10 @@ Description: office productivity suite -- drawing
.
This package contains the drawing component for LibreOffice.
-Package: libreofficeVER-math
+Package: libreoffice-math
Architecture: %OOO_ARCHS%
Depends: fonts-opensymbol,
- libreofficeVER-core (= ${binary:Version}),
+ libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: office productivity suite -- equation editor
@@ -406,13 +406,13 @@ Description: office productivity suite -- equation editor
.
This package contains the equation editor component for LibreOffice.
-Package: libreofficeVER-base-core
+Package: libreoffice-base-core
Architecture: %OOO_BASE_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Replaces: libreofficeVER-base (<< 1:3.5.3~rc2-1)
-Suggests: libreofficeVER-base
+Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
+Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -421,13 +421,13 @@ Description: office productivity suite -- shared library
suite used by Base, Writer and Calc.
.
If you need full Base functionality (or actual database drivers), please
- install libreofficeVER-base.
+ install libreoffice-base.
-Package: libreofficeVER-base
+Package: libreoffice-base
Architecture: %OOO_BASE_ARCHS%
Section: database
-Depends: libreofficeVER-base-core (= ${binary:Version}),
- libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-base-core (= ${binary:Version}),
+ libreoffice-core (= ${binary:Version}),
${java-common-depends},
${java-runtime-depends},
${java:Depends},
@@ -435,8 +435,8 @@ Depends: libreofficeVER-base-core (= ${binary:Version}),
${shlibs:Depends}
Suggests: libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libjtds-java,
- libreofficeVER-gcj,
- libreofficeVER-report-builder,
+ libreoffice-gcj,
+ libreoffice-report-builder,
unixodbc
Description: office productivity suite -- database
LibreOffice is a full-featured office productivity suite that provides
@@ -461,11 +461,11 @@ Description: office productivity suite -- database
- PostgreSQL
- MS SQL Server and Sybase
-Package: libreofficeVER-style-crystal
+Package: libreoffice-style-crystal
Architecture: all
-Depends: libreofficeVER-core, ${misc:Depends}
+Depends: libreoffice-core, ${misc:Depends}
Suggests: crystalcursors, kde-icons-crystal
-Provides: libreofficeVER-style
+Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Crystal symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -473,11 +473,11 @@ Description: office productivity suite -- Crystal symbol style
.
This package contains the "crystal" symbol style, default style for KDE 3.
-Package: libreofficeVER-style-oxygen
+Package: libreoffice-style-oxygen
Architecture: all
-Depends: libreofficeVER-core, ${misc:Depends}
+Depends: libreoffice-core, ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
-Provides: libreofficeVER-style
+Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Oxygen symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -485,11 +485,11 @@ Description: office productivity suite -- Oxygen symbol style
.
This package contains the "oxygen" symbol style, default style for KDE 4.
-Package: libreofficeVER-style-tango
+Package: libreoffice-style-tango
Architecture: all
-Depends: libreofficeVER-core, ${misc:Depends}
+Depends: libreoffice-core, ${misc:Depends}
Suggests: tango-icon-theme
-Provides: libreofficeVER-style
+Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Tango symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -498,11 +498,11 @@ Description: office productivity suite -- Tango symbol style
This package contains the "tango" symbol style, default style
for GTK+/Gnome.
-Package: libreofficeVER-style-hicontrast
+Package: libreoffice-style-hicontrast
Architecture: all
-Depends: libreofficeVER-core, ${misc:Depends}
+Depends: libreoffice-core, ${misc:Depends}
Suggests: gtk2-engines
-Provides: libreofficeVER-style
+Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Hicontrast symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -511,10 +511,10 @@ Description: office productivity suite -- Hicontrast symbol style
This package contains the "hicontrast" symbol style, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreofficeVER-style-galaxy
+Package: libreoffice-style-galaxy
Architecture: all
-Depends: libreofficeVER-core, ${misc:Depends}
-Provides: libreofficeVER-style, libreofficeVER-style-default
+Depends: libreoffice-core, ${misc:Depends}
+Provides: libreoffice-style, libreoffice-style-default
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
@@ -524,14 +524,14 @@ Description: office productivity suite -- Galaxy (Default) symbol style
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreofficeVER-gtk
+Package: libreoffice-gtk
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreofficeVER-style-tango
+Recommends: libreoffice-style-tango
Section: gnome
-Enhances: libreofficeVER
+Enhances: libreoffice
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
Description: office productivity suite -- GTK+ integration
LibreOffice is a full-featured office productivity suite that provides
@@ -541,14 +541,14 @@ Description: office productivity suite -- GTK+ integration
with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
under GNOME. It also contains a QuickStarter for the "notification area".
-Package: libreofficeVER-gtk3
+Package: libreoffice-gtk3
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreofficeVER-style-tango
+Recommends: libreoffice-style-tango
Section: gnome
-Enhances: libreofficeVER
+Enhances: libreoffice
Description: office productivity suite -- GTK+ 3.0 integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -556,16 +556,16 @@ Description: office productivity suite -- GTK+ 3.0 integration
This package contains the Gtk plugin for drawing LibreOffices widgets
with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
-Package: libreofficeVER-gnome
+Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Depends: gconf2,
- libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-gtk,
+ libreoffice-core (= ${binary:Version}),
+ libreoffice-gtk,
${misc:Depends},
${shlibs:Depends}
-Suggests: libreofficeVER-evolution
+Suggests: libreoffice-evolution
Section: gnome
-Enhances: libreofficeVER
+Enhances: libreoffice
Provides: libreoffice-gtk-gnome
Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
@@ -575,16 +575,16 @@ Description: office productivity suite -- GNOME integration
.
You can extend the functionality of this by installing these packages:
.
- * libreofficeVER-evolution: Evolution addressbook support
+ * libreoffice-evolution: Evolution addressbook support
* evolution
-Package: libreofficeVER-emailmerge
+Package: libreoffice-emailmerge
Architecture: all
-Depends: libreofficeVER-core,
+Depends: libreoffice-core,
${misc:Depends},
${python:Depends},
${pyuno-depends}
-Enhances: libreofficeVER-writer
+Enhances: libreoffice-writer
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Replaces: python-uno (<< 1:2.4.1-5)
Description: office productivity suite -- email mail merge
@@ -599,8 +599,8 @@ Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
Architecture: %OOO_ARCHS%
-Enhances: libreofficeVER
-Depends: libreofficeVER-core (= ${binary:Version}),
+Enhances: libreoffice
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
@@ -617,8 +617,8 @@ Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
-Enhances: libreofficeVER
-Depends: libreofficeVER-core (= ${binary:Version}),
+Enhances: libreoffice
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -631,10 +631,10 @@ Description: Python-UNO bridge
or the built in StarBasic scripting language.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: libreofficeVER-officebean
+Package: libreoffice-officebean
Architecture: %OOO_JAVA_ARCHS%
Section: java
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${java-common-depends},
${java-runtime-depends},
${java:Depends},
@@ -647,14 +647,14 @@ Description: office productivity suite -- Java bean
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreofficeVER-filter-mobiledev
+Package: libreoffice-filter-mobiledev
Section: misc
Architecture: all
Depends: ${java-common-depends},
${java-runtime-depends},
${java:Depends},
${misc:Depends}
-Breaks: libreofficeVER-core (<< 1:3.5~)
+Breaks: libreoffice-core (<< 1:3.5~)
Description: office productivity suite -- mobile devices filters
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -741,11 +741,11 @@ Description: JavaScript script support provider for LibreOffice scripting framew
.
This package contains the script provider to support JavaScript.
-Package: libreofficeVER-pdfimport
+Package: libreoffice-pdfimport
Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core, ${misc:Depends}, ${shlibs:Depends}
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.kab.in b/control.kab.in
index 28e1050..2834893 100644
--- a/control.kab.in
+++ b/control.kab.in
@@ -1,7 +1,7 @@
-Package: libreofficeVER-kab
+Package: libreoffice-kab
Architecture: %OOO_BASE_ARCHS%
-Depends: libreofficeVER-common (>= 1:3.4.0~),
- libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-common (>= 1:3.4.0~),
+ libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: kaddressbook
diff --git a/control.kde.in b/control.kde.in
index d18193a..0c7929a 100644
--- a/control.kde.in
+++ b/control.kde.in
@@ -1,12 +1,12 @@
-Package: libreofficeVER-kde
+Package: libreoffice-kde
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: ${kde-iconset-dep}
-Suggests: kmail, konqueror, libreofficeVER-kab
+Suggests: kmail, konqueror, libreoffice-kab
Section: kde
-Enhances: libreofficeVER
+Enhances: libreoffice
Replaces: libreoffice-core (= 1:3.5.0~beta2-1), openoffice.org-kde (<< 1:3.3.0~)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.lang.in b/control.lang.in
index 9d87c5c..1a20ea3 100644
--- a/control.lang.in
+++ b/control.lang.in
@@ -1,9 +1,9 @@
-Package: libreofficeVER-l10n-@LCODE@
+Package: libreoffice-l10n-@LCODE@
Section: localization
Architecture: all
Depends: libreoffice-common, ${misc:Depends}, @LOCALES_DEPENDS@
-Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@ @FONT_SUGGESTS@
-Provides: libreofficeVER-l10n-${help-l10n-virtual-version}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-@CCODE@ @FONT_SUGGESTS@
+Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-@LCODE@ | myspell-dictionary-@LCODE@,
hyphen-@LCODE@,
libreoffice-grammarcheck-@LCODE@,
diff --git a/control.librelogo.in b/control.librelogo.in
index 5548dc9..0a1d48c 100644
--- a/control.librelogo.in
+++ b/control.librelogo.in
@@ -1,7 +1,7 @@
-Package: libreofficeVER-librelogo
+Package: libreoffice-librelogo
Section: misc
Architecture: all
-Depends: libreofficeVER-core (>= 1:3.4~),
+Depends: libreoffice-core (>= 1:3.4~),
python3-uno (>= 4.0~) | python-uno,
${misc:Depends}
Description: Logo-like progamming language for LibreOffice
diff --git a/control.mediawiki.in b/control.mediawiki.in
index 653165b..20b00a8 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -1,13 +1,13 @@
-Package: libreofficeVER-wiki-publisher
+Package: libreoffice-wiki-publisher
Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
-Depends: libreofficeVER-core (>= 1:3.4~),
- libreofficeVER-java-common,
+Depends: libreoffice-core (>= 1:3.4~),
+ libreoffice-java-common,
${java:Depends},
${mediawiki-jar-depends},
${misc:Depends}
-Enhances: libreofficeVER-writer
+Enhances: libreoffice-writer
Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.minimizer.in b/control.minimizer.in
index f8094cb..58fc8a7 100644
--- a/control.minimizer.in
+++ b/control.minimizer.in
@@ -1,11 +1,11 @@
-Package: libreofficeVER-presentation-minimizer
+Package: libreoffice-presentation-minimizer
Section: misc
Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
-Depends: libreofficeVER-core,
- libreofficeVER-impress,
+Depends: libreoffice-core,
+ libreoffice-impress,
${misc:Depends},
${shlibs:Depends}
-Enhances: libreofficeVER-impress
+Enhances: libreoffice-impress
Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.mozilla.in b/control.mozilla.in
index b0a1dde..394a124 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -1,13 +1,13 @@
-Package: browser-plugin-libreofficeVER
+Package: browser-plugin-libreoffice
Section: net
Architecture: %OOO_NSPLUGIN_ARCHS%
Enhances: firefox,
iceape-browser,
iceweasel,
- libreofficeVER,
- libreofficeVER-core,
+ libreoffice,
+ libreoffice-core,
mozilla-browser
-Depends: libreofficeVER-core (>= 1:3.5.0~beta~),
+Depends: libreoffice-core (>= 1:3.5.0~beta~),
${misc:Depends},
${shlibs:Depends}
Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
diff --git a/control.mysql.in b/control.mysql.in
index 07ce5ca..949f856 100644
--- a/control.mysql.in
+++ b/control.mysql.in
@@ -1,7 +1,7 @@
-Package: libreofficeVER-mysql-connector
+Package: libreoffice-mysql-connector
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: libreofficeVER-core, ${misc:Depends}, ${shlibs:Depends}
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: mysql-server (>= 5.1)
Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
diff --git a/control.ogltrans.in b/control.ogltrans.in
index e0acbd1..7f18515 100644
--- a/control.ogltrans.in
+++ b/control.ogltrans.in
@@ -1,13 +1,13 @@
-Package: libreofficeVER-ogltrans
+Package: libreoffice-ogltrans
Section: graphics
Priority: extra
Architecture: %OOO_OGLTRANS_ARCHS%
-Depends: libreofficeVER-common,
- libreofficeVER-core,
- libreofficeVER-impress,
+Depends: libreoffice-common,
+ libreoffice-core,
+ libreoffice-impress,
${misc:Depends},
${shlibs:Depends}
-Enhances: libreofficeVER-impress
+Enhances: libreoffice-impress
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Description: LibreOffice Impress extension for transitions using OpenGL
LibreOffice is a full-featured office productivity suite that provide
diff --git a/control.postgresql.in b/control.postgresql.in
index a812832..7fe2266 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -1,7 +1,7 @@
-Package: libreofficeVER-sdbc-postgresql
+Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: libreofficeVER-core (>= 1:3.5.0~beta),
+Depends: libreoffice-core (>= 1:3.5.0~beta),
${misc:Depends},
${shlibs:Depends}
Suggests: postgresql (>= 8.4)
diff --git a/control.reportdesign.in b/control.reportdesign.in
index de01a20..d367fd0 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -1,10 +1,10 @@
-Package: libreofficeVER-report-builder
+Package: libreoffice-report-builder
Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
Depends: libreoffice-core,
libreoffice-java-common,
- libreofficeVER-report-builder-bin (>= ${base-version}),
+ libreoffice-report-builder-bin (>= ${base-version}),
${java:Depends},
${misc:Depends},
${report-builder-jar-depends}
@@ -12,7 +12,7 @@ Conflicts: libreoffice-common (<< 1:3.5~),
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
-Enhances: libreofficeVER-base
+Enhances: libreoffice-base
Description: LibreOffice extension for building database reports
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -24,11 +24,11 @@ Description: LibreOffice extension for building database reports
accomplish complex database reports."
Homepage: http://extensions.services.openoffice.org/project/reportdesign
-Package: libreofficeVER-report-builder-bin
+Package: libreoffice-report-builder-bin
Section: misc
Architecture: %OOO_REPORTDESIGN_ARCHS%
Depends: libreoffice-core,
- libreofficeVER-base,
+ libreoffice-base,
${misc:Depends},
${shlibs:Depends}
Description: LibreOffice extension for building database reports -- libraries
diff --git a/control.sdk.in b/control.sdk.in
index 97a5492..c02c270 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -1,13 +1,13 @@
-Package: libreofficeVER-dev
+Package: libreoffice-dev
Section: devel
Architecture: %OOO_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${idlc-cpp-depends},
${misc:Depends},
${shlibs:Depends}
Recommends: dmake, g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: c-shell, libmythes-dev, libreoffice-dev-doc
-Replaces: libreofficeVER-core (<< 1:4.0.0~rc2)
+Replaces: libreoffice-core (<< 1:4.0.0~rc2)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -16,13 +16,13 @@ Description: office productivity suite -- SDK
LibreOffice (includes, IDL files, build tools, ...). It also contains
the zipped source of the UNO Java libraries for use in IDEs like eclipse.
-Package: libreofficeVER-dev-doc
+Package: libreoffice-dev-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: libreofficeVER-dev (= ${binary:Version}),
+Recommends: libreoffice-dev (= ${binary:Version}),
www-browser
-Suggests: libreofficeVER-dtd-officedocument1.0
+Suggests: libreoffice-dtd-officedocument1.0
Conflicts: openoffice.org-dev-doc
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.transitionals.in b/control.transitionals.in
index ad2f340..6d6c702 100644
--- a/control.transitionals.in
+++ b/control.transitionals.in
@@ -1,4 +1,4 @@
-Package: libreofficeVER-presenter-console
+Package: libreoffice-presenter-console
Section: oldlibs
Priority: extra
Architecture: all
diff --git a/rules b/rules
index a6504da..e9f451f 100755
--- a/rules
+++ b/rules
@@ -40,8 +40,8 @@ SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/
# Debian buildds run as user `buildd', other are using /CurrentlyBuilding
ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
-PKGDIR:=debian/libreoffice$(VER)
-OODIRNAME=libreoffice$(VER)
+PKGDIR:=debian/libreoffice
+OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
OOUREDIR:=usr/lib/ure
OOSDKDIR:=$(OODIR)/sdk
@@ -414,10 +414,10 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ENABLE_EVO2=n
ENABLE_KDEAB=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-base libreoffice$(VER)-base-core
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-evolution -Nlibreoffice$(VER)-kab
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-sdbc-postgresql -Nlibreoffice$(VER)-mysql-connector
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core
+ DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
+ DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql -Nlibreoffice-mysql-connector
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
CONFIGURE_FLAGS += --disable-database-connectivity
endif
endif
@@ -425,15 +425,15 @@ endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_MYSQLNATIVE=n
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presentation-minimizer
+ DEBHELPER_OPTIONS += -Nlibreoffice-mysql-connector
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-presentation-minimizer
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher -Nlibreoffice$(VER)-script-provider-python
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
else
CONFIGURE_FLAGS += --enable-extension-integration
@@ -443,15 +443,15 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
endif
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
ENABLE_REPORTDESIGN=n
SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
endif
endif
# disable SRB on ia64 when building with internal jfreereport.
@@ -808,7 +808,7 @@ ifeq "$(ENABLE_JAVA)" "y"
GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
- JAVA_COMMON_DEPENDS= , libreoffice$(VER)-java-common
+ JAVA_COMMON_DEPENDS= , libreoffice-java-common
JAVA_COMMON_DEPENDS_VERSION:= (>= $(BASE_VERSION)~)
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
@@ -849,11 +849,11 @@ export JAVA_HOME
else
CONFIGURE_FLAGS += --disable-ext-report-builder
endif
- OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
+ OOO_OFFICEBEAN_DEP = libreoffice-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev -Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh -Nlibreoffice$(VER)-script-provider-js
+ DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-filter-mobiledev -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
endif
ifneq (,$(filter nss, $(SYSTEM_STUFF)))
@@ -1017,7 +1017,7 @@ ifeq "$(BUILD_KDE)" "n"
else
CONFIGURE_FLAGS += --disable-kde
CONFIGURE_FLAGS += --enable-kde4
- KDE_ICONSET_DEP=libreoffice$(VER)-style-oxygen
+ KDE_ICONSET_DEP=libreoffice-style-oxygen
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
DBG_DBG_SUGGESTS+= , kdelibs5-dbg, libqt4-dbg
@@ -1045,7 +1045,7 @@ endif
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
- DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk -Nlibreoffice$(VER)-gnome
+ DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
else
BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
@@ -1057,7 +1057,7 @@ ifeq "$(BUILD_GTK3)" "y"
$(error GTK3 build fails without system-cairo!!)
endif
else
- DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk3
+ DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3
endif
ifeq "$(ENABLE_EVO2)" "n"
@@ -1115,12 +1115,12 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
CONFIGURE_FLAGS += --enable-scripting-beanshell
else
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-bsh
+ DEBHELPER_OPTIONS += -Nlibreoffice-script-provider-bsh
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
CONFIGURE_FLAGS += --enable-scripting-javascript
else
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-js
+ DEBHELPER_OPTIONS += -Nlibreoffice-script-provider-js
endif
endif
@@ -1327,8 +1327,8 @@ endif
control: debian/control
debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang debian/rules
chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
- sed -e "s#libreofficeVER#libreoffice$(VER)#g" \
- -e "s#libreofficeVER#libreoffice$(VER)#g" \
+ sed -e "s#libreofficeVER#libreoffice#g" \
+ -e "s#libreofficeVER#libreoffice#g" \
-e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
@@ -1395,11 +1395,11 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
-e "s|@CCODE@|$$CCODE|g" \
-e "s|@FONT_SUGGESTS@|$$FONT_SUGGESTS|g" \
-e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
- -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ -e "s|libreofficeVER|libreoffice|g" \
-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
>> debian/control < debian/control.lang.in; \
done
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.transitionals.in
ifneq "$(ENABLE_HELP)" "n"
@@ -1410,81 +1410,81 @@ ifneq "$(ENABLE_HELP)" "n"
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
- -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.help.in; \
done
# en_US is in -common
- perl -pi -e 's|(Depends: libreoffice$(VER)-writer \| language-support-translations-en), libreoffice$(VER)-l10n-en-us|\1|' \
+ perl -pi -e 's|(Depends: libreoffice-writer \| language-support-translations-en), libreoffice-l10n-en-us|\1|' \
debian/control
- perl -pi -e 's|(Depends: libreoffice$(VER)-writer, libreoffice$(VER)-l10n-en-us)|\1, fonts-deva|' \
+ perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, fonts-deva|' \
debian/control
endif
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
ifeq "$(BUILD_JARS_NATIVE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.gcj.in
endif
endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.mozilla.in
endif
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.ogltrans.in
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.mediawiki.in
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.reportdesign.in
endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.minimizer.in
endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.fonts.in
endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.debug.in
endif
ifeq "$(PACKAGE_SDK)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.sdk.in
endif
ifeq "$(BUILD_KDE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.kde.in
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.postgresql.in
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.mysql.in
endif
ifeq "$(ENABLE_EVO2)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.evolution.in
endif
ifeq "$(ENABLE_KDEAB)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.kab.in
endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ sed -e "s|libreofficeVER|libreoffice|g" \
>> debian/control < debian/control.librelogo.in
endif
@@ -1500,7 +1500,7 @@ endif
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
ifeq "$(BUILD_KDE)" "y"
- perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice$(VER)-gnome | libreoffice$(VER)-kde,/' debian/control
+ perl -pi -e 's/ libreoffice-gnome,/ libreoffice-gnome | libreoffice-kde,/' debian/control
endif
ifeq (sk,$(findstring sk,$(HELPISOS)))
@@ -1511,8 +1511,8 @@ 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
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
- perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nConflicts: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice$(VER)-help-$(d),)/' debian/control
+ perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/' debian/control
+ perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nConflicts: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice-help-$(d),)/' debian/control
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
@@ -1531,7 +1531,7 @@ endif
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
-ifeq "$(VER)" ""
+ifeq "" ""
# no conflict with "universal Linux packages" as they have the version in their
# names thankfully now
perl -pi -e 's/libreoffice-unbundled, //' debian/control
@@ -1544,7 +1544,7 @@ endif
perl -pi -e 's/myspell-dictionary-tr/myspell-dictionary-tr | libreoffice-spellcheck-tr/' debian/control
ifeq "$(BUILD_KDE)" "y"
- perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-kde: KDE UI Plugin and KDE File Picker support/' debian/control
+ perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice-kde: KDE UI Plugin and KDE File Picker support/' debian/control
endif
ifeq "$(USE_DBUS)" "y"
@@ -1794,7 +1794,7 @@ endif
# fix up still sneaking in ./. They break dh_install (it installs
# but wrongly complains about it as not-installed files)
- perl -pi -e 's,\./,,' debian/libreoffice$(VER)-common.install
+ perl -pi -e 's,\./,,' debian/libreoffice-common.install
perl -pi -e 's,\./,,' debian/ure.install
ifneq "$(ENABLE_HELP)" "n"
@@ -1959,7 +1959,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
perl -pi -e "s/\@LANGPACKISOS\@/$(LANGPACKISOS)/" $$MAINTSCRIPT; \
perl -pi -e "s,\@OODIR\@,$(OODIR),g" $$MAINTSCRIPT; \
- perl -pi -e "s/\@VER\@/$(VER)/g" $$MAINTSCRIPT; \
+ perl -pi -e "s/\@VER\@//g" $$MAINTSCRIPT; \
fi; \
done; \
done
@@ -2011,10 +2011,10 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep $(SO
# replace duplicate files in the langpacks with symlinks
TMP=`mktemp -q`; \
fdupes --quiet --recurse --sameline --size \
- debian/libreoffice$(VER)-common/$(OODIR) \
- $(foreach d,$(shell echo $(filter-out en-US ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice$(VER)-l10n-$(d)/$(OODIR)) \
+ debian/libreoffice-common/$(OODIR) \
+ $(foreach d,$(shell echo $(filter-out en-US ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice-l10n-$(d)/$(OODIR)) \
> $$TMP && \
- debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
+ debian/scripts/cleandupes --base=libreoffice --prefix=debian < $$TMP && rm -f $$TMP
ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
@@ -2175,11 +2175,11 @@ ifeq "$(ENABLE_EVO2)" "y"
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- mkdir -p -m755 debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program
+ mkdir -p -m755 debian/browser-plugin-libreoffice/$(OODIR)/program
for f in libnpsoplugin.so nsplugin; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program; \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/browser-plugin-libreoffice/$(OODIR)/program; \
done
- cd debian/browser-plugin-libreoffice$(VER) && \
+ cd debian/browser-plugin-libreoffice && \
mkdir -p usr/lib/mozilla/plugins && \
ln -sf /$(OODIR)/program/libnpsoplugin.so \
usr/lib/mozilla/plugins/libnpsoplugin.so
@@ -2228,14 +2228,14 @@ endif
perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
# add version to .menu and .lintian-overrides
for i in base calc draw impress math writer; do \
- cat debian/libreoffice$(VER)-$$i.menu.in \
- | sed -e s/@VER@/$(VER)/ \
- > debian/libreoffice$(VER)-$$i.menu; \
+ cat debian/libreoffice-$$i.menu.in \
+ | sed -e s/@VER@// \
+ > debian/libreoffice-$$i.menu; \
done; \
for i in base calc core draw impress math writer; do \
- cat debian/libreoffice$(VER)-$$i.lintian-overrides.in \
- | sed -e s/@VER@/$(VER)/ \
- > debian/libreoffice$(VER)-$$i.lintian-overrides; \
+ cat debian/libreoffice-$$i.lintian-overrides.in \
+ | sed -e s/@VER@// \
+ > debian/libreoffice-$$i.lintian-overrides; \
done
ifeq "$(ENABLE_PYTHON)" "y"
@@ -2280,7 +2280,7 @@ ifeq "$(ENABLE_PYTHON)" "y"
endif
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- rm -f debian/libreoffice$(VER)-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ rm -f debian/libreoffice-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
mkdir -p debian/python3-uno/usr/share/doc/python3-uno
@@ -2474,9 +2474,9 @@ endif
# Install files generated by setup into arch-independent package directories
install-indep: $(STAMP_DIR)/install-indep
-#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).install
-#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER)-mimelnk.install
-#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).dirs
+#$(STAMP_DIR)/install-indep: debian/libreoffice.install
+#$(STAMP_DIR)/install-indep: debian/libreoffice-mimelnk.install
+#$(STAMP_DIR)/install-indep: debian/libreoffice.dirs
$(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-common
dh_testdir
dh_testroot
@@ -2857,7 +2857,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
dh_installmenu -s
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
- dh_nativejava -plibreoffice$(VER)-gcj -o
+ dh_nativejava -plibreoffice-gcj -o
endif
endif
ifeq "$(WHEEZY_BACKPORT)" "y"
@@ -2881,7 +2881,7 @@ endif
dh_link -s -X.desktop
dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice$(VER)-dbg
+ dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice-dbg
dh_strip -pure --dbg-package=ure-dbg
dh_strip -puno-libs3 --dbg-package=uno-libs3-dbg
# dh_strip --dbg-package= is not idempotent, force copying of the binaries
@@ -2931,7 +2931,7 @@ endif
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
- dh_shlibdeps -s -Nlibreoffice$(VER)-officebean \
+ dh_shlibdeps -s -Nlibreoffice-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep _bc)) \
$(SHLIBS_OVERRIDE)
@@ -2949,34 +2949,34 @@ endif
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
- dh_shlibdeps -plibreoffice$(VER)-officebean \
+ dh_shlibdeps -plibreoffice-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_DEP_PACKAGES); do \
- if [ "$$p" = "libreoffice$(VER)-presentation-console" ]; then continue; fi; \
- jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure; \
+ if [ "$$p" = "libreoffice-presentation-console" ]; then continue; fi; \
+ jh_depends -p$$p -Xlibreoffice-gcj -Xlibreoffice-dbg -Xure; \
done
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
- debian/libreoffice$(VER)-base.substvars
+ debian/libreoffice-base.substvars
perl -pi -e "s/base-files,//" \
- debian/libreoffice$(VER)-base.substvars
+ debian/libreoffice-base.substvars
endif
# jh_depends adds ure (${source:Version}) entries. They are overly strict
# and do not fit anyway given ure has a different versioning scheme. Excluded
# above, readd here unversioned
perl -pi -e 's/^(java:Depends.*$$)/\1, ure/' \
- debian/libreoffice$(VER)-officebean.substvars
+ debian/libreoffice-officebean.substvars
endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3 -Nuno-libs3-dbg \
- -Nlibreoffice$(VER)-presentation-minimizer \
- -Nlibreoffice$(VER)-mysql-connector -- \
+ -Nlibreoffice-presentation-minimizer \
+ -Nlibreoffice-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
-V'oover=$(OOVER)' \
@@ -2998,16 +2998,16 @@ endif
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "y"
perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
- debian/libreoffice$(VER)-officebean/DEBIAN/control
+ debian/libreoffice-officebean/DEBIAN/control
endif
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ifeq "$(ENABLE_MINIMIZER)" "y"
- dh_gencontrol -plibreoffice$(VER)-presentation-minimizer -- \
+ dh_gencontrol -plibreoffice-presentation-minimizer -- \
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
+ dh_gencontrol -plibreoffice-mysql-connector -- \
-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
@@ -3042,7 +3042,7 @@ ifeq "$(PACKAGE_SDK)" "y"
| sed -e "s/@UDK_MAJOR@/$$UDK_MAJOR/" \
-e "s/@UDK_MINOR@/$$UDK_MINOR/" \
-e "s/@UDK_MICRO@/$$UDK_MICRO/" \
- -e "s/@VER@/$(VER)/" \
+ -e "s/@VER@//" \
> debian/libreoffice-dev-doc.doc-base.udk-$$i-ref; \
done
# remove Autodoc_DiagnosticMessages.txt
@@ -3081,9 +3081,9 @@ endif
ln -sf libreoffice.1.gz $$i.gz; \
fi; \
done
- dh_installchangelogs -i -Nlibreoffice$(VER)-librelogo -k
+ dh_installchangelogs -i -Nlibreoffice-librelogo -k
ifeq "$(PACKAGE_LIBRELOGO)" "y"
- dh_installchangelogs -plibreoffice$(VER)-librelogo -k librelogo/source/ChangeLog
+ dh_installchangelogs -plibreoffice-librelogo -k librelogo/source/ChangeLog
endif
dh_installmime -i
dh_lintian -i
@@ -3102,12 +3102,12 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_INDEP_PACKAGES); do \
if echo "$$p" | grep -q help; then continue; fi; \
- jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg; \
+ jh_depends -p$$p -Xlibreoffice-gcj -Xlibreoffice-dbg; \
done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
- -Nlibreoffice$(VER)-report-builder \
- -Nlibreoffice$(VER)-wiki-publisher \
+ -Nlibreoffice-report-builder \
+ -Nlibreoffice-wiki-publisher \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
-V'base-version=$(BASE_VERSION)' \
@@ -3127,13 +3127,13 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- dh_gencontrol -plibreoffice$(VER)-wiki-publisher -- \
+ dh_gencontrol -plibreoffice-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
- dh_gencontrol -plibreoffice$(VER)-report-builder -- \
+ dh_gencontrol -plibreoffice-report-builder -- \
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
--
LibreOffice packaging repository
Reply to: