The following commit has been merged in the debian-experimental-3.5 branch:
commit 71904faba6ba8792608ae89703d22fcaf61cbd49
Merge: 6ccea29136f6365253475cd2a959ca1e99df6768
c37c91681683af7a985790b8b910b935ca76b04b
Author: Rene Engelhard <[email protected]>
Date: Sun May 20 22:56:16 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 9f0d146,7293336..41cba44
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,12 +1,18 @@@
-libreoffice (1:3.5.3-4) UNRELEASED; urgency=low
+libreoffice (1:3.5.4~rc1-1) UNRELEASED; urgency=low
* debian/rules:
- really disable -gcj package completely (not just empty package)
+ - surrender and disable mozilla plugin. broken again for whatever
+ non-LO reason.
-- Rene Engelhard <[email protected]> Sun, 20 May 2012 14:20:49 +0200
+libreoffice (1:3.5.4~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <[email protected]> Thu, 17 May 2012 23:24:57 +0200
+
libreoffice (1:3.5.3-3) unstable; urgency=low
[ Rene Engelhard ]
diff --combined rules
index 6dab6b4,31c6bfd..a3a58e3
--- a/rules
+++ b/rules
@@@ -69,9 -69,9 +69,9 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.3.2
+lo_sources_ver=3.5.4.1
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.3.2 libreoffice-3.5.3.2
+# use ./g checkout -b tag-libreoffice-3.5.4.1 libreoffice-3.5.4.1
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -258,7 -258,7 +258,7 @@@ ENABLE_GCONF=
ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
- PACKAGE_NSPLUGIN=y
+ PACKAGE_NSPLUGIN=n
endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
