./packages/openofficeorg/3.1/experimental r1396: merge
------------------------------------------------------------
revno: 1396
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Tue 2009-01-27 08:27:24 +0100
message:
merge
modified:
changelog
control
control.in
rules
scripts/fix_image_rgb
------------------------------------------------------------
revno: 1022.3.13
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2009-01-22 16:01:21 +0100
message:
- add build-conflicts against xulrunner-dev is MOZILLA != libxul
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.57
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-01-23 10:05:05 +0100
message:
build against suitesparse 3.2.0; merge
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.58
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-01-24 16:32:20 +0100
message:
fix Build-Conflict changing
modified:
rules
------------------------------------------------------------
revno: 1022.3.14
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-01-24 16:29:45 +0100
message:
fix Build-Conflict changing
modified:
rules
------------------------------------------------------------
revno: 1332.1.59
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-01-25 19:23:28 +0100
message:
+ * debian/control.in:
+ - allow imagemagick for build again, as it seem to create the splash
+ correctly now
+ * debian/openoffice.org-common.preinst.in: fix typo to actually also remove
+ dictionary.lst.old
modified:
changelog
control.in
rules
------------------------------------------------------------
revno: 1022.3.15
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-01-25 19:15:57 +0100
message:
mention issue nr
modified:
rules
------------------------------------------------------------
revno: 1332.1.60
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-01-25 19:25:18 +0100
message:
regen control
modified:
control
------------------------------------------------------------
revno: 1388.1.5
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-01-25 19:34:31 +0100
message:
merge
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1388.1.6
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-27 00:34:06 +0100
message:
merge
modified:
changelog
control
rules
scripts/fix_image_rgb
------------------------------------------------------------
revno: 1332.1.61
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-01-26 07:59:07 +0100
message:
forgot those two
modified:
rules
scripts/fix_image_rgb
------------------------------------------------------------
revno: 1332.1.62
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-01-26 23:39:42 +0100
message:
update for 3.0.1 final; missing epoch; no space...; add missing changelog entry
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-01-25 22:28:50 +0000
+++ b/changelog 2009-01-27 07:27:24 +0000
@@ -7,7 +7,7 @@
- About box now fixes en-US tense and adds missing comma (closes: #470521)
- fixes bridges for SELinux (hopefully closes: #440105)
* ooo-build:
- - back on trunk (r15129)
+ - back on trunk (r15151)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -32,7 +32,26 @@
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
jvmfwk soon will stop displaying JVMs < 1.5.0
- -- Rene Engelhard <rene@debian.org> Mon, 19 Jan 2009 11:04:44 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Jan 2009 23:23:10 +0100
+
+openoffice.org (1:3.0.1-0.1pre) experimental; urgency=low
+
+ * OpenOffice.org 3.0.1 final (except for Windows identical with rc2)
+ * ooo-build
+ - update (r15151)
+ * debian/rules:
+ - add build-conflicts against xulrunner-dev is MOZILLA != libxul
+ - build-depend on libsuitesparse (>= 3.2.0) and a lp-solve also built
+ against it to prepare the transition
+ * debian/control.in:
+ - allow imagemagick for build again, as it seem to create the splash
+ correctly now
+ * debian/scripts/fix_image_rgb, debian/rules: use convert instead of
+ gm convert
+ * debian/openoffice.org-common.preinst.in: fix typo to actually also remove
+ dictionary.lst.old
+
+ -- Rene Engelhard <rene@debian.org> Mon, 26 Jan 2009 15:30:02 +0100
openoffice.org (1:3.0.1~rc2-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-01-20 15:51:52 +0000
+++ b/control 2009-01-26 23:34:06 +0000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
-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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-3), lp-solve (>= 5.5.0.13-3) , libsuitesparse-dev (>> 1:3.2.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], xulrunner-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
=== modified file 'control.in'
--- a/control.in 2009-01-20 15:51:52 +0000
+++ b/control.in 2009-01-25 18:34:31 +0000
@@ -36,7 +36,7 @@
libexpat1-dev,
fastjar,
xsltproc,
- graphicsmagick-imagemagick-compat,
+ imagemagick,
netpbm,
fdupes,
xml-core,
=== modified file 'rules'
--- a/rules 2009-01-25 22:28:50 +0000
+++ b/rules 2009-01-27 07:27:24 +0000
@@ -154,7 +154,7 @@
KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
-LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
+LPSOLVE_MIN_VERSION= (>= 5.5.0.13-3)
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
@@ -882,7 +882,7 @@
CONFIGURE_FLAGS += --with-system-lpsolve
ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
- BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0)
+ BUILD_DEPS += , libsuitesparse-dev (>> 1:3.2.0)
else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev
@@ -1368,6 +1368,14 @@
perl -pi -e 's/GNOME GIO/GIO/' debian/control
endif
+ifneq "$(MOZILLA)" "libxul"
+ # configure.in looks for libxul.pc and if it finds it it
+ # just uses this. when we specify some other mozilla I guess we
+ # want to use its headers, not of libxul. We need a build-conflicts
+ # here unfortunately until i#98370 is fixed.
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, xulrunner-dev/" debian/control
+endif
+
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
@@ -2699,7 +2707,7 @@
# convert icons to xpm; we need them for the Debian menu policy...
cd $(PKGDIR)-common/usr/share/icons/gnome/32x32/apps && \
- for x in *.png; do gm convert $$x `basename $$x .png`.xpm; done
+ for x in *.png; do convert $$x `basename $$x .png`.xpm; done
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
@@ -3029,7 +3037,7 @@
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
ifeq "$(USE_SCSOLVER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
- dpkg-shlibdeps -O -p scsolver-shlibs \
+ dpkg-shlibdeps -O -pscsolver-shlibs \
-Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/scsolver.uno.so \
=== modified file 'scripts/fix_image_rgb'
--- a/scripts/fix_image_rgb 2007-07-23 20:20:53 +0000
+++ b/scripts/fix_image_rgb 2009-01-26 06:59:07 +0000
@@ -1,8 +1,7 @@
#!/bin/sh -e
temp=`mktemp -q`
-gm convert -compress none $1 $temp
-# thanks to Martin Hasch <hasch@scan-plus.de> for this tip.
+convert -compress none $1 $temp
bmptoppm $temp | ppmtobmp -bpp 24 > $2
rm -f $temp
Reply to: