The following commit has been merged in the master branch:
commit 0b5f41e14943c2ee048994713eb4979b2a9d61f4
Author: Rene Engelhard <r...@debian.org>
Date: Wed Oct 5 10:37:03 2011 +0200
keep -g1 on squeeze-backports
diff --git a/changelog b/changelog
index d35630b..2dc94bb 100644
--- a/changelog
+++ b/changelog
@@ -8,13 +8,14 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
- build-depend on libpoppler-cpp-dev
- fix libsslX.Y.Z in -dbgs suggests for multiarch
- use internal jfreereport on squeeze-backports
+ - keep -g1 on squeeze-backports
- use mingw-w64 for unowinreg.dll build (closes: #642954)
* merge from ubuntu-oneiric-3.4:
- hard hack to make upload happy: Pre-Depends on xz-capable dpkg
for -dbg
- -- Rene Engelhard <r...@debian.org> Wed, 05 Oct 2011 10:28:42 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 05 Oct 2011 10:36:27 +0200
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/rules b/rules
index 0d49185..df85614 100755
--- a/rules
+++ b/rules
@@ -569,15 +569,19 @@ else
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
else
- ifneq (,$(findstring i386,$(ARCH)))
- SMALL_SYMBOLS = n
- USE_XZ_COMPRESS = y
+ ifeq "$(SQUEEZE_BACKPORTS)" "y"
+ SMALL_SYMBOLS = y
else
- ifneq (,$(findstring amd64,$(ARCH)))
+ ifneq (,$(findstring i386,$(ARCH)))
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
else
+ ifneq (,$(findstring amd64,$(ARCH)))
+ SMALL_SYMBOLS = n
+ USE_XZ_COMPRESS = y
+ else
SMALL_SYMBOLS = y
+ endif
endif
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rbmyb-0002ny...@vasks.debian.org
