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

[libreoffice] 01/01: Revert "(temporarily?) create hardlinks instead of symlinks for images_*.zip"



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

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

commit 6a207d831b27be8ec7af235bf634253af89bf5f7
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jun 25 10:25:23 2014 +0200

    Revert "(temporarily?) create hardlinks instead of symlinks for images_*.zip"
    
    This apparently doesn't fix it fully. See
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752541#26
    
    This reverts commit bcce351ab5fde2a2bfdf42f006deb2bf101f26fd.
---
 changelog | 4 +---
 rules     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 814a07f..ed253e9 100644
--- a/changelog
+++ b/changelog
@@ -12,14 +12,12 @@ libreoffice (1:4.3.0~rc2~git20140624-1) UNRELEASED; urgency=low
     - stop adding vars.$(DEB_HOST_ARCH) content into the maintscripts; unused 
     - don't uselessly rebuild sdext - it's not a extension anymore and thus in
       "proper" langpacks
-    - (temporarily?) create hardlinks instead of symlinks for images_*.zip as the 
-      latter one now breaks themes in runtime (closes: #752541)
   * debian/control.debug.in: suggest python-six (used by the gdb helpers) 
   * debian/scripts/gid2pkgdirs.sh:
     install gid_Module_Filters (oox-drawingml-{adj-names,cs-presets})
   * debian/control.in, debian/rules: specify -b in Vcs-Git:
 
- -- Rene Engelhard <rene@debian.org>  Wed, 25 Jun 2014 01:40:47 +0200
+ -- Rene Engelhard <rene@debian.org>  Sat, 21 Jun 2014 20:23:29 +0200
 
 libreoffice (1:4.3.0~rc1-1) experimental; urgency=low
 
diff --git a/rules b/rules
index e258944..fd3fce6 100755
--- a/rules
+++ b/rules
@@ -3062,7 +3062,7 @@ endif
 		mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
 			$(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
 		mkdir -p $(PKGDIR)-style-$$p/$(OODIR)/share/config; \
-		ln /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
+		ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
 			$(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
 	done
 

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


Reply to: