------------------------------------------------------------
revno: 1904
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2010-04-01 14:49:05 +0200
message:
hack around to keep internal libraptor for now due to Issue 110523
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-04-01 12:47:55 +0000
+++ b/changelog 2010-04-01 12:49:05 +0000
@@ -34,6 +34,7 @@
- sort arch lists, patch from Chris Cheney
- install uno.py and unohelper.py for all supported python versions
(closes: #476213)
+ - hack around to keep internal libraptor for now due to Issue 110523
* debian/README.Debian-source: update for 3.2, mention new extra compnents
* debian/scripts/vars.alpha: add
* debian/control*.in:
=== modified file 'rules'
--- a/rules 2010-03-29 15:22:19 +0000
+++ b/rules 2010-04-01 12:49:05 +0000
@@ -1923,6 +1923,16 @@
cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=/tmp $(MAKE)
endif
+ifeq "$(USE_SYSTEM_REDLAND)" "y"
+ # some parsers in libraptor break help in OOo. redland/rasqual should
+ # be ok. keep libraptor internally and save 2 lib copies instead of
+ # none. FIXME: yes, this is fragile...
+ cd $(SOURCE_TREE)/redland/raptor && \
+ . $(CURDIR)/$(SOURCE_TREE)/*.sh; \
+ export SYSTEM_REDLAND=NO; \
+ dmake
+endif
+
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
@@ -2853,6 +2863,12 @@
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
+ifeq "$(USE_SYSTEM_REDLAND)" "y"
+ # install the internal libraptor
+ install -m644 $(SOURCE_TREE)/redland/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/libraptor.so.1 \
+
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/libraptor.so.1
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
