[libreoffice] 01/02: stop moving images.zip to /usr/share; make -common depend on them all
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 d426048de61117d546f6c46b108dde36e147fcb2
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 1 22:37:39 2014 +0200
stop moving images.zip to /usr/share; make -common depend on them all
---
changelog | 8 +++++++-
control | 16 +++++++++-------
control.in | 7 ++++---
rules | 7 ++-----
4 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/changelog b/changelog
index ed253e9..24c6ade 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.3.0~rc2~git20140624-1) UNRELEASED; urgency=low
+libreoffice (1:4.3.0~rc2~git20140701-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -16,6 +16,12 @@ libreoffice (1:4.3.0~rc2~git20140624-1) UNRELEASED; urgency=low
* debian/scripts/gid2pkgdirs.sh:
install gid_Module_Filters (oox-drawingml-{adj-names,cs-presets})
* debian/control.in, debian/rules: specify -b in Vcs-Git:
+ * debian/control.in, debian/rules:
+ - stop moving images*zip to /usr/share and creating symlinks. hardlinks
+ would work but cross-directory hardlinks are frowned upon...
+ - WORKAROUND: make -common depend on all styles as otherwise right now
+ the icon selection breaks badly
+ (closes: #752531)
-- Rene Engelhard <rene@debian.org> Sat, 21 Jun 2014 20:23:29 +0200
diff --git a/control b/control
index d7c2b79..bd51fb7 100644
--- a/control
+++ b/control
@@ -188,7 +188,7 @@ XS-Python3-Version: 3.4
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-4.3
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -430,12 +430,14 @@ Description: office productivity suite -- arch-dependent files
Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-crystal,
- libreoffice-style-hicontrast,
- libreoffice-style-oxygen,
- libreoffice-style-sifr,
- libreoffice-style-tango
+Depends: libreoffice-style-crystal,
+ libreoffice-style-default,
+ libreoffice-style-hicontrast,
+ libreoffice-style-oxygen,
+ libreoffice-style-sifr,
+ libreoffice-style-tango,
+ ure,
+ ${misc:Depends}
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
diff --git a/control.in b/control.in
index f4ae17a..23f340c 100644
--- a/control.in
+++ b/control.in
@@ -268,12 +268,13 @@ Description: office productivity suite -- arch-dependent files
Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
-Suggests: libreoffice-style-crystal,
+Depends: libreoffice-style-default,
+ libreoffice-style-crystal,
libreoffice-style-hicontrast,
libreoffice-style-oxygen,
libreoffice-style-sifr,
- libreoffice-style-tango
+ libreoffice-style-tango,
+ ure, ${misc:Depends}
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
diff --git a/rules b/rules
index fd3fce6..e93071b 100755
--- a/rules
+++ b/rules
@@ -3058,12 +3058,9 @@ endif
for i in $(IMAGES); do \
z=images_$$i.zip; p=$$i; \
case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
- mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
- 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 -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/$$z \
- $(PKGDIR)-style-$$p/$(OODIR)/share/config/$$z; \
+ mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
+ $(PKGDIR)-style-$$p/$(OODIR)/share/config/; \
done
rm -rf debian/openoffice.org-dtd-officedocument1.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: