./packages/openofficeorg/3.0/experimental r1241: add symlink for moc
------------------------------------------------------------
revno: 1241
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-08-26 04:37:57 +0200
message:
add symlink for moc
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-08-25 10:02:50 +0000
+++ b/changelog 2008-08-26 02:37:57 +0000
@@ -1,5 +1,7 @@
openoffice.org (1:3.0.0~ooo300m3-2.3pre) experimental; urgency=low
+ * ooo-build:
+ - update (r13670)
* debian/rules:
- update lucene2 version; enable system-lucene now that it's in main
- add conditonal for cacao-oj6-jdk (which doesn't work, though,
@@ -7,10 +9,12 @@
- gcj-dbtool (which we use since we build with OpenJDK) is in gij, not
gij-X.Y and only the latter is pulled in by java-gcj-compat-dev. Add
builddep (closes: #496480)
+ - create debian/usr/bin/moc during the build, pointing to the right moc.
+ moc is an alternative and can point to the wrong Qts moc.
* debian/control.ure.in:
- Section: libdevel for uno-libs3-dbg to fix override disparity
- -- Rene Engelhard <rene@debian.org> Mon, 25 Aug 2008 02:50:34 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Aug 2008 04:21:35 +0200
openoffice.org (1:3.0.0~ooo300m3-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-08-25 00:52:01 +0000
+++ b/rules 2008-08-26 02:37:57 +0000
@@ -1451,6 +1451,13 @@
endif
endif
+ifeq "$(BUILD_KDE)" "y"
+ # 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
+endif
+
ifeq "$(USE_STLPORT)" "y"
ifeq "$(USE_SYSTEM_STLPORT)" "y"
# stlport home
Reply to: