------------------------------------------------------------
revno: 2125
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-10-04 17:44:42 +0200
message:
opens___.ttf has an own version number; reflect this in the package version
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-10-03 23:04:38 +0000
+++ b/changelog 2010-10-04 15:44:42 +0000
@@ -22,6 +22,7 @@
- temporarily disable -sdbc-postgresql as unopkg apparently has problems
with .zips now...
- use convert directly for copnverting to 24bpp bmp instead of using
fix_bmp_rgb
+ - opens___.ttf has an own version number; reflect this in the package
version
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
@@ -54,7 +55,7 @@
* debian/control.in, debian/rules: stop building industrial package
* debian/scripts/fix_bmp_rgb: remove
- -- Rene Engelhard <[email protected]> Fri, 01 Oct 2010 16:19:56 +0200
+ -- Rene Engelhard <[email protected]> Mon, 04 Oct 2010 16:56:49 +0200
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-10-04 02:01:53 +0000
+++ b/control 2010-10-04 15:44:42 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], 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,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, , g++ (>>
4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev
(>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc
powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , l
ibpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12)
, tcsh , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64
s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips
mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
sd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha a
md64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org
[i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc p
owerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>=
1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64
ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64],
mono-u
tils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64],
cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev (>= 1.38), libboost-thread-dev,
libboost-program-options-dev , libmdds-dev , libvigraimpex-dev , libwpd8-dev
(>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , 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)
[i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 al
pha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4)
[i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , 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 , libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
+Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8 ,
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~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (=
5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2010-10-03 23:04:38 +0000
+++ b/rules 2010-10-04 15:44:42 +0000
@@ -1320,6 +1320,10 @@
CONFIGURE_FLAGS += --disable-gconf
endif
+ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+ BUILD_DEPS_INDEP += , fontforge
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@ -3821,7 +3825,8 @@
-Nlibuno-cli-uretypes1.0-cil \
-Nlibuno-cli-oootypes1.0-cil \
-Nlibuno-cli-cppuhelper1.0-cil \
- -Nlibuno-cli-ure1.0-cil -- \
+ -Nlibuno-cli-ure1.0-cil \
+ -Nttf-opensymbol -- \
-V'base-version=$(BASE_VERSION)' \
-V'basis-version=$(BASIS_VERSION)' \
-V'next-basis-version=$(NEXT_BASIS_VERSION)' \
@@ -3851,6 +3856,10 @@
dh_gencontrol -plibuno-cli-ure1.0-cil -- \
-v$(shell grep CLI_URE_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+ dh_gencontrol -pttf-opensymbol -- \
+ -v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);'
debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -popenoffice.org$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
