------------------------------------------------------------
revno: 1169
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-07-11 01:34:02 +0200
message:
more s/screen/console/ and uno-libs3 fixes
modified:
rules
=== modified file 'rules'
--- a/rules 2008-07-10 19:21:36 +0000
+++ b/rules 2008-07-10 23:34:02 +0000
@@ -167,7 +167,7 @@
PACKAGE_WRITER2LATEX=n
USE_EXTERNAL_WRITER2LATEX=y
ENABLE_MINIMIZER=y
-ENABLE_PRESENTER_SCREEN=y
+ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
ENABLE_EVO2=y
@@ -395,7 +395,7 @@
ifeq "$(ENABLE_MINIMIZER)" "n"
CONFIGURE_FLAGS += --disable-minimizer
endif
-ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
CONFIGURE_FLAGS += --enable-presenter-screen
endif
ifeq "$(ENABLE_PDFIMPORT)" "n"
@@ -1297,7 +1297,7 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.minimizer.in
endif
-ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.presenter.in
endif
@@ -2392,10 +2392,10 @@
$(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extension/install/sun-presentation-minimizer.oxt
endif
-ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
- rm -rf $(PKGDIR)-presenter-screen
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
+ rm -rf $(PKGDIR)-presenter-console
install -D -m644 $(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/presenter-screen.oxt \
-
$(PKGDIR)-presenter-screen/$(OOBRANDDIR)/share/extension/install/presenter-screen.oxt
+
$(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extension/install/presenter-screen.oxt
endif
rm -rf $(PKGDIR)-sdbc-postgresql
@@ -2962,13 +2962,13 @@
# 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/$(OODIR)/program"
\
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
- -Lure \
+ -Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program
\
$(SHLIBS_OVERRIDE)
ifeq "$(ENABLE_JAVA)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dh_shlibdeps -popenoffice.org$(VER)-officebean \
- -Lure \
+ -Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR)
\
$(SHLIBS_OVERRIDE)
endif
@@ -2976,26 +2976,30 @@
# it manually.
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/SunPresentationMinimizer.uno.so \
>
debian/openoffice.org$(VER)-presentation-minimizer.substvars
endif
-ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/PresenterScreen.uno.so \
- > debian/openoffice.org$(VER)-presenter-screen.substvars
+ >
debian/openoffice.org$(VER)-presenter-console.substvars
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/bin/xpdfimport \
$(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so \
@@ -3050,7 +3054,7 @@
dh_gencontrol -popenoffice.org$(VER)-presentation-minimizer -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
-ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
dh_gencontrol -popenoffice.org$(VER)-presenter-console -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
