[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-3-33-g8c23d04
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8c23d04e9d9d9c304f06c1e076df054c02d43142
Merge: e38cb19ad4f0121a7ae7452861b76dd2d9546e37 0908ff4c0f4c3c4fd6478299155b3a8a00ed2dd8
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 13:27:59 2012 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 44a0018,a1f6e71..4b6d3b6
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,8 +1,25 @@@
+libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - caches fontconfig font substitutions (closes: #681308)
+
++ - use generic python3.pc instead of pythonX.Y(mu).pc
++ - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
++ extremely slowing down the install target...
++ - document truth and remove alpha from supported architectures
++ - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
++ - don't add version from librsvg*.shlibs (as for libebook) as we
++ dlopen() it anyway.
++ * debian/control.in:
++ - remove obsolete sharutils, po-debconf and wget | curl build-deps
++
++ -- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 19:20:07 +0200
++
+ libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
+
* debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
Jordi Mallach
+ * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106
* debian/patches/soffice-bashisms.diff: fix bashism in soffice for
valgrinding (closes: #690717)
* debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
@@@ -13,15 -11,8 +28,8 @@@
search paths (closes: #677601)
* debian/rules:
- - use generic python3.pc instead of pythonX.Y(mu).pc
- - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
- extremely slowing down the install target...
- - document truth and remove alpha from supported architectures
- - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
- - don't add version from librsvg*.shlibs (as for libebook) as we
- dlopen() it anyway.
- * debian/control.in:
- - remove obsolete sharutils, po-debconf and wget | curl build-deps
+ - exclude .desktop from dh_link call to get absolute symlinks
+ (closes: #690336)
-- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 19:20:07 +0200
diff --combined rules
index 8d8d2bc,da5bb06..1053293
--- 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.7.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.7.2 libreoffice-3.5.7.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -86,7 -86,7 +86,7 @@@ endi
#########
# Default package configuration
#
-OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+OOO_ARCHS = amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=
@@@ -359,7 -359,7 +359,7 @@@ ifneq (,$(findstring arm,$(DEB_HOST_ARC
endif
endif
-OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
+OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
OOO_JAVA_ARCHS = $(OOO_ARCHS)
@@@ -519,6 -519,10 +519,6 @@@ els
endif
# fails their tests
-ifeq "$(DEB_HOST_ARCH)" "alpha"
-ENABLE_GRAPHITE=n
-SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
-endif
ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
@@@ -530,7 -534,7 +530,7 @@@ endi
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc]
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !sparc]
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -603,7 -607,7 +603,7 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
SMALL_SYMBOLS = n
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
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !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
endif
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
@@@ -636,7 -640,7 +636,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
@@@ -755,7 -759,7 +755,7 @@@ ifeq "$(ENABLE_JAVA)" "y
ifeq "$(SQUEEZE_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
else
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
@@@ -1601,7 -1605,7 +1601,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
@@@ -1667,11 -1671,6 +1667,11 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
export OOINSTBASE=$(OODIR); \
export OOO_LANGS_LIST="$(ISOS)"; \
$(CURDIR)/debian/scripts/gid2pkgdirs.sh
+
+ # FIXME
+ if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
+ cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
+ fi
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -2774,7 -2773,7 +2774,7 @@@ ifeq "$(ENABLE_PYTHON3)" "y
endif
dh_lintian -s
dh_bugfiles -s -A
- dh_link -s
+ dh_link -s -X.desktop
dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice$(VER)-dbg
@@@ -2832,7 -2831,7 +2832,7 @@@ endi
ifeq "$(ENABLE_LIBRSVG)" "y"
ifeq "$(SYSTEM_LIBRSVG)" "y"
# dlopen()'ed only for some weird reason (even when --with-librsvg=internal!)
- perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
+ perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3 }')/' $(PKGDIR)-core.substvars
endif
endif
# don't make uno-libs3 depend on ure...
@@@ -2981,7 -2980,12 +2981,12 @@@ endi
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
- dh_link -i
+ dh_link -i -X.desktop
+ # dh_link -X does not work for .links stuff. And adding it there and
+ # fixing it up later because it's relative doesn't make that much sense.
+ # So do it here.
+ cd $(PKGDIR)-common/usr/share/applications && \
+ ln -sf /$(OODIR)/share/xdg/startcenter.desktop libreoffice-startcenter.desktop
dh_fixperms -i
dh_icons -i
dh_installxmlcatalogs -i
--
LibreOffice packaging repository
Reply to: