CVS:oooqs-kde-deb/debian changelog,1.6,1.6.2.1 control,1.7,1.7.2.1 rules,1.7,1.7.2.1

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oooqs-kde-deb/debian
In directory gluck:/tmp/cvs-serv18030

Modified Files:
      Tag: OOOQS2
	changelog control rules 
Log Message:
check changes for 2.0.3-1 in, branch OOOQS2


Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/rules,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- rules	23 Oct 2003 22:53:06 -0000	1.7
+++ rules	18 Nov 2003 17:35:11 -0000	1.7.2.1
@@ -39,7 +39,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 +73,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; \
@@ -93,7 +89,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs
 	dh_installman debian/oooqs.1
 	dh_strip

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/changelog,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- changelog	23 Oct 2003 22:53:06 -0000	1.6
+++ changelog	18 Nov 2003 17:35:11 -0000	1.6.2.1
@@ -1,3 +1,11 @@
+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 <rene@debian.org>  Mon, 17 Nov 2003 02:47:29 +0100
+
 oooqs (1.0rc3-4) unstable; urgency=low
 
   * remove the shlibdeps mungling.. [RE]

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oooqs-kde-deb/debian/control,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- control	23 Oct 2003 22:53:06 -0000	1.7
+++ control	18 Nov 2003 17:35:11 -0000	1.7.2.1
@@ -1,5 +1,5 @@
 Source: oooqs
-Section: utils
+Section: kde
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>