Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv30611
Modified Files:
changelog control control.in openoffice.org.install
Log Message:
* Tighten inter-package version dependencies to >> 1.1.0
* Move OpenSymbol font to fontconfig directory
/usr/share/fonts/truetype/openoffice
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- changelog 2 Oct 2003 15:23:24 -0000 1.196
+++ changelog 2 Oct 2003 18:07:33 -0000 1.197
@@ -47,6 +47,8 @@
* debian/openoffice.org{,-bin}.install:
+ remove mozilla files [RE]
+ install usr/lib/openoffice/share/gallery/htmlexpo/*.png [MK]
+ + move OpenSymbol font to fontconfig managed directory
+ /usr/share/fonts/truetype/openoffice [CH]
* debian/control.in:
+ Build-Depends:
- allow libpng2-dev, too - thanks again nobse (closes: #207774) [RE]
@@ -62,6 +64,7 @@
+ remove libc6 (<< 2.2.5-13) from Build-Conflicts: [RE]
+ openoffice.org-mimelnk: only suggest openoffice.org (closes: #211398)
[RE]
+ fix Architecture: of -crashrep and -gnome [RE]
+ + Tighten inter-package version dependencies to >> 1.1.0 [CH]
* debian/po:
+ add japanese debconf template translation, thanks Kenshi Muto
(closes: #207714) [RE]
@@ -80,7 +83,7 @@
* debian/setperms:
+ add xcftobmp [RE]
- -- Chris Halls <[EMAIL PROTECTED]> Thu, 2 Oct 2003 17:22:08 +0200
+ -- Chris Halls <[EMAIL PROTECTED]> Thu, 2 Oct 2003 20:04:15 +0200
openoffice.org (1.0.99+1.1rc3-1) unstable; urgency=low
Index: openoffice.org.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org.install,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- openoffice.org.install 30 Sep 2003 16:48:47 -0000 1.27
+++ openoffice.org.install 2 Oct 2003 18:07:33 -0000 1.28
@@ -224,9 +224,7 @@
usr/lib/openoffice/share/dtd/officedocument/1_0/table.mod
usr/lib/openoffice/share/dtd/officedocument/1_0/text.mod
usr/lib/openoffice/share/dtd/officedocument/1_0/toolbar.dtd
-usr/lib/openoffice/share/fonts/truetype/fonts.dir
-usr/lib/openoffice/share/fonts/truetype/fonts_dir.global
-usr/lib/openoffice/share/fonts/truetype/opens___.ttf
+usr/lib/openoffice/share/fonts/truetype/opens___.ttf
usr/share/fonts/truetype/openoffice/opensymbol.ttf
usr/lib/openoffice/share/gallery/apples.gif
usr/lib/openoffice/share/gallery/bigapple.gif
usr/lib/openoffice/share/gallery/bullets/blkpearl.gif
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- control.in 29 Sep 2003 22:47:11 -0000 1.90
+++ control.in 2 Oct 2003 18:07:33 -0000 1.91
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>= 1.0.99+1.1rc3), openoffice.org-bin
(>= 1.0.99+1.1rc3), openoffice.org-l10n-en (>> 1.0.99+1.1) |
openoffice.org-l10n-1.1.0, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2),
openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
@@ -44,7 +44,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>=
1.0.99+1.1rc3)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin
Provides: openoffice.org1.1-bin
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- control 29 Sep 2003 22:47:11 -0000 1.122
+++ control 2 Oct 2003 18:07:33 -0000 1.123
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>= 1.0.99+1.1rc3), openoffice.org-bin
(>= 1.0.99+1.1rc3), openoffice.org-l10n-en (>> 1.0.99+1.1) |
openoffice.org-l10n-1.1.0, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice-de-en, openoffice-de, oooqs-kde (<= 1.0rc3-2),
openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
@@ -44,7 +44,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>=
1.0.99+1.1rc3)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin
Provides: openoffice.org1.1-bin
