------------------------------------------------------------
revno: 1973
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2010-04-30 11:54:29 +0200
message:
--parallel apparently is for dh_auto_* only, revert change
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-04-30 09:34:06 +0000
+++ b/changelog 2010-04-30 09:54:29 +0000
@@ -16,7 +16,6 @@
- fix es translation for SC_OPCODE_SUBSTITUTE, thanks Margarita Manterola
(closes: #578767)
- enable kfreebsd-{i386,amd64}
- - run dh_compress and dh_shlibdeps using --parallel
* debian/scripts/vars.kfreebsd-*: add PLATFORMID
* debian/shlibs.override.libc: force libc0.1 dependency to (>= 2.10.2-7)
* debian/control.in, debian/rules: use textcat data from
=== modified file 'rules'
--- a/rules 2010-04-30 09:34:06 +0000
+++ b/rules 2010-04-30 09:54:29 +0000
@@ -3521,7 +3521,7 @@
ifeq "$(ENABLE_MONO)" "y"
dh_installcligac -s
endif
- dh_compress -s --parallel -X.py -X.mk -X.sxd
+ dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
# ugly hack, but why does that happen? It's not in .symbols...
@@ -3551,7 +3551,7 @@
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program"
\
- dh_shlibdeps -s --parallel -Nopenoffice.org$(VER)-officebean \
+ dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program
\
$(SHLIBS_OVERRIDE)
@@ -3778,7 +3778,7 @@
ifeq "$(ENABLE_MONO)" "y"
dh_installcligac -i
endif
- dh_compress -i --parallel -X.py -X.mk -X.sxd
+ dh_compress -i -X.py -X.mk -X.sxd
dh_installdeb -i
ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -i
