./packages/openofficeorg/3.0/experimental r1286: -2
------------------------------------------------------------
revno: 1286
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-10-14 13:57:45 +0200
message:
-2
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-10-13 11:36:06 +0000
+++ b/changelog 2008-10-14 11:57:45 +0000
@@ -1,14 +1,16 @@
-openoffice.org (1:3.0.0-1.2pre) experimental; urgency=low
+openoffice.org (1:3.0.0-2) experimental; urgency=low
* ooo-build:
- - update (r14294)
+ - update (r14305)
+ - xmlhelp-system-lucene-fix.diff/extensions-system-java.diff: don't
+ hardcode unxlngx6.pro...
* debian/rules:
- make ootestapi find OOoRunnerLight.jar by setting the necessary symlink
* 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.
- -- Rene Engelhard <rene@debian.org> Mon, 13 Oct 2008 13:34:58 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 14 Oct 2008 08:16:45 +0200
openoffice.org (1:3.0.0-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-10-13 08:28:46 +0000
+++ b/rules 2008-10-14 11:57:45 +0000
@@ -1439,10 +1439,10 @@
else
ifneq "$(CC_PREFIX)" ""
mkdir -p $(CURDIR)/debian/usr/bin
- ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcc $(CURDIR)/debian/usr/bin/gcc
- ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)g++ $(CURDIR)/debian/usr/bin/g++
- ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcj $(CURDIR)/debian/usr/bin/gcj
- ln -s /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gij $(CURDIR)/debian/usr/bin/gij
+ ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcc $(CURDIR)/debian/usr/bin/gcc
+ ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)g++ $(CURDIR)/debian/usr/bin/g++
+ ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gcj $(CURDIR)/debian/usr/bin/gcj
+ ln -sf /usr/lib/gcc-snapshot/bin/$(CC_PREFIX)gij $(CURDIR)/debian/usr/bin/gij
endif
endif
endif
@@ -1451,7 +1451,7 @@
# be sure we use the right moc, it's an alternative and can point
# to either Qt3 or Qt4s moc.
mkdir -p $(CURDIR)/debian/usr/bin
- ln -s /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc
+ ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc
endif
ifeq "$(USE_STLPORT)" "y"
@@ -2115,6 +2115,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$(VER) $(PKGDIR)-qa-tools/usr/bin
install -m755 $(SOURCE_TREE)/ootesttool$(VER) $(PKGDIR)-qa-tools/usr/bin
Reply to: