CVS:oo-debian-files/debian changelog,1.111,1.112 control,1.28,1.29 openoffice.org-debian-files.mime,1.5,1.6 rules,1.26,1.27
Update of /cvs/debian-openoffice/oo-debian-files/debian
In directory gluck:/tmp/cvs-serv13293/debian
Modified Files:
changelog control openoffice.org-debian-files.mime rules
Log Message:
merge OPENOFFICE_ORG_1_1_3 to HEAD
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/rules,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- rules 16 Sep 2004 11:54:50 -0000 1.26
+++ rules 23 Dec 2004 12:23:46 -0000 1.27
@@ -39,6 +39,15 @@
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/regcomp$(VER)
install -m755 bin/spadmin \
$(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/bin/oopadmin$(VER)
+
+ if [ ! -d $(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture -qDEB_HOST_GNU_SYSTEM`/bin ]; then \
+ mkdir -p $(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/`dpkg-architecture -qDEB_HOST_GNU_SYSTEM`/bin; \
+ fi
+ for i in cppumaker idlc idlcpp javamaker rdbmaker regmerge \
+ regview uno xml2cmp; do \
+ install -m755 bin/sdk-wrapper \
+ $(CURDIR)/debian/openoffice.org$(VER)-debian-files/usr/lib/openoffice/sdk/linux/bin/$$i; \
+ done
# install prelink script
install -m755 bin/oooprelink \
Index: openoffice.org-debian-files.mime
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/openoffice.org-debian-files.mime,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- openoffice.org-debian-files.mime 13 Sep 2003 21:13:28 -0000 1.5
+++ openoffice.org-debian-files.mime 23 Dec 2004 12:23:46 -0000 1.6
@@ -26,3 +26,6 @@
application/x-msword; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word Document"; priority=3
application/x-msexcel; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel Document"; priority=3
application/x-mspowerpoint; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft PowerPoint Document"; priority=3
+application/wordperfect; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect Document"; priority=3
+application/wordperfect5.1; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect Document"; priority=3
+application/vnd.wordperfect; openoffice '%s'; edit=openoffice '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect Document"; priority=3
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/changelog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- changelog 14 Oct 2004 20:20:52 -0000 1.111
+++ changelog 23 Dec 2004 12:23:46 -0000 1.112
@@ -1,3 +1,19 @@
+openoffice.org-debian-files (1.1.3-3+1) unstable; urgency=low
+
+ * doc/README: Mention our backports
+ * Upload to unstable
+
+ -- Chris Halls <halls@debian.org> Tue, 30 Nov 2004 23:14:13 +0000
+
+openoffice.org-debian-files (1.1.3-1+1) experimental; urgency=low
+
+ * etc/autoresponse.conf, bin/openoffice: 1.1.3 [RE]
+ * tighten depends to 1.1.3 packages [RE]
+ * add WordPerfect mimetypes since OOo now can handle these documents [RE]
+ * add wrapper scripts for the OOo SDK tools
+
+ -- Rene Engelhard <rene@debian.org> Sun, 31 Oct 2004 16:06:16 +0100
+
openoffice.org-debian-files (1.1.2-5+1) unstable; urgency=medium
* run setofficelang.bin with -f (closes: #265415)
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/debian/control,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- control 10 Jul 2004 14:38:13 -0000 1.28
+++ control 23 Dec 2004 12:23:46 -0000 1.29
@@ -11,7 +11,7 @@
Conflicts: openoffice.org1.1-debian-files, openoffice.org (<= 1.0.1-5)
Replaces: openoffice.org1.1-debian-files
Provides: openoffice.org1.1-debian-files
-Depends: openoffice.org (>> 1.1.1+1.1.2rc3), debianutils (>= 1.16), openoffice.org-bin (>> 1.1.1+1.1.2rc3)
+Depends: openoffice.org (>> 1.1.2+1.1.3), debianutils (>= 1.16), openoffice.org-bin (>> 1.1.2+1.1.3)
Description: Debian specific parts of OpenOffice.org
This is part of the packaging of OpenOffice.org for Debian.
.
Reply to: