[libreoffice] 01/01: don't install ChangeLog (now done automatically by dh compat >= 7)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 3e9fbd034cacdf5edbdd39ae91684e3fd37e4866
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 25 00:26:09 2016 +0200

    don't install ChangeLog (now done automatically by dh compat >= 7)
    
    Conflicts:
    	changelog
---
 changelog | 6 +++++-
 rules     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 9ff6190..09c1d91 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,11 @@ libreoffice (1:5.3.0~alpha1-2) UNRELEASED; urgency=medium
   * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
     new multiarchified libvlc5
 
- -- Rene Engelhard <rene at debian.org>  Fri, 21 Oct 2016 23:56:08 +0200
+  * debian/rules:
+    - don't install ChangeLog (now done automatically by dh compat >= 7) as
+      it doubles -common/-core size and increases font-opensymbol *by 10* 
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 24 Oct 2016 23:06:23 +0200
 
 libreoffice (1:5.3.0~alpha1-1) experimental; urgency=medium
 
diff --git a/rules b/rules
index 60b7301..e37e773 100755
--- a/rules
+++ b/rules
@@ -3101,7 +3101,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 			fi; \
 		done; \
 	done
-	dh_installchangelogs -a -k
+	dh_installchangelogs -a -XChangeLog -k
 	dh_installmime -a
 	dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps
 	dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps $(OODIR)/program
@@ -3366,7 +3366,7 @@ endif
 			ln -sf libreoffice.1.gz $$i.gz; \
 		fi; \
 	done
-	dh_installchangelogs -i -Nlibreoffice-librelogo -k
+	dh_installchangelogs -i -XChangeLog -Nlibreoffice-librelogo -k
 ifeq "$(PACKAGE_LIBRELOGO)" "y"
 	 dh_installchangelogs -plibreoffice-librelogo -k librelogo/source/ChangeLog
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git