Update of /cvs/debian-openoffice/oooqs-kde-deb/debian
In directory gluck:/tmp/cvs-serv7244
Modified Files:
changelog control docs rules
Added Files:
oooqsrc
Log Message:
merge OOOQS2 branch to HEAD; call it -3 for unstable
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/control,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- control 23 Oct 2003 22:53:06 -0000 1.7
+++ control 25 Feb 2004 15:21:40 -0000 1.8
@@ -1,5 +1,5 @@
Source: oooqs
-Section: utils
+Section: kde
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <[EMAIL PROTECTED]>, Chris Halls <[EMAIL PROTECTED]>
@@ -18,13 +18,4 @@
when needed and provides a symbol in KDE's SystemTray for easy access to
OpenOffice.org's applications.
.
- Besides simply starting the applications, you can:
- - select multiple files in the usual opendialog provided by KDE to open them
- in OpenOffice.org
- - use a history of recently opened files
- - configure the app to do one of the functions described above on a simple
- double click
- - use the app to keep a hidden instance of OpenOffice.org in memory to
- achieve much shorter startup times of the OpenOffice.org modules.
- - start with different wizards directly from your desktop
- - access OpenOffice.org's printer configuration
+ Besides simply starting the applications, you can directly open documents.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/changelog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- changelog 9 Feb 2004 00:53:54 -0000 1.7
+++ changelog 25 Feb 2004 15:21:40 -0000 1.8
@@ -1,3 +1,28 @@
+oooqs (2.0.3-3) unstable; urgency=low
+
+ * Move to unstable.
+ * build with sparc-linux-g++ on sparc..
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 20 Feb 2004 12:49:07 +0100
+
+oooqs (2.0.3-2) experimental; urgency=low
+
+ * install /etc/kde3/oooqsrc specifying Exec=/usr/bin/openoffice
+ to run the wrapper script, not soffice (closes: #231690)
+ * fix/simplify description - do not mention features removed
+ in 2.x.x
+ * add Catalan translation - thanks Josep M. Mendoza (closes: #232303)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 9 Feb 2004 02:52:54 +0100
+
+oooqs (2.0.3-1) experimental; urgency=low
+
+ * new upstream release, much restructuring, lesser functions.
+ * remove all patches, not needed anymore :-)
+ * Section: kde
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 17 Nov 2003 02:47:29 +0100
+
oooqs (1.0rc3-5) unstable; urgency=low
* add fixed fr.po, thanks Virgile Gerecke <[EMAIL PROTECTED]>
--- NEW FILE: oooqsrc ---
[General]
Exec=/usr/bin/openoffice
Index: docs
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/docs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- docs 14 May 2003 16:09:53 -0000 1.1.1.1
+++ docs 25 Feb 2004 15:21:40 -0000 1.2
@@ -1,2 +1 @@
-BUGS
TODO
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rules 23 Oct 2003 22:53:06 -0000 1.7
+++ rules 25 Feb 2004 15:21:40 -0000 1.8
@@ -9,7 +9,11 @@
include /usr/share/dpatch/dpatch.make
-CXX=g++
+ifneq (,$(findstring sparc,$(DEB_HOST_GNU_TYPE)))
+ CXX=sparc-linux-g++
+else
+ CXX=g++
+endif
CXXFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -39,7 +43,8 @@
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-rpath
+ --infodir=\$${prefix}/share/info --disable-rpath \
+ --enable-final
build: build-stamp
@@ -72,15 +77,10 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/oooqs-kde
- # move the HTML docs into the right place
- mkdir $(CURDIR)/debian/oooqs-kde/usr/share/doc/kde
- mv $(CURDIR)/debian/oooqs-kde/usr/share/doc/HTML \
- $(CURDIR)/debian/oooqs-kde/usr/share/doc/kde
-
- # move the KDE menu entry from Office to OpenOffice.org
+ # move the KDE menu entry from Utilities to OpenOffice.org1.1
# to be together with the familiy :-)
cd $(CURDIR)/debian/oooqs-kde/usr/share/applnk && \
- mv Office "OpenOffice.org1.1"
+ mv Utilities "OpenOffice.org1.1"
# don't install the shipped icons which conflict with openoffice.org
cd $(CURDIR)/debian/oooqs-kde/usr/share/icons; \
@@ -88,12 +88,16 @@
rm $$icon; \
done
+ # install config file
+ mkdir -p $(CURDIR)/debian/oooqs-kde/etc/kde3
+ install -m644 debian/oooqsrc $(CURDIR)/debian/oooqs-kde/etc/kde3
+
binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_installdocs
dh_installman debian/oooqs.1
dh_strip
