./packages/openofficeorg/3.0/experimental r1093: merge
------------------------------------------------------------
revno: 1093
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-19 22:54:18 +0200
message:
merge
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.81
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-05-13 21:48:51 +0200
message:
switch to ooo-build-2-4-1 branch
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.82
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 00:27:11 +0200
message:
merge
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.2.5
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 00:25:12 +0200
message:
libsapdbc-java was removed, stop suggesting it
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.83
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 16:49:30 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.2.6
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 16:48:19 +0200
message:
if we don't suggest it anymore because it's removed we don't need to add it to the CLASSPATH either
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.84
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-05-17 22:48:35 +0200
message:
add get-orig-source target
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.85
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-19 11:36:40 +0200
message:
merge; regenerate control...
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.2.7
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-19 11:34:26 +0200
message:
missing build-dep on libnss3-dev
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-05-19 20:49:56 +0000
+++ b/changelog 2008-05-19 20:54:18 +0000
@@ -26,6 +26,7 @@
- move ure Java stuff to /usr/share/java and the URE itself to
/usr/lib/openoffice/ure (easier to maintain with the three-layer OOo)
- temporarily disable SDK package (until jsc21)
+ - update get-orig-source target for fixed hyph_en_US.dic
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -53,11 +54,24 @@
-- Rene Engelhard <rene@debian.org> Mon, 19 May 2008 22:37:00 +0200
+openoffice.org (1:2.4.1~ooh680m14-1.2pre) experimental; urgency=low
+
+ * ooo-build:
+ - use ooo-build-2-4-1 branch
+ - update (r12577)
+ * debian/control.in, debian/rules:
+ - libsapdbc-java was removed, stop suggesting it and adding it to OOos
+ CLASSPATH
+ * debian/rules:
+ - add get-orig-source target
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 May 2008 11:35:35 +0200
+
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
* OpenOffice.org 2.4.1 snapshot OHO680_m14
* ooo-build:
- - update (r12510)
+ - update (r12554)
* debian/rules:
- update for new xulrunner 1.9 packaging using iceape-dev.
Use MOZILLA=iceape (closes: #480813)
@@ -69,7 +83,7 @@
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
section about odk/sdk_oo
- -- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 11:38:39 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 15 May 2008 00:23:58 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-19 20:49:56 +0000
+++ b/control 2008-05-19 20:54:18 +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, 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], ant-optional (>= 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] , 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)
+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], ant-optional (>= 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] , iceape-dev (>= 1.1.9-5) [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.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)
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
@@ -222,7 +222,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
-Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj, openoffice.org-report-builder
+Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
Provides: openoffice.org2-base
@@ -243,11 +243,10 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libsapdbc-java: JDBC Drivers
+ * libmysql-java | libpg-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
- - MaxDB
Package: openoffice.org-style-crystal
Architecture: all
=== modified file 'control.in'
--- a/control.in 2008-05-15 11:54:35 +0000
+++ b/control.in 2008-05-19 20:54:18 +0000
@@ -434,7 +434,7 @@
${java-common-depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java | libsapdbc-java,
+ libmysql-java | libpg-java,
openoffice.orgVER-gcj,
openoffice.orgVER-report-builder
Replaces: openoffice.orgVER-core (<< 2.0.1),
@@ -464,11 +464,10 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libsapdbc-java: JDBC Drivers
+ * libmysql-java | libpg-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
- - MaxDB
Package: openoffice.orgVER-style-crystal
Architecture: all
=== modified file 'rules'
--- a/rules 2008-05-19 20:49:56 +0000
+++ b/rules 2008-05-19 20:54:18 +0000
@@ -27,7 +27,7 @@
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
+UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d":" -f2 | cut -d- -f1)
BASE_VERSION:=$(UPSTREAM_VERSION)
HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
#HELP_L10N_VIRTUAL_VERSION:=2.4
@@ -632,7 +632,7 @@
BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
else
ifeq "$(MOZILLA)" "iceape"
- BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)]
+ BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
else
BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
endif
@@ -1832,7 +1832,7 @@
ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'` `basename $$i`; \
done
- # add MySQL, MaxDB and PostgreSQL JDBC drivers to OOos CLASSPATH
+ # add MySQL, MaxDB and ssssssostgreSQL JDBC drivers to OOos CLASSPATH
sed -i -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/mysql.jar|' \
-e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/sapdbc.jar|' \
-e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/postgresql.jar|' \
@@ -3058,6 +3058,36 @@
svn co $(OOO_BUILD_SVN) ooo-build
cd ooo-build && NOCONFIGURE=1 ./autogen.sh
+# FIXME: works for milestones only...
+get-orig-source:
+ if test -n "$$TMP"; then TMPD=`mktemp -d -p $$TMP`; else \
+ TMPD=`mktemp -d`; fi && \
+ cd $$TMPD && mkdir -p openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
+ cd openoffice.org-$(UPSTREAM_VERSION)/ooo-build/src && \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-core.tar.bz2 && \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-binfilter.tar.bz2 && \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-lang.tar.bz2 && \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-system.tar.bz2 && \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-sdk_oo.tar.bz2 && \
+ tar xfvj $(TAG)-core.tar.bz2 && \
+ rm -rf $(TAG)/external/jars && \
+ rm -rf $(TAG)/xalan && \
+ rm $(TAG)/smoketestoo_native/statjars/README.jfreechart && \
+ rm $(TAG)/smoketestoo_native/statjars/*.jar && \
+ for i in `find $(TAG)/psprint_config/configuration/ppds ! -name "SGEN*" -name "*.PS"`; do \
+ rm $$i; \
+ done && \
+ tar cfvj $(TAG)-core.tar.bz2.dfsg $(TAG) && ln -sf $(TAG)-core.tar.bz2.dfsg $(TAG)-core.tar.bz2 && rm -rf $(TAG) && \
+ tar xfvj $(TAG)-system.tar.bz2 && \
+ for i in da_DK en_GB nl_NL ru_RU; do \
+ rm $(TAG)/dictionaries/$$i/hyph_$${i}.dic; \
+ done && \
+ rm $(TAG)/bitstream_vera_fonts/download/liberation-fonts.zip && \
+ tar cfvj $(TAG)-system.tar.bz2.dfsg $(TAG) && ln -sf $(TAG)-system.tar.bz2.dfsg $(TAG)-system.tar.bz2 && rm -rf $(TAG) && \
+ 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)/..
+
# Download the latest sources needed for ooo-build. Note that is
# might download more than actually needed here....
download: ooo-build/config.status
Reply to: