[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 0f6546072525e8ef073379ae23a676493764f3ea
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu May 31 17:32:39 2012 +0200
temporary hack: gconfbe move is missing files, need to figure out what is going wrong there.
diff --git a/rules b/rules
index fb3de93..52a97cf 100755
--- a/rules
+++ b/rules
@@ -2083,8 +2083,8 @@ ifeq "$(BUILD_GTK)" "y"
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
- $(PKGDIR)-gnome/$(OODIR)/program
+ # TEMPORARY HACK: temporary commenting this out. need to figure out what is going wrong there.
+ #mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* $(PKGDIR)-gnome/$(OODIR)/program
endif
endif
--
LibreOffice packaging repository
Reply to: