[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-155-gb46c0cf
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 3053c08d0b44d345d625e261b5d2d02514aa3e17
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 10 13:53:59 2012 +0200
Revert temporary hacks
Revert "temporary hack: gconfbe move is missing files, need to figure out what is going wrong there."
This reverts commit 3a28a0a4711f9f2cde069103c826e6844d71158f.
Revert "hardwire GCJ version for now"
This reverts commit 5e4ef94c346a58a3eb39de81217131a158b35e68.
Conflicts:
rules
Revert "temporary hack: remove split split-binfilters-and-evo.diff"
debian removed the patch completely, follow along and keep diff small
This reverts commit 29fdac594c2ead6887c6a2172886ae9e389e241d.
Partially revert "temporary hack: disable evo2 and nsplugin"
keep evo2 disabled for now
This reverts commit f7d4f8f3341c33b91873f850a61bb970ca911609.
diff --git a/patches/series b/patches/series
index 8737b78..bb8721e 100644
--- a/patches/series
+++ b/patches/series
@@ -2,7 +2,6 @@ no-minimaltoc.diff
debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
-#split-binfilters-and-evo.diff
debian-debug.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
diff --git a/rules b/rules
index ccb8245..745204f 100755
--- a/rules
+++ b/rules
@@ -510,9 +510,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
PARALLEL_BUILD=y
#temp. hacks
- GCJ_JDK_VERSION=4.6
ENABLE_EVO2:=n
- PACKAGE_NSPLUGIN:=n
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -2111,8 +2109,8 @@ ifeq "$(BUILD_GTK)" "y"
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GCONF)" "y"
- # 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
+ mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
+ $(PKGDIR)-gnome/$(OODIR)/program
endif
endif
--
LibreOffice packaging repository
Reply to: