The following commit has been merged in the master branch:
commit 245877bd0cc78d1bbf115eae613630319149d5a0
Author: Rene Engelhard <[email protected]>
Date: Fri Aug 12 16:18:58 2011 +0000
on sid (and when building with debug), compress -dbg with xz; make bzip2
compression unconditional
diff --git a/changelog b/changelog
index cb932ae..c1c4f25 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,8 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
- fix build with make 3.82: remove space after, in $(call
- also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
- try gcj again on mipsel, stay with OpenJDK for mips
+ - on sid (and when building with debug), compress -dbg with xz; make bzip2
+ compression unconditional
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
@@ -23,7 +25,7 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
- gconf also needs liborbit2-dev
- bump libebook so name to allow for libebook-1.2.so-11 too
- -- Rene Engelhard <[email protected]> Wed, 10 Aug 2011 19:28:30 +0000
+ -- Rene Engelhard <[email protected]> Thu, 11 Aug 2011 22:25:52 +0200
libreoffice (1:3.3.3-4) unstable; urgency=low
diff --git a/control b/control
index fd15e96..8b51106 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>=
2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>=
1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips powerpc powerpcspe
ppc64 s390 s390x sparc], gcj-n
ative-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1)
[!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0),
gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-a
md64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev,
libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev,
libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>>
1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, dpkg-dev (>= 1.15.1), python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk
[alpha amd64 armel armhf i386 mips powerpc powerpcspe ppc64 s390 s390x sparc],
gcj-n
ative-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1)
[!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0),
gcc-mingw32, mingw32-runtime, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel],
libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-a
md64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64
kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev,
libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev,
libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>>
1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64
mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mipsel], ant
(= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mipsel], libmdds-dev (>=
0.4.0), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>=
1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index 28c7d35..f4fc6e9 100755
--- a/rules
+++ b/rules
@@ -290,8 +290,6 @@ DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
THES_DIR=/usr/share/mythes
-USE_BZIP_COMPRESS=y
-
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
--with-tag=$(TAG) \
@@ -478,12 +476,7 @@ ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
endif
-ifeq "$(USE_BZIP_COMPRESS)" "y"
- DPKG_DEPENDS = dpkg (>= 1.10.24)
BUILDDEB_OPTIONS = -- -Zbzip2
-endif
-
- BUILD_DEPS += , dpkg-dev (>= 1.15.1)
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS),
libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
@@ -545,10 +538,11 @@ ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
SMALL_SYMBOLS = y
else
- # -g gives a far too big deb (>400M, ca. 1GB I-S)
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
# ooo-build defaults to --enable-symbols (without SMALL)
SMALL_SYMBOLS = n
+ # reduces -dbg size from 760M to ~320M
+ USE_XZ_COMPRESS = y
else
SMALL_SYMBOLS = y
endif
@@ -568,6 +562,15 @@ ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
endif
+ifeq "$(USE_XZ_COMPRESS)" "y"
+ # used only for -dbg yet, so disabled and done manually
+ # in binary-arch
+ #BUILDDEB_OPTIONS = -- -Zxz
+ BUILD_DEPS += , dpkg-dev (>= 1.15.6)
+else
+ BUILD_DEPS += , dpkg-dev (>= 1.15.1)
+endif
+
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
@@ -3345,7 +3348,12 @@ endif
-V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
dh_md5sums -s -X$(shell echo $(OOBASISDIR) | sed -e
s/usr/var/)/program/services.rdb
+ifeq "$(USE_XZ_COMPRESS)" "y"
+ dh_builddeb -plibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS)
$(filter-out -Zbzip2,$(BUILDDEB_OPTIONS)) -Zxz
+ dh_builddeb -Nlibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS)
$(BUILDDEB_OPTIONS)
+else
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
+endif
touch $@
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
