The following commit has been merged in the debian-experimental-3.5 branch:
commit 36707e6d432db3eaa77dc712852c428ab3717d40
Author: Rene Engelhard <r...@debian.org>
Date: Mon Feb 20 00:05:06 2012 +0100
don't try to mv libvclplug_gtk3.so if not built, thanks Rico Tzschichholz
again
diff --git a/changelog b/changelog
index 3937352..393738c 100644
--- a/changelog
+++ b/changelog
@@ -14,11 +14,13 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
the build
- apply patch from Rico Tzschichholz to update some configure flags
to new names in 3.5.x; remove some obsolete ones
+ - don't try to mv libvclplug_gtk3.so if not built, thanks Rico
+ Tzschichholz again
[ Bjoern Michaelsen ]
* debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
- -- Rene Engelhard <r...@debian.org> Sun, 19 Feb 2012 22:46:24 +0100
+ -- Rene Engelhard <r...@debian.org> Sun, 19 Feb 2012 23:03:52 +0000
libreoffice (1:3.5.0-1) experimental; urgency=low
diff --git a/rules b/rules
index 4229ae5..5883781 100755
--- a/rules
+++ b/rules
@@ -2024,10 +2024,12 @@ endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
- rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
+ifeq "$(BUILD_GTK3)" "y"
+ rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so
$(PKGDIR)-gtk3/$(OODIR)/program/
+endif
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rzqxx-00056t...@vasks.debian.org
