The following commit has been merged in the master branch:
commit 0512a3a49b4a36740e1b09d3060e51c256ae0f20
Author: Rene Engelhard <r...@debian.org>
Date: Sun Sep 9 18:37:36 2012 +0200
use xz compression for all binary packages (closes: #687041)
diff --git a/changelog b/changelog
index 891de90..7b2abb4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
+
+ * use xz compression for all binary packages (closes: #687041)
+
+ -- Rene Engelhard <r...@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 --git a/rules b/rules
index c9bb8b4..4f9d988 100755
--- a/rules
+++ b/rules
@@ -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 @@ 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
- USE_XZ_COMPRESS = y
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
@@ -2921,12 +2918,7 @@ endif
-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
--
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/e1tanf8-0007vt...@vasks.debian.org
