[libreoffice] 02/02: somehow dh_link doesn't correct the links, so use symlinks, as outlined in https://wiki.debian.org/dedup.debian.net#Within_a_single_binary_package.2C_using_fdupes_.26_symlinks

[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 419aebd79ea06608a0a85d32fc79ff9e424cc6ad
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Feb 16 21:55:14 2017 +0100

    somehow dh_link doesn't correct the links, so use symlinks, as outlined in https://wiki.debian.org/dedup.debian.net#Within_a_single_binary_package.2C_using_fdupes_.26_symlinks
---
 changelog     | 2 +-
 control       | 3 ++-
 rules         | 7 +++++--
 tests/control | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 5a34bc7..7f7617f 100644
--- a/changelog
+++ b/changelog
@@ -16,7 +16,7 @@ libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
     - symlink /usr/share/libreoffice/program/classes/unoil.jar to
       /usr/share/java/unoil.jar to "dedup" it
     - run rdfind to get duplicated /usr/share/icons/gnome symlinked to
-      hicolor if identical (closes: #835515)
+      hicolor if identical (closes: #835515); add rdlink/symlinks B-D-I
   * debian/control.in, debian/rules, debian/scripts/cleandupes: remove unused
     fdupes B-D-I and commented-out usage
 
diff --git a/control b/control
index 089bd39..5a25a27 100644
--- a/control
+++ b/control
@@ -164,7 +164,8 @@ Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                      libsac-java [!hppa !ia64 !mips64 !s390 !sparc],
                      libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
                      libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                     rdfind
+                     rdfind,
+                     symlinks
 Build-Conflicts: amd-libopencl1,
                  flex (= 2.5.34-1) [amd64],
                  g++-4.6 (= 4.6.1-10),
diff --git a/rules b/rules
index dfe3d03..100aabc 100755
--- a/rules
+++ b/rules
@@ -113,7 +113,7 @@ BUILD_DEPS=\
     zip,\
     zlib1g-dev\
 
-BUILD_DEPS_INDEP += rdfind
+BUILD_DEPS_INDEP += rdfind, symlinks
 
 CHECKTARGET:=check
 # These are components which can be built from internal copies, or used from the
@@ -3055,7 +3055,10 @@ endif
 
 	# dedup
 	cd $(PKGDIR)-common/usr/share/icons && \
-		rdfind -outputname /dev/null -makesymlinks true hicolor gnome
+ 		rdfind -outputname /dev/null -makesymlinks true hicolor gnome
+	# should happen on dh_link, apparently didn't fix the /home/... symlinks
+	# so do this...
+	symlinks -r -s -c $(PKGDIR)-common
 
 	for i in $(ARCH_INDEP_PACKAGES); do \
 		if [ -e debian/$$i.bug-script.in ]; then \
diff --git a/tests/control b/tests/control
index 7967a9c..285c3a4 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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