./packages/openofficeorg/3.0.1/unstable r1458: merge
------------------------------------------------------------
revno: 1458
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 11:45:34 +0200
message:
merge
modified:
changelog
control
control.fonts.in
control.mono.in
=== modified file 'changelog'
--- a/changelog 2009-04-15 09:42:15 +0000
+++ b/changelog 2009-04-15 09:45:34 +0000
@@ -10,7 +10,7 @@
* debian/control*in:
- update for new sections:
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
- -base -> database
+ -base -> database, ttf-opensymbol -> fonts, *cli* -> cli-mono
-- Rene Engelhard <rene@debian.org> Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:43:12 +0000
+++ b/control 2009-04-15 09:45:34 +0000
@@ -3151,7 +3151,7 @@
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
Package: cli-uno-bridge
-Section: libs
+Section: cli-mono
Architecture: i386 sparc amd64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends}
Conflicts: libuno-cil, libuno-cli-types1.1-cil
@@ -3168,7 +3168,7 @@
OpenOffice.org is *not* yet supported.
Package: libuno-cli-basetypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- base types
@@ -3179,7 +3179,7 @@
some base types.
Package: libuno-cli-uretypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- URE type library
@@ -3190,7 +3190,7 @@
and interfaces for components and client programs. It contains the URE types.
Package: libuno-cli-oootypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- OpenOffice.org type library
@@ -3201,7 +3201,7 @@
and interfaces for components and client programs. It contains the OOo types.
Package: libuno-cli-cppuhelper1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- bootstrapping library
@@ -3213,7 +3213,7 @@
implemented in different languages).
Package: libuno-cli-ure1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends}
Description: OpenOffice.org bindings for Mono CLI -- helper classes
@@ -3347,7 +3347,7 @@
Homepage: http://extensions.services.openoffice.org/project/pdfimport
Package: ttf-opensymbol
-Section: x11
+Section: fonts
Architecture: all
Replaces: openoffice.org (<= 1.1.1+1.1.2rc3)
Depends: ${misc:Depends}
=== modified file 'control.fonts.in'
--- a/control.fonts.in 2009-03-29 20:28:49 +0000
+++ b/control.fonts.in 2009-04-15 09:45:34 +0000
@@ -1,5 +1,5 @@
Package: ttf-opensymbol
-Section: x11
+Section: fonts
Architecture: all
Replaces: openoffice.org (<= 1.1.1+1.1.2rc3)
Depends: ${misc:Depends}
=== modified file 'control.mono.in'
--- a/control.mono.in 2009-03-29 20:28:49 +0000
+++ b/control.mono.in 2009-04-15 09:45:34 +0000
@@ -1,5 +1,5 @@
Package: cli-uno-bridge
-Section: libs
+Section: cli-mono
Architecture: %OOO_MONO_ARCHS%
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>> ${base-version}),
@@ -24,7 +24,7 @@
OpenOffice.org is *not* yet supported.
Package: libuno-cli-basetypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -36,7 +36,7 @@
some base types.
Package: libuno-cli-uretypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -48,7 +48,7 @@
and interfaces for components and client programs. It contains the URE types.
Package: libuno-cli-oootypes1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
@@ -60,7 +60,7 @@
and interfaces for components and client programs. It contains the OOo types.
Package: libuno-cli-cppuhelper1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends}, cli-uno-bridge,
${misc:Depends}
@@ -73,7 +73,7 @@
implemented in different languages).
Package: libuno-cli-ure1.0-cil
-Section: libs
+Section: cli-mono
Architecture: all
Depends: ${cli:Depends},
${misc:Depends}
Reply to: