CVS:oo-deb/debian changelog,1.362.2.13,1.362.2.14 control.in,1.153.2.6,1.153.2.7 rules,1.231.2.7,1.231.2.8
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv31996
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog control.in rules
Log Message:
- readd Hindi & Kannada
- close 271883
- remove more mimelnks which conflict witk kdelibs-data, some were overseen,
remaining: 2 ;)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.13
retrieving revision 1.362.2.14
diff -u -d -r1.362.2.13 -r1.362.2.14
--- changelog 10 Oct 2004 16:00:59 -0000 1.362.2.13
+++ changelog 10 Oct 2004 18:44:07 -0000 1.362.2.14
@@ -7,6 +7,9 @@
- vclplug/*: VCLPlug Backport from 2.0 tree [MM]
- wpd/*: WordPerfect filter support [MM et al.], linking to a
libwpd snapshot statically for now...
+ * New minor patches:
+ - print-do-not-change-document.diff: do not make document modified
+ when printing per default [PM/SuSE] (closes: #271883)
* Removed patches:
- disable-odk-build: We now build the odk but with a patch to skip
the removed non-free documentation... [RE]
@@ -24,9 +27,9 @@
- New language packs:
+ -eu (Basque)
+ -lt (Lithuanian)
+ + -kn (Kannada)
+ -tn (Tswana)
+ -gl (Galician)
- + remove -hi (Hindi) language pack because of Issue 34210 [RE]
* debian/control*.in:
- simplify builddeps by removing woody backport specifics [RE]
- add kdelibs4-dev and libgnomevfs2-dev to Build-Depends: [RE]
@@ -38,6 +41,8 @@
- increase debhelper build-depends to >= 4.1.60 since we want to use
dh_python with python 2.3 [RE]
- openoffice.org Suggests: -gnomevfs, -kde | -gtk-gnome [RE]
+ - change -mimelnk description to say that we ship additioal mimelnks
+ to those in kdelibs-data [RE]
* debian/rules:
- use ooo-build-1-3 branch of ooo-build [RE]
- --enable-kde --enable-gtk [RE]
@@ -53,9 +58,7 @@
- add pieces to integrate writerperfect support (fetch libwpd snapshot,
uu{en,de}coding, etc.) [MK]
* debian/openoffice-xlate-lang:
- - add Basque, Lithuanian, Kannada (disabled because of Issue 34210),
- Tswana and Galician [RE]
- - comment Hindi out [RE]
+ - add Basque, Lithuanian, Kannada, Tswana and Galician [RE]
* debian/scripts/vars:
- update [RE]
- use ooo-icons_1_1-10 [MK]
@@ -69,7 +72,7 @@
* debian/openoffice.org-dev*.install: add [RE]
* debian/openoffice.org-dev.links.in: add [RE]
- -- Rene Engelhard <rene@debian.org> Sun, 10 Oct 2004 17:44:59 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 10 Oct 2004 20:39:47 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.6
retrieving revision 1.153.2.7
diff -u -d -r1.153.2.6 -r1.153.2.7
--- control.in 10 Oct 2004 15:59:40 -0000 1.153.2.6
+++ control.in 10 Oct 2004 18:44:07 -0000 1.153.2.7
@@ -65,8 +65,8 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the OpenOffice.org KDE MIME bindings for use with
- KDE and KOffice.
+ This package contains some additional OpenOffice.org KDE MIME bindings for
+ use with KDE and KOffice besides those in kdelibs-data.
Package: openoffice.org-thesaurus-en-us
Section: text
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.7
retrieving revision 1.231.2.8
diff -u -d -r1.231.2.7 -r1.231.2.8
--- rules 6 Oct 2004 17:28:36 -0000 1.231.2.7
+++ rules 10 Oct 2004 18:44:07 -0000 1.231.2.8
@@ -1067,7 +1067,8 @@
# remove .desktop files already in KDE
cd $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/application && \
- for i in calc draw impress writer; do \
+ for i in calc draw impress writer calc.template \
+ draw.template impress.template writer.template; do \
rm -f vnd.sun.xml.$$i.desktop; \
done && \
rm -f vnd.stardivision.*
Reply to: