[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4_rc3-1-269-g6510898



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit e4e84b6bc917b7b6c5104c9127699f2d1405f020
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Sat Nov 24 15:47:19 2012 +0100

    reenable report-builder

diff --git a/changelog b/changelog
index d30bd57..999ad1a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.0~alpha1-0ubuntu1~ppa2) quantal; urgency=low
+
+  * reenable report-builder
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Sat, 24 Nov 2012 15:44:55 +0100
+
 libreoffice (1:4.0.0~alpha1-0ubuntu1~ppa1) quantal; urgency=low
 
   * testbuilding
diff --git a/rules b/rules
index 7df8118..dbb18c8 100755
--- a/rules
+++ b/rules
@@ -515,11 +515,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   endif
   PARALLEL_BUILD=y
   #temp. hacks
-  ifeq ($(shell echo "$(DEB_VERSION)" | grep -c universe),1)
-    ENABLE_REPORTDESIGN=y
-  else
-    ENABLE_REPORTDESIGN=n
-  endif
   ENABLE_EVO2:=n
   PACKAGE_LIBRELOGO=n # temporary: still commented on debian for the control file generation
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))

-- 
LibreOffice packaging repository


Reply to: