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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-104-g492de26



The following commit has been merged in the debian-experimental-3.7 branch:
commit 492de26f70df73b073c46431cd88dcdff587cc23
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Oct 31 23:55:50 2012 +0100

    fix more merge errors...

diff --git a/rules b/rules
index 4dae38f..195c979 100755
--- a/rules
+++ b/rules
@@ -2795,12 +2795,8 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 
 	dh_installdocs -s -A
 	for p in $(ARCH_DEP_PACKAGES); do \
-<<<<<<< HEAD
-		cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
-=======
 		mkdir -p debian/$$p/usr/share/doc/$$p; \
-		cat readlicense_oo/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
->>>>>>> origin/debian-experimental-3.6
+		cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
 		| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
 		| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
 		> debian/$$p/usr/share/doc/$$p/README; \
@@ -3028,16 +3024,10 @@ ifeq "$(PACKAGE_SDK)" "y"
 endif
 	dh_installdocs -i -A 
 	for p in $(ARCH_INDEP_PACKAGES); do \
-<<<<<<< HEAD
-		cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
-		| sed -e "s/$${PRODUCTNAME}/LibreOffice/g" \
-		| sed -s "s/$${PRODUCTVERSION}/3.6/g" \
-=======
 		mkdir -p debian/$$p/usr/share/doc/$$p; \
-		cat readlicense_oo/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
+		cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
 		| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
-		| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
->>>>>>> origin/debian-experimental-3.6
+		| sed -s 's/$${PRODUCTVERSION}/3.6/g' \
 		> debian/$$p/usr/share/doc/$$p/README; \
 	done 
 	dh_installman -i

-- 
LibreOffice packaging repository


Reply to: