The following commit has been merged in the debian-experimental-3.4.0 branch:
commit a4d9d43dcbfdef43b867d9a8ac6b56359cf07f50
Author: Rene Engelhard <[email protected]>
Date: Fri Aug 19 22:10:06 2011 +0000
Revert "with gbuild gengal is delivered automatically into solver, install
from there"
This reverts commit 28605c61c4bbee80e9af4a8c71900a81b9baf57a.
diff --git a/rules b/rules
index a2672f5..6b41142 100755
--- a/rules
+++ b/rules
@@ -2702,9 +2702,9 @@ endif
ifeq "$(PACKAGE_SDK)" "y"
# install gengal stuff into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$UPD/$$OUTPATH$$PROEXT)/bin/gengal \
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal \
$(PKGDIR)-dev/$(OODIR)/program/gengal
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$UPD/$$OUTPATH$$PROEXT)/bin/gengal.bin \
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
$(PKGDIR)-dev/$(OODIR)/program/gengal.bin
endif
@@ -3196,7 +3196,7 @@ endif
ifeq "$(PACKAGE_SDK)" "y"
# install gengal stuff into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$UPD/$$OUTPATH$$PROEXT)/bin/gengalrc \
+ install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengalrc \
$(PKGDIR)-common/$(OODIR)/program/gengalrc
endif
touch $@
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
