[libreoffice] 02/03: move gnome-open-url (back) to -gnome

[Rene Engelhard <rene@moszumanska.debian.org>]

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

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

commit c998d73bbd7446dce464dbe2acc03a0418d6a3a4
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 27 12:35:23 2015 +0200

    move gnome-open-url (back) to -gnome
---
 changelog  | 3 +++
 control    | 1 +
 control.in | 1 +
 rules      | 1 +
 4 files changed, 6 insertions(+)

diff --git a/changelog b/changelog
index eca67b7..df26a4b 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:5.0.0~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
+  * debian/rules:
+    - move gnome-open-url (back) to -gnome
+
  -- Rene Engelhard <rene@debian.org>  Sat, 27 Jun 2015 12:31:14 +0200
 
 libreoffice (1:5.0.0~rc1-1) experimental; urgency=medium
diff --git a/control b/control
index b3f8d9e..63eb3e9 100644
--- a/control
+++ b/control
@@ -714,6 +714,7 @@ Suggests: libreoffice-evolution
 Section: gnome
 Enhances: libreoffice
 Provides: libreoffice-gtk-gnome
+Replaces: libreoffice-gtk (<< 1:5.0.0~rc2-1)
 Description: office productivity suite -- GNOME integration
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index 2135649..75ca686 100644
--- a/control.in
+++ b/control.in
@@ -552,6 +552,7 @@ Suggests: libreoffice-evolution
 Section: gnome
 Enhances: libreoffice
 Provides: libreoffice-gtk-gnome
+Replaces: libreoffice-gtk (<< 1:5.0.0~rc2-1)
 Description: office productivity suite -- GNOME 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 cdf69c5..e7a4352 100755
--- a/rules
+++ b/rules
@@ -2449,6 +2449,7 @@ ifeq "$(BUILD_GTK3)" "y"
 	mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
 endif
 	mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
+	mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url $(PKGDIR)-gnome/$(OODIR)/program
 ifeq "$(BUILD_GTK)" "y"
 	mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
 	mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share

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