[libreoffice] 01/02: lp#1419836: adapt/kill ure-link
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit ad48ffaa0bd6e57de59c3613ca5e6412a91e33d8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Feb 17 13:29:54 2015 +0100
lp#1419836: adapt/kill ure-link
- with upstream 982f199a98a7d82e0109077882a645f1a442049e ure-link is no more
- create "ure" instead as a symlink like ure-link before
Conflicts:
changelog
---
changelog | 7 +++++++
rules | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index d040b0e..0a0b2e0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.4.1~rc1-2) UNRELEASED; urgency=medium
+
+ * merge from Ubuntu:
+ - adapt/kill ure-link for upstream changes (LP: #1419836)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 19 Feb 2015 14:44:03 +0100
+
libreoffice (1:4.4.1~rc1-1) experimental; urgency=medium
* New upstream release candidate
diff --git a/rules b/rules
index 9971446..5046fa0 100755
--- a/rules
+++ b/rules
@@ -2403,7 +2403,7 @@ endif
debian/uno-libs3/$(OOUREDIR)/lib; \
done
cd debian/ure/$(OODIR) && \
- rm ure-link && ln -sf /$(OOUREDIR) ure-link
+ ln -sf /$(OOUREDIR) ure
ifeq "$(BUILD_KDE)" "y"
@@ -3006,7 +3006,7 @@ endif
mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/program
# three-layer symlinks also for /usr/share
ln -s /$(OOUREDIR) \
- $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/ure-link
+ $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/ure
# enable session handling and recovery
perl -pi -e 's,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>false</value></prop>,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>true</value></prop>,' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
@@ -3102,7 +3102,7 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
mkdir -p $(PKGDIR)-dbg/usr/share/libreoffice/gdb
mv $(CURDIR)/debian/tmp/usr/share/libreoffice/gdb/libreoffice \
$(PKGDIR)-dbg/usr/share/libreoffice/gdb
- # FIXME: or better ure-dbg (ure/lib?). Then again ure-link is a link which is in -common
+ # FIXME: or better ure-dbg (ure/lib?). Then again ure is a link which is in -common
# anyways...
mkdir -p debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OOUREDIR)/lib
mv $(CURDIR)/debian/tmp//usr/share/gdb/auto-load/$(OODIR)/ure/lib/* \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: