[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-12-g28605c6



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 28605c61c4bbee80e9af4a8c71900a81b9baf57a
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Aug 19 19:43:30 2011 +0200

    with gbuild gengal is delivered automatically into solver, install from there

diff --git a/rules b/rules
index 6b41142..a2672f5 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)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal \
+	install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gengal \
 		$(PKGDIR)-dev/$(OODIR)/program/gengal
-	install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+	install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$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)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+	install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gengalrc \
 		$(PKGDIR)-common/$(OODIR)/program/gengalrc
 endif
 	touch $@

-- 
LibreOffice packaging repository


Reply to: