------------------------------------------------------------
revno: 805
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2007-07-26 17:21:49 +0200
message:
m222, system-vigra, add libuno_purpenvhelpergcc3 to -cores .shlibs.local; fix
changelog, system-boost for etch backport as it has a version which is working
modified:
changelog
control
openoffice.org-core.shlibs.local
rules
=== modified file 'changelog'
--- a/changelog 2007-07-24 10:32:12 +0000
+++ b/changelog 2007-07-26 15:21:49 +0000
@@ -1,6 +1,6 @@
-openoffice.org (2.3.0~src680m221-0.1pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m222-0.1pre) experimental; urgency=low
- * new upstream snapshot (SRC680_m221)
+ * new upstream snapshot (SRC680_m222)
- fixes joining cells in writer tables (closes: #218281)
- fixes text width in PDF export (closes: #408209)
- adds fy_NL localedata (closes: #413205)
@@ -9,50 +9,61 @@
(closes: #386250)
* ooo-build:
- use trunk again
- - update (r9905)
+ - update (r9939)
+ apply Split section. Fixes the binfilter split so that StarWriter
3.0-5.0 etc. do not appear anymore when -filter-binfilter is not
installed (indirectly closes: #421274)
+ + src/: add updated GSIs from ftp.linux.cz:
+ af bg cs cy da dz eo et fi ga ku lt mk tg
* debian/rules, debian/Adobe-Core35_AFMs-314.tar.gz.uu: remove, unneeded
+ [RE]
* debian/rules:
- - update for 2.3
- - add ppc64 test-wise
- - reenable mr-IN since now fixed
+ - update for 2.3 [RE]
+ - add ppc64 test-wise [RE]
+ - reenable mr-IN since now fixed [RE]
- build-depend on libneon26 again, got fixed and is the only supported
- version since m219 anyway
- - add conditional for system-libsvg, enable it for sid/experimental
- - install headless vcl plugin into -headless
- - remove debian/libuno-cil.installcligac in clean
- - set HELP_L10N_VIRTUAL_VERSION to $(shell $(UPSTREAM_VERSION) | tr [~]
[\\-])
- - suggest libc*-dbg
+ version since m219 anyway [RE]
+ - add conditional for system-libsvg, enable it for sid/experimental [RE]
+ - install headless vcl plugin into -headless [RE]
+ - remove debian/libuno-cil.installcligac in clean [RE]
+ - set HELP_L10N_VIRTUAL_VERSION to $(shell $(UPSTREAM_VERSION) | tr [~]
+ [\\-]) [CC]
+ - suggest libc*-dbg [RE]
- build with --enable-openxml to get the OOXML extensions for the bash
- completion
- - don't manually split binfilters anymore
- - build-depend on gperf for OOXML patchset
- - fix some stuff for etch backports
+ completion [RE]
+ - don't manually split binfilters anymore [RE]
+ - build-depend on gperf for OOXML patchset [RE]
+ - fix some stuff for etch backports [RE]
- install splash screens directly from OOos source tree after fixing
their RGBness and removing the Sun logo from the BrOffice.org splash
while we don't have a nologo variant upstream yet (thanks Martin Hasch
for the conversion hint and André Schnabel for the needed (gm) convert
- statement for the "Sun removal")
+ statement for the "Sun removal") [RE]
- migrate to graphicsmagick as convert from imagemagick (at least etchs)
- does create a broken BMP out of the Sun logo removal step..
- - reenable km again due to demand of the Khmer people...
+ does create a broken BMP out of the Sun logo removal step.. [RE]
+ - reenable km again due to demand of the Khmer people... [RE]
+ - uuencode all ooo-build/desktop icons [CC]
+ - add USE_SYSTEM_VIGRA conditional, enable it [RE]
* debian/control.in:
- - build-depend on libxml-parser-perl
- - Add XS-Vcs-{Bzr,Svn} fields
- - we need to build-depend on dmake (>= 1:4.7)
- - build-depend on netpbm
- - remove imagemagick; add graphicsmagick
+ - build-depend on libxml-parser-perl [RE]
+ - Add XS-Vcs-{Bzr,Svn} fields [RE]
+ - we need to build-depend on dmake (>= 1:4.7) [RE]
+ - build-depend on netpbm [RE]
+ - remove imagemagick; add graphicsmagick [RE]
* debian/*.menu, debian/*.overrides.lintian:
- - update for 2.3
- * debian/README.Debian-source: update
+ - update for 2.3 [RE]
+ * debian/README.Debian-source: update [RE]
* merge from Ubuntu:
- - make system-dmake conditional
- * debian/br{intro,about}.bmp.uu: remove, obsolete
- * debian/scripts/fix_image_rgb: add
-
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 24 Jul 2007 11:39:05 +0200
+ - make system-dmake conditional [RE]
+ - add Ubuntu conditonals [CC]
+ * debian/br{intro,about}.bmp.uu: remove, obsolete [RE]
+ * debian/scripts/fix_image_rgb: add [RE]
+ * debian/openoffice.org-core.shlibs.local: add
+ libuno_purpenvhelpergcc3 [RE]
+
+ (CC = Chris Cheney)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 26 Jul 2007 16:05:34 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-24 10:32:12 +0000
+++ b/control 2007-07-26 15:21:49 +0000
@@ -3,7 +3,7 @@
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], 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], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [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], gperf [i386
powerpc sparc amd64 ppc64], , libcurl4-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] , dmake (>= 1:4.7) [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-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386
powerpc sparc amd64 ppc64] , libsuitesparse-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], 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], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [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], gperf [i386
powerpc sparc amd64 ppc64], , libcurl4-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] , dmake (>= 1:4.7) [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] , libvigraimpex-dev [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-4) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] ,
libsuitesparse-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
=== modified file 'openoffice.org-core.shlibs.local'
--- a/openoffice.org-core.shlibs.local 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-core.shlibs.local 2007-07-26 15:21:49 +0000
@@ -7,3 +7,4 @@
libuno_salhelpergcc3 3
libstore 3
libjvmfwk 3
+libuno_purpenvhelpergcc3 3
=== modified file 'rules'
--- a/rules 2007-07-26 11:35:53 +0000
+++ b/rules 2007-07-26 15:21:49 +0000
@@ -98,6 +98,7 @@
USE_STLPORT5=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=n
+USE_SYSTEM_VIGRA=y
USE_SYSTEM_PORTAUDIO=y
USE_PORTAUDIO_V19=y
USE_EXTERNAL_CXXLIBS=y
@@ -243,6 +244,8 @@
USE_SYSTEM_DMAKE=n
USE_LIBCURL4=n
USE_LIBSUITESPARSE=n
+ USE_SYSTEM_BOOST=y
+ USE_SYSTEM_VIGRA=y
endif
#############
@@ -336,7 +339,7 @@
ifeq "$(USE_PYCENTRAL)" "y"
BUILD_DEPS += , python-central (>= 0.5) [$(OOO_ARCHS)], debhelper (>=
5.0.37.2)
else
- BUILD_DEPS += , debhelper (>= 5.0)
+ BUILD_DEPS += , debhelper (>= 5)
endif
BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
@@ -543,6 +546,11 @@
CONFIGURE_FLAGS += --with-system-boost
endif
+ifeq "$(USE_SYSTEM_VIGRA)" "y"
+ BUILD_DEPS += , libvigraimpex-dev [$(OOO_ARCHS)]
+ CONFIGURE_FLAGS += --with-system-vigra
+endif
+
ifeq "$(USE_SYSTEM_PORTAUDIO)" "y"
ifeq "$(USE_PORTAUDIO_V19)" "y"
BUILD_DEPS += , portaudio19-dev [$(OOO_ARCHS)]
