./packages/openofficeorg/3.0/experimental r1284: merge
------------------------------------------------------------
revno: 1284
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-10-13 10:28:46 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.174
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2008-10-11 21:54:05 +0200
message:
run smoketest again...
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.175
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2008-10-11 21:54:50 +0200
message:
mention cs translation update
modified:
changelog
------------------------------------------------------------
revno: 1022.1.176
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-10-11 21:59:40 +0200
message:
regenerate control
modified:
control
------------------------------------------------------------
revno: 1022.1.177
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-10-13 10:21:01 +0200
message:
make ootestapi find OOoRunnerLight.jar
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-10-13 08:25:18 +0000
+++ b/changelog 2008-10-13 08:28:46 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.0.0-1.2pre) experimental; urgency=low
+
+ * debian/rules:
+ - make ootestapi find OOoRunnerLight.jar by setting the necessary symlink
+
+ -- Rene Engelhard <rene@debian.org> Mon, 13 Oct 2008 10:26:20 +0200
+
openoffice.org (1:3.0.0-1) experimental; urgency=low
* OpenOffice.org 3.0.0 final (identical to rc4)
=== modified file 'rules'
--- a/rules 2008-10-11 14:56:57 +0000
+++ b/rules 2008-10-13 08:28:46 +0000
@@ -2126,9 +2126,12 @@
done
ifeq "$(ENABLE_JAVA)" "y"
+ mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/program/classes
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 \
+ $(PKGDIR)-qa-tools/$(OODIR)/program/classes/OOoRunnerLight.jar
endif
mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/smoketest
Reply to: