./packages/openofficeorg/3.1/experimental r1412: merge
------------------------------------------------------------
revno: 1412
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-02-23 20:29:27 +0100
message:
merge
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.79
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-02-22 23:59:54 +0100
message:
suitesparse 3.2.0 entered sid, so update build-deps again
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.3.16
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-02-23 20:14:32 +0100
message:
remove rfc1345.txt
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-02-21 22:11:21 +0000
+++ b/changelog 2009-02-23 19:29:27 +0000
@@ -8,6 +8,7 @@
- fixes bridges for SELinux (hopefully closes: #440105)
- doesn't decrement date on input to 1 day past on some $TZ anymore
(closes: #512644)
+ - new orig without rfc314.txt (closes: #516784)
* ooo-build:
- back on trunk (r15373)
- updates openoffice.1 to remove --version (closes: #505768)
@@ -41,7 +42,7 @@
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <rene@debian.org> Wed, 18 Feb 2009 22:21:07 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 21 Feb 2009 23:35:19 +0100
openoffice.org (1:3.0.1-2.3pre) unstable; urgency=low
@@ -54,8 +55,10 @@
* debian/control.in:
- add Conflicts: openoffice.org-core (<< ${Source-Version}) for
openoffice.org-common (closes: #516090)
+ - readd build-dep changing for suitesparse 3.2.0, bump to 1:3.2.0-2
+ and make lenny backport compatible..
- -- Rene Engelhard <rene@debian.org> Sat, 21 Feb 2009 14:09:31 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 22 Feb 2009 00:14:31 +0100
openoffice.org (1:3.0.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-21 22:11:21 +0000
+++ b/control 2009-02-23 19:29:27 +0000
@@ -3,7 +3,7 @@
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, 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 , libdb-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.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [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] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [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-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [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] , libboost1.37-dev (>= 1.37.0-4) , 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-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 , libdb-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.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [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] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [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-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [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] , libboost1.37-dev (>= 1.37.0-4) , 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-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , 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]
Standards-Version: 3.8.0
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2009-02-21 22:11:21 +0000
+++ b/rules 2009-02-23 19:29:27 +0000
@@ -162,7 +162,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-4)
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
@@ -179,6 +179,7 @@
USE_LIBCURL4=y
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
+SUITESPARSE_MIN_VERSION= (>= 1:3.2.0-2)
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
PARALLEL_BUILD=n
@@ -269,6 +270,8 @@
MONO_MINVER= (>= 1.2.3)
MONO2=n
BOOST_VERSION=1.34
+ LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
+ SUITESPARSE_MIN_VERSION= (>= 3.1.0)
endif
#############
@@ -897,7 +900,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 $(SUITESPARSE_MIN_VERSION)
else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev
@@ -2426,7 +2429,7 @@
endif
ifeq "$(USE_SCSOLVER)" "y"
- install -D -m644 $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/scsolver.uno.oxt \
+ install -D -m644 $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/libscsolver.uno.oxt \
$(PKGDIR)-calc/$(OOBRANDDIR)/share/extension/install/scsolver.uno.oxt
# we don't need it anymore - the menu entry is replaced with Koheis
rm -f $(PKGDIR)-calc/$(OODIR)/program/libsolver*.so
@@ -3019,7 +3022,7 @@
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program" \
+ LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program::$(PKGDIR)-writer/$(OODIR)/program" \
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program \
@@ -3310,6 +3313,12 @@
tar cfvj $(TAG)-testing.tar.bz2.dfsg $(TAG)-testing && \
ln -sf $(TAG)-testing.tar.bz2.dfsg $(TAG)-testing.tar.bz2 && \
rm -rf $(TAG)-testing && \
+ tar xfvj $(TAG)-extensions.tar.bz2 && \
+ zip -d $(TAG)-extensions/jfreereport/download/liblayout.zip \
+ liblayout/resource/rfc1345.txt && \
+ tar cfvj $(TAG)-extensions.tar.bz2.dfsg $(TAG)-extensions && \
+ ln -sf $(TAG)-extensions.tar.bz2.dfsg $(TAG)-extensions.tar.bz2 && \
+ rm -rf $(TAG)-extensions && \
cd $$TMPD && tar cfvz openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz openoffice.org-$(UPSTREAM_VERSION) && \
rm -rf openoffice.org-$(UPSTREAM_VERSION) && \
mv openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/.. && \
Reply to: