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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-4-90-g2cbf3fe



The following commit has been merged in the debian-experimental-3.6 branch:
commit 2cbf3fe260f18ea1b4b2ee7c7341045f8dcd6f6d
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jun 15 09:11:34 2012 +0200

    install upstreams README(_en-US) (closes: #676340)

diff --git a/changelog b/changelog
index 672e27d..5d9d92d 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
     - build-depend against libpng-dev instead of libpng12-dev
       (closes: #662411)
     - remove squeeze-backports stuff, add wheezy-backports
+    - install upstreams README(_en-US) (closes: #676340)
   * debian/uno-libs3.symbols: update 
 
  -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 13:44:05 +0200
diff --git a/rules b/rules
index f0cffbd..ab6ef83 100755
--- a/rules
+++ b/rules
@@ -2726,7 +2726,13 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	  rm -rf debian/$$pkg/DEBIAN;\
 	done
 
-	dh_installdocs -s -A debian/README.Debian
+	dh_installdocs -s -A
+	for p in $(ARCH_DEP_PACKAGES); do \
+		cat readlicense_oo/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/UNX/README_en-US \
+		| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
+		| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
+		> debian/$$p/usr/share/doc/$$p/README; \
+	done 
 	dh_installdebconf -s
 	dh_installman -s
 	for i in writer calc draw base math impress; do \
@@ -2950,7 +2956,13 @@ ifeq "$(PACKAGE_SDK)" "y"
 	# But fix it..
 	perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.udk-common-ref
 endif
-	dh_installdocs -i -A debian/README.Debian
+	dh_installdocs -i -A 
+	for p in $(ARCH_DEP_PACKAGES); do \
+		cat readlicense_oo/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/UNX/README_en-US \
+		| sed -e "s/$${PRODUCTNAME}/LibreOffice/g" \
+		| sed -s "s/$${PRODUCTVERSION}/3.6/g" \
+		> debian/$$p/usr/share/doc/README; \
+	done 
 	dh_installman -i
 	for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
 		mv $$i $$i.gz; \

-- 
LibreOffice packaging repository


Reply to: