./packages/openofficeorg/3.0.1/unstable r1465: hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate control, remove missing ,
------------------------------------------------------------
revno: 1465
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-04-25 15:30:20 +0200
message:
hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate control, remove missing ,
added:
control.kde.in
modified:
control
control.debug.in
control.in
rules
=== modified file 'control'
--- a/control 2009-04-23 11:26:14 +0000
+++ b/control 2009-04-25 13:30:20 +0000
@@ -3354,7 +3354,7 @@
Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (= ${binary:Version} | openoffice.org-dev (= ${binary:Version} | openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (= ${binary:Version} | openoffice.org-calc (= ${binary:Version}, openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (= ${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} | openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (= ${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (= ${binary:Version} | mozilla-openoffice.org (= ${binary:Version}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}) | openoffice.org-gcj (= ${binary:Version}) | openoffice.org-dev (= ${binary:Version}) | openoffice.org-gnome (= ${binary:Version}) | openoffice.org-kde (= ${binary:Version}) | openoffice.org-calc (= ${binary:Version}) | openoffice.org-base-core (= ${binary:Version}) | openoffice.org-base (= ${binary:Version}) | openoffice.org-impress (= ${binary:Version}) | openoffice.org-filter-binfilter (= ${binary:Version}) | openoffice.org-draw (= ${binary:Version}) | openoffice.org-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-openoffice.org (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-04-23 10:41:26 +0000
+++ b/control.debug.in 2009-04-25 13:30:20 +0000
@@ -2,7 +2,7 @@
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj (= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} | openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (= ${binary:Version} | openoffice.orgVER-calc (= ${binary:Version}, openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (= ${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} | openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (= ${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (= ${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version}, ${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version}) | openoffice.orgVER-gcj (= ${binary:Version}) | openoffice.orgVER-dev (= ${binary:Version}) | openoffice.orgVER-gnome (= ${binary:Version}) | openoffice.orgVER-kde (= ${binary:Version}) | openoffice.orgVER-calc (= ${binary:Version}) | openoffice.orgVER-base-core (= ${binary:Version}) | openoffice.orgVER-base (= ${binary:Version}) | openoffice.orgVER-impress (= ${binary:Version}) | openoffice.orgVER-filter-binfilter (= ${binary:Version}) | openoffice.orgVER-draw (= ${binary:Version}) | openoffice.orgVER-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-openoffice.orgVER (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
=== modified file 'control.in'
--- a/control.in 2009-04-24 07:55:55 +0000
+++ b/control.in 2009-04-25 13:30:20 +0000
@@ -264,7 +264,7 @@
Depends: openoffice.orgVER-style-galaxy,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
- openoffice.orgVER-style-hicontrast,
+ openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal,
xfonts-mathml
=== added file 'control.kde.in'
--- a/control.kde.in 1970-01-01 00:00:00 +0000
+++ b/control.kde.in 2009-04-25 13:30:20 +0000
@@ -0,0 +1,39 @@
+Package: openoffice.orgVER-kde
+Architecture: %OOO_ARCHS%
+Depends: openoffice.orgVER-core (= ${binary:Version}),
+ openoffice.orgVER-style-crystal,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: konqueror,
+ kmail,
+ openoffice.orgVER-kab
+Section: kde
+Enhances: openoffice.orgVER
+Conflicts: openoffice.org2-kde (<< ${binary:Version})
+Provides: openoffice.org2-kde
+Replaces: openoffice.org2-kde (<< ${binary:Version})
+Description: full-featured office productivity suite -- KDE integration
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the KDE plugin for drawing OOo's widgets with
+ KDE/Qt and a KDEish File Picker when running under KDE.
+ You can extend the functionality of this by installing these packages:
+ .
+ * konqueror / kmail
+ * openoffice.org-kab: KDE Addressbook support
+
+Package: openoffice.orgVER-kab
+Architecture: %OOO_ARCHS%
+Depends: openoffice.orgVER-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: kaddressbook
+Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
+Description: full-featured office productivity suite -- KDE adressbook support
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows OpenOffice.org to access the KDE Addressbook.
+ You need to install kaddressbook separately.
+
=== modified file 'rules'
--- a/rules 2009-04-17 18:37:06 +0000
+++ b/rules 2009-04-25 13:30:20 +0000
@@ -136,7 +136,7 @@
BUILD_CAIROCANVAS=y
USE_SYSTEM_CAIRO=y
CAIRO_FONTS_PATCH=y
-BUILD_KDE=y
+BUILD_KDE=n
ifeq "$(BUILD_KDE)" "y"
ENABLE_KDEAB=y
endif
Reply to: