[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_rc1-1-10-g82feef4
The following commit has been merged in the debian-experimental-3.5 branch:
commit d17b966ef2d146cbd49bcf7db079581d6316ff30
Merge: 71904faba6ba8792608ae89703d22fcaf61cbd49 18a37d40d470b8d8904605ac8951b4825f063824
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 22 15:31:19 2012 +0200
Merge branch origin/master into debian-experimental-3.5
diff --combined changelog
index 41cba44,77c7a7a..ddacd76
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,19 +1,17 @@@
- libreoffice (1:3.5.4~rc1-1) UNRELEASED; urgency=low
-libreoffice (1:3.5.3-5) unstable; urgency=low
-
- * debian/rules:
- - don't specify --with-system-mozilla-headers if not building
- the nsplugin...
-
- -- Rene Engelhard <rene@debian.org> Tue, 22 May 2012 14:56:19 +0200
-
-libreoffice (1:3.5.3-4) unstable; urgency=low
++libreoffice (1:3.5.4~rc1-2) 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 <rene@debian.org> Sun, 20 May 2012 14:20:49 +0200
- -- Rene Engelhard <rene@debian.org> Mon, 21 May 2012 18:19:22 +0200
++ -- Rene Engelhard <rene@debian.org> Tue, 22 May 2012 14:56:19 +0200
+
+libreoffice (1:3.5.4~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 May 2012 23:24:57 +0200
libreoffice (1:3.5.3-3) unstable; urgency=low
diff --combined rules
index a3a58e3,56a642d..7033ef7
--- 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
@@@ -259,6 -259,9 +259,9 @@@ ENABLE_GIO=
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NSPLUGIN=n
+ ifeq "$(PACKAGE_NSPLUGIN)" "y"
+ SYSTEM_STUFF += mozilla-headers
+ endif
endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
@@@ -295,7 -298,6 +298,6 @@@ SYSTEM_STUFF += d
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
- SYSTEM_STUFF += mozilla-headers
SYSTEM_STUFF += sampleicc
PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
--
LibreOffice packaging repository
Reply to: