[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-2-17-g08d15d1
The following commit has been merged in the debian-experimental-3.5 branch:
commit 08d15d17f085c338e06b05ca21b81907d0f1ac0f
Merge: 16385b9935af119e646d922aef6c1f4d9705728e 0512a3a49b4a36740e1b09d3060e51c256ae0f20
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 11 10:20:10 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 61aa295,7b2abb4..3cb6c49
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,9 +1,21 @@@
+libreoffice (1:3.5.6-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - caches fontconfig font substitutions (closes: #681308)
+
+ * debian/rules:
+ - use generic python3.pc instead of pythonX.Y(mu).pc
+ * debian/control.in:
+ - remove obsolete sharutils, po-debconf and wget | curl build-deps
+
+ -- Rene Engelhard <rene@debian.org> Tue, 14 Aug 2012 19:53:28 +0200
+
+ libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
+
+ * use xz compression for all binary packages (closes: #687041)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 09 Sep 2012 14:45:20 +0200
+
libreoffice (1:3.5.4+dfsg-1) unstable; urgency=low
* src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz: remove
diff --combined rules
index 57b564f,4f9d988..5464fcf
--- 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.4.2
+lo_sources_ver=3.5.6.2
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.4.2 libreoffice-3.5.4.2
+# use ./g checkout -b tag-libreoffice-3.5.6.2 libreoffice-3.5.6.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -491,7 -491,7 +491,7 @@@ ifneq "$(GCC_VERSION)" "
endif
endif
- BUILDDEB_OPTIONS = -- -Zbzip2
+ BUILDDEB_OPTIONS = -- -Zxz
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
ifneq (,$(findstring mesa-headers,$(SYSTEM_STUFF)))
@@@ -600,14 -600,11 +600,11 @@@ ifneq (,$(findstring db,$(SYSTEM_STUFF)
endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
- # {,kfreebsd-}{i386,amd64} should be big and fast (xz!) enough for this
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
else
ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
- USE_XZ_COMPRESS = y
endif
endif
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
@@@ -643,7 -640,7 +640,7 @@@ ifeq "$(BUILD_PYUNO)" "y
DBG_DBG_SUGGESTS+= , python-dbg
BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev (>= 3.2)
+ BUILD_DEPS += , $(PYTHON3)-dev
endif
else
BUILD_DEPS += , python
@@@ -1608,7 -1605,7 +1605,7 @@@ ifeq "$(BUILD_PYUNO)" "y
cd $(SOURCE_TREE)/pyuno-py3; \
rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
+ PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python$(PY3MAJOR)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR)) \
../solenv/bin/build.pl # NO DELIVER!
endif
endif
@@@ -2921,12 -2918,7 +2918,7 @@@ endi
-V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
dh_md5sums -s
- ifeq "$(USE_XZ_COMPRESS)" "y"
- dh_builddeb -Nlibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
- dh_builddeb -plibreoffice$(VER)-dbg $(DEBHELPER_OPTIONS) $(filter-out -Zbzip2 -Zlzma,$(BUILDDEB_OPTIONS)) -Zxz
- else
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
- endif
touch $@
--
LibreOffice packaging repository
Reply to: