[libreoffice] 13/16: move libreofficekitgtk.so into -gtk
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to tag libreoffice_5.0.2-0ubuntu1
in repository libreoffice.
commit 0ad6ad09e17dee5be622272cde97fb58bff68be3
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 11 18:00:28 2015 +0200
move libreofficekitgtk.so into -gtk
Conflicts:
changelog
control
control.in
---
control.in | 2 +-
rules | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/control.in b/control.in
index 784cc84..6b4c068 100644
--- a/control.in
+++ b/control.in
@@ -543,7 +543,7 @@ Section: gnome
Enhances: libreoffice
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
Provides: lo-menubar
-Replaces: lo-menubar
+Replaces: libreoffice-core (<< 1:5.0.2), lo-menubar
Description: office productivity suite -- GTK+ integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index 8970864..a9d51b3 100755
--- a/rules
+++ b/rules
@@ -2306,6 +2306,7 @@ endif
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk/$(OODIR)/program/
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: