[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/2.4.1/unstable r1202: fix -qa-tools install, fix copyright



------------------------------------------------------------
revno: 1202
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-10-14 14:26:28 +0200
message:
  fix -qa-tools install, fix copyright
modified:
  README.Debian-source
  changelog
  rules
=== modified file 'README.Debian-source'
--- a/README.Debian-source	2007-12-04 19:35:24 +0000
+++ b/README.Debian-source	2008-10-14 12:26:28 +0000
@@ -1,6 +1,5 @@
 The .orig.tar.gz consists of the 5 seperate tarballs from
-http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/2.3.1rc1 (the stable/2.3.1 ones are exactly the same) of which some non-free stuff has been removed:
-http://download.go-oo.org/OOG680
+http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/2.4.1rc2 (the stable/2.4.1 ones are exactly the same) of which some non-free stuff has been removed:
  * core:
    - external/jars/*: Sun proprietary, binary-only jars
    - odk/pack/copying/*.pdf: non-free doc (XML Spec)

=== modified file 'changelog'
--- a/changelog	2008-10-13 11:34:14 +0000
+++ b/changelog	2008-10-14 12:26:28 +0000
@@ -11,8 +11,9 @@
   * debian/control.qa.in:
     - make -qa-api-tests depend on Java as it needs OOoRunnerLight.jar to be
       run to be used. Make -qa-tools suggest it.
+  * debian/copyright: fix 
 
- -- Rene Engelhard <rene@debian.org>  Mon, 13 Oct 2008 11:58:25 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 14 Oct 2008 14:26:10 +0200
 
 openoffice.org (1:2.4.1-11) unstable; urgency=high
 

=== modified file 'rules'
--- a/rules	2008-10-13 08:21:01 +0000
+++ b/rules	2008-10-14 12:26:28 +0000
@@ -1945,6 +1945,7 @@
 	               $(PKGDIR)-core/usr/share/applications
 
 ifeq "$(PACKAGE_QA_TOOLS)" "y"
+	rm -rf $(PKGDIR)-qa-tools
 	mkdir -p -m755 $(PKGDIR)-qa-tools/usr/bin
 	install -m755 $(SOURCE_TREE)/ootestapi $(PKGDIR)-qa-tools/usr/bin
 	install -m755 $(SOURCE_TREE)/ootesttool $(PKGDIR)-qa-tools/usr/bin
@@ -1960,7 +1961,7 @@
 	mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
 	cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
 		$(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
-	ln -s /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
+	ln -sf /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
 		$(PKGDIR)-qa-tools/$(OODIR)/program/classes/OOoRunnerLight.jar
   endif
 


Reply to: