------------------------------------------------------------
revno: 776
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-09 01:42:01 +0200
message:
update ooo-build, add XS-X-Vcs-*, fix typo, add conditional for system-libsvg
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-07-04 21:29:24 +0000
+++ b/changelog 2007-07-08 23:42:01 +0000
@@ -11,13 +11,16 @@
- reenable mr-IN since now reported to be fixed
- build-depend on libneon26 again, got fixed and is the only supported
version since m219 anyway
+ - add conditional for system-libsvg
* debian/control.in:
- build-depend on libxml-parser-perl
+ - Add X-Vcs-{Bzr,Svn} fields, no idea how whatever uses this will behave
+ with two fields, but we'll see...
* ooo-build:
- use trunk again
- - update (r9702)
+ - update (r9729)
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 4 Jul 2007 00:38:31 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 9 Jul 2007 00:48:47 +0200
openoffice.org (2.2.1-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-04 21:29:24 +0000
+++ b/control 2007-07-08 23:42:01 +0000
@@ -3,10 +3,12 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.6) [i386
powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64],
libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc
sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64],
imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64 ppc64]
libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl3-gnutls-dev
[i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc
amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386
powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] ,
libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java
[i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc
sparc amd64 ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32
[i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64],
libnss3-dev [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386
amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64],
mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] ,
libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] ,
libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libicu36-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc
sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64],
libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>=
4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2)
[i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64
ppc64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64],
lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64] , libufsparse-dev
[i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc
sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc
amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev
(>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.6) [i386
powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64],
libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc
sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64],
imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64
ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], ,
libcurl3-gnutls-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5)
[i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4)
[i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev
(>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc
sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64
ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>=
2.6.0-1) [i386 powerpc sparc amd64 ppc64] , libdb4.4-java [i386 powerpc sparc
amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386
powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] ,
mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64],
libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64],
cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386
powerpc sparc amd64 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc
sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64
ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>=
0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc
amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386
powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] ,
libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc
sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64
ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh
(>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>=
5.5.0.10-2) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-2) [i386
powerpc sparc amd64 ppc64] , libufsparse-dev [i386 powerpc sparc amd64 ppc64] ,
libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386
powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
+XS-X-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
+XS-X-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
Package: openoffice.org
Architecture: i386 powerpc sparc amd64 ppc64
=== modified file 'control.in'
--- a/control.in 2007-07-03 22:26:03 +0000
+++ b/control.in 2007-07-08 23:42:01 +0000
@@ -47,12 +47,14 @@
libxinerama-dev [%OOO_ARCHS%],
x11proto-render-dev [%OOO_ARCHS%],
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
- libdb4.4-dev [%OOO_ARCHS%]
+ libdb4.4-dev [%OOO_ARCHS%],
libxml-parser-perl [%OOO_ARCHS%],
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
+XS-X-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
+XS-X-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
Package: openoffice.orgVER
Architecture: %OOO_ARCHS%
=== modified file 'rules'
--- a/rules 2007-07-04 21:29:24 +0000
+++ b/rules 2007-07-08 23:42:01 +0000
@@ -130,6 +130,7 @@
PACKAGE_SDK=y
RUN_SMOKETEST=n
USE_LIBCURL4=y
+USE_SYSTEM_LIBSVG=y
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
@@ -189,6 +190,7 @@
HUNSPELL_MIN_VER= (>= 1.0.8-2)
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION=
+ USE_SYSTEM_LIBSVG=n
endif
#############
@@ -506,6 +508,11 @@
endif
endif
+ifeq "$(USE_SYSTEM_LIBSVG)" "y"
+ BUILD_DEPS += , libsvg-dev [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS += --with-system-libsvg
+endif
+
ifeq "$(USE_SYSTEM_ICU)" "y"
BUILD_DEPS += , libicu36-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-icu
@@ -813,8 +820,7 @@
cd ooo-build ;\
for f in src/ooo_*_images*.bz2 src/extras*bz2 \
src/evolocal.odb src/*.gz src/GSI*bz2 src/xt*zip src/go-oo-team.png
\
- templates/*.o?? src/biblio*bz2 src/tango_mainapp_16.png \
- patches/vba/cws-npower8-bindata.diff; do \
+ templates/*.o?? src/biblio*bz2 src/tango_mainapp_16.png; do \
if [ -s $$f ]; then \
uuencode $$f $$f > $$f.uu.tmp && \
../debian/scripts/move-if-change $$f.uu.tmp $$f.uu; \
