Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv18773/debian
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in rules
Log Message:
* remove mimelnk files KDE 3.2 took over (closes: #234670) and
remove the version info of the remaining ones in openoffice.org-mimelnk.
Make openoffice.org-mimlnk recommend kdelibs-data (>> 4:3.2.0) and
therefore only suggest it from openoffice.org
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.7
retrieving revision 1.182.4.8
diff -u -d -r1.182.4.7 -r1.182.4.8
--- rules 3 Mar 2004 02:43:13 -0000 1.182.4.7
+++ rules 6 Mar 2004 15:13:09 -0000 1.182.4.8
@@ -901,6 +901,20 @@
dh_installdirs -i
dh_install --sourcedir=debian/tmp -i
+ # remove .desktop files already in KDE 3.2
+ cd $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/application && \
+ for i in calc draw impress writer; do \
+ rm -f vnd.sun.xml.$$i.desktop; \
+ done
+
+ # remove the version from the files
+ cd $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/application && \
+ for i in *; do \
+ TMP=`mktemp -q`; \
+ cat $$i | sed -e s/"1.1.1 "// > $$TMP && \
+ mv $$TMP $$i; \
+ done
+
# convert program/icon paths in desktop shortcuts
for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
$(MAINPKGDIR)/usr/share/applications/*.desktop; do \
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.8
retrieving revision 1.114.4.9
diff -u -d -r1.114.4.8 -r1.114.4.9
--- control.in 3 Mar 2004 07:23:17 -0000 1.114.4.8
+++ control.in 6 Mar 2004 15:13:09 -0000 1.114.4.9
@@ -10,8 +10,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc), openoffice.org-bin
(>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
-Recommends: openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts,
openoffice.org-mimelnk
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, 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),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
@@ -58,6 +57,7 @@
Package: openoffice.org-mimelnk
Architecture: all
Suggests: openoffice.org
+Recommends: kdelibs-data (>> 4:3.2.0)
Enhances: openoffice.org, koffice, kdebase
Conflicts: openoffice.org (<< 1.0.3-3)
Section: kde
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.12
retrieving revision 1.262.4.13
diff -u -d -r1.262.4.12 -r1.262.4.13
--- changelog 3 Mar 2004 07:23:17 -0000 1.262.4.12
+++ changelog 6 Mar 2004 15:13:09 -0000 1.262.4.13
@@ -1,3 +1,12 @@
+openoffice.org (1.1.1+cvs20040229-2) experimental; urgency=low
+
+ * remove mimelnk files KDE 3.2 took over (closes: #234670) and
+ remove the version info of the remaining ones in openoffice.org-mimelnk.
+ Make openoffice.org-mimlnk recommend kdelibs-data (>> 4:3.2.0) and
+ therefore only suggest it from openoffice.org
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 6 Mar 2004 14:50:52 +0100
+
openoffice.org (1.1.0+cvs20040229-1) experimental; urgency=low
* CVS co of mws_srx645 as of 2004-02-29, call the binary packages
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.11
retrieving revision 1.147.4.12
diff -u -d -r1.147.4.11 -r1.147.4.12
--- control 3 Mar 2004 07:23:17 -0000 1.147.4.11
+++ control 6 Mar 2004 15:13:09 -0000 1.147.4.12
@@ -10,8 +10,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc), openoffice.org-bin
(>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
-Recommends: openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts,
openoffice.org-mimelnk
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, 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),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
@@ -58,6 +57,7 @@
Package: openoffice.org-mimelnk
Architecture: all
Suggests: openoffice.org
+Recommends: kdelibs-data (>> 4:3.2.0)
Enhances: openoffice.org, koffice, kdebase
Conflicts: openoffice.org (<< 1.0.3-3)
Section: kde
