[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-141-gf64b3e8
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 86781814835b1fcd69b63b75f36756a760f9098c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 11 12:49:34 2012 +0200
remove obsolete rm -rf preventing -report-builders contents getting packaged
Conflicts:
changelog
diff --git a/changelog b/changelog
index 7503625..897704b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.4-0ubuntu1) UNRELEASED; urgency=low
+
+ * cherry-pick Rene Engelhards fix against an empty libreoffice-report-builder
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 11 Jun 2012 16:28:07 +0200
+
libreoffice (1:3.5.4-0ubuntu1) precise-proposed; urgency=low
[ Bjoern Michaelsen ]
diff --git a/rules b/rules
index 84c4b1d..a2077a0 100755
--- a/rules
+++ b/rules
@@ -2331,7 +2331,6 @@ ifneq "$(ENABLE_REPORTDESIGN)" "y"
else
ifeq "$(PACKAGE_BASE)" "y"
# move rpt stuff into -report-builder-bin
- rm -rf $(PKGDIR)-report-builder
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
--
LibreOffice packaging repository
Reply to: