./packages/openofficeorg/3.0/experimental r1082: merge 1:2.4.1~ooh680m14-1
------------------------------------------------------------
revno: 1082
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2008-05-13 16:32:52 +0200
message:
merge 1:2.4.1~ooh680m14-1
modified:
changelog
control
control.qa.in
rules
------------------------------------------------------------
revno: 1022.2.1
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-11 15:52:00 +0200
message:
fix -qa-tools' depends, no -gcj when building --without-java, fix comment, udate ooo-build
modified:
changelog
control
control.qa.in
rules
------------------------------------------------------------
revno: 1022.1.76
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-11 15:56:50 +0200
message:
update to m14; merge
modified:
changelog
control
control.qa.in
rules
------------------------------------------------------------
revno: 1022.1.77
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-11 15:57:49 +0200
message:
adapt for new libhyphen
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.78
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-11 16:27:07 +0200
message:
merge
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.2.2
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-11 16:25:06 +0200
message:
enable mozilla for armel
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.79
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-12 12:03:03 +0200
message:
merge
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.2.3
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-12 11:42:57 +0200
message:
MOZILLA=iceape
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.2.4
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-12 12:01:43 +0200
message:
armel doesn't have iceape yet...
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.80
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-05-13 11:22:36 +0200
message:
-1
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-05-13 11:20:38 +0000
+++ b/changelog 2008-05-13 14:32:52 +0000
@@ -40,16 +40,23 @@
-- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 01:24:21 +0200
-openoffice.org (1:2.4.0-6.7pre) unstable; urgency=low
+openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
+ * OpenOffice.org 2.4.1 snapshot OHO680_m14
* ooo-build:
- - update (r12455)
+ - update (r12510)
* debian/rules:
- - update for new xulrunner 1.9 packaging using iceape-dev
+ - update for new xulrunner 1.9 packaging using iceape-dev.
+ Use MOZILLA=iceape (closes: #480813)
+ - specify -Nopenoffice.org-gcj when building without Java
+ - remove extra dependency changing for libhyphen0, we now get a
+ dependeny on 2.4 "for free"; build-dep on libhyphen-dev (>= 2.4)
+ * debian/control.qa.in:
+ - fix -qa-tools' depends
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
section about odk/sdk_oo
- -- Rene Engelhard <rene@debian.org> Sun, 04 May 2008 15:06:11 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 11:38:39 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-13 12:34:55 +0000
+++ b/control 2008-05-13 14:32:52 +0000
@@ -3,7 +3,11 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
+<<<<<<< TREE
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils, 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, libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-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, libxrandr-dev , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , 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.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.3-3) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+=======
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils, 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, libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-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, libxrandr-dev , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , 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.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , 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 , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , 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 , libgtk2.0-dev (>= 2.10)
+>>>>>>> MERGE-SOURCE
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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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.7.2
XS-Python-Version: current
@@ -3029,7 +3033,7 @@
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
-Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}), openoffice.org-filter-so52, openoffice.org-java-common
+Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}), ${ooo-binfilter-dep}, ${java-common-depends}
Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
=== modified file 'control.qa.in'
--- a/control.qa.in 2008-02-08 13:23:13 +0000
+++ b/control.qa.in 2008-05-11 13:52:00 +0000
@@ -3,8 +3,8 @@
Priority: extra
Depends: ${shlibs:Depends},
openoffice.orgVER (>> ${base-version}),
- openoffice.orgVER-filter-so52,
- openoffice.orgVER-java-common
+ ${ooo-binfilter-dep},
+ ${java-common-depends}
Recommends: openoffice.orgVER-qa-api-tests,
openoffice.orgVER-qa-ui-tests
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
=== modified file 'rules'
--- a/rules 2008-05-13 13:33:06 +0000
+++ b/rules 2008-05-13 14:32:52 +0000
@@ -61,6 +61,11 @@
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-0
+ifeq "" "$(OOO_BUILD_BRANCH)"
+ OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
+else
+ OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/branches/$(OOO_BUILD_BRANCH)
+endif
SOURCE_TREE=ooo-build/build/$(TAG)
STAMP_DIR=debian/stampdir
@@ -94,7 +99,7 @@
SYSTEM_ALTLINUXHYPH=y
USE_LIBHYPHEN=y
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
-LIBHYPHEN_MINVER= (>= 2.3-3)
+LIBHYPHEN_MINVER= (>= 2.4)
USE_AGG=n
SYSTEM_AGG=n
USE_STLPORT=n
@@ -137,7 +142,7 @@
DBVER=4.6
NEONSONR=27
PARALLEL_BUILD=n
-MOZILLA=xulrunner
+MOZILLA=iceape
ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
@@ -224,6 +229,7 @@
USE_SYSTEM_ICU=n
USE_STLPORT=y
PACKAGE_WRITER2LATEX=y
+ MOZILLA=xulrunner
endif
#############
@@ -608,7 +614,7 @@
OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean -Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean -Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev -Nopenoffice.org$(VER)-gcj
endif
ifneq "$(MOZILLA)" ""
@@ -1270,6 +1276,8 @@
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
+
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
endif
@@ -2833,7 +2841,7 @@
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
# /usr/lib/libgcj-bc.so when specifying -l/usr/lib/$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
- # for -officebean (libjawt.so is there)
+ # for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
-l$(PKGDIR)-core/$(OODIR)/program \
@@ -2909,12 +2917,6 @@
debian/openoffice.org$(VER)-officebean/DEBIAN/control
endif
endif
-ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
- ifeq "$(USE_LIBHYPHEN)" "y"
- perl -pi -e "s/libhyphen0/libhyphen0 (>= 2.3.1-3)/" \
- debian/openoffice.org$(VER)-core/DEBIAN/control
- endif
-endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
@@ -3041,11 +3043,7 @@
# Get ooo-build
get-ooo-build:
-ifeq "" "$(OOO_BUILD_BRANCH)"
- svn co svn://svn.gnome.org/svn/ooo-build/trunk ooo-build
-else
- svn co svn://svn.gnome.org/svn/ooo-build/branches/$(OOO_BUILD_BRANCH) ooo-build
-endif
+ svn co $(OOO_BUILD_SVN) ooo-build
cd ooo-build && NOCONFIGURE=1 ./autogen.sh
# Download the latest sources needed for ooo-build. Note that is
Reply to: