------------------------------------------------------------
revno: 1092
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-05-19 22:49:56 +0200
message:
first bunch of install fixes, some changelog fixes
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
control
control.ure.in
openoffice.org-dtd-officedocument1.0.xmlcatalogs
openoffice.org-qa-tools.postrm.in
openoffice.org-qa-tools.preinst.in
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2007-07-26 00:29:49 +0000
+++ b/broffice.org.postrm.in 2008-05-19 20:49:56 +0000
@@ -9,8 +9,8 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop"
-DIVERSIONS="$DIVERSIONS /@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extensionmgr.desktop
/usr/share/applications/[EMAIL PROTECTED]@-startcenter.desktop"
+DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
@@ -19,7 +19,7 @@
dpkg-divert --package $THIS_PACKAGE --remove --rename --divert
$i.ooo $i
done
for i in $LANGPACKISOS; do
- dpkg-divert --package $THIS_PACKAGE --remove --rename --divert
/@OODIR@/program/resource/ooo680$i.res.ooo
/@OODIR@/program/resource/ooo680$i.res
+ dpkg-divert --package $THIS_PACKAGE --remove --rename --divert
/@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
done
fi
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2007-07-26 00:29:49 +0000
+++ b/broffice.org.preinst.in 2008-05-19 20:49:56 +0000
@@ -9,8 +9,8 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OODIR@/program/bootstraprc /@OODIR@/program/versionrc
/@OODIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extension.desktop
/usr/share/applications/[EMAIL PROTECTED]@-template.desktop"
-DIVERSIONS="$DIVERSIONS /@OODIR@/program/intro.bmp /@OODIR@/program/about.bmp"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.xcu
/usr/share/applications/[EMAIL PROTECTED]@-calc.desktop
/usr/share/applications/[EMAIL PROTECTED]@-writer.desktop
/usr/share/applications/[EMAIL PROTECTED]@-draw.desktop
/usr/share/applications/[EMAIL PROTECTED]@-base.desktop
/usr/share/applications/[EMAIL PROTECTED]@-impress.desktop
/usr/share/applications/[EMAIL PROTECTED]@-math.desktop
/usr/share/applications/[EMAIL PROTECTED]@-extensionmgr.desktop
/usr/share/applications/[EMAIL PROTECTED]@-startcenter.desktop"
+DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
@@ -20,7 +20,7 @@
dpkg-divert --package $THIS_PACKAGE --add --rename --divert
$i.ooo $i
done
for i in $LANGPACKISOS; do
- dpkg-divert --package $THIS_PACKAGE --add --rename --divert
/@OODIR@/program/resource/ooo680$i.res.ooo
/@OODIR@/program/resource/ooo680$i.res
+ dpkg-divert --package $THIS_PACKAGE --add --rename --divert
/@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
done
;;
esac
=== modified file 'changelog'
--- a/changelog 2008-05-19 08:19:28 +0000
+++ b/changelog 2008-05-19 20:49:56 +0000
@@ -3,8 +3,10 @@
* OpenOffice 3.0.0 development milestone 13 (DEV300_m13)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
+ - now properly complains about missing permissions when trying to write
+ to a read-only location (closes: #238906)
* ooo-build:
- - update (r12517)
+ - update (r12600)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -13,13 +15,17 @@
* debian/scripts/installoverrides: remove
* debian/rules:
- run dh_lintian
- - lots of updates for removed $UPD and changed locations
- - bump ant builddep ant (>= 1.7.0) to when we build the mediawiki
- extension
+ - lots of updates for removed $UPD and changed locations and the
+ "three-layer OOo" (of which we merge the layers in ooo-build)
+ - bump ant builddep to ant (>= 1.7.0) and additonally build-dep on
+ ant-optional when we build the mediawiki extension
- remove scsolver conditionals, not disableabe in Suns version.
Remove obsolete mvs
- support default-jdk-builddep, begin support of openjdk-6-jdk for
building, still default to java-gcj-compat-dev
+ - 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)
* 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
@@ -37,12 +43,15 @@
- package the new Presenter Screen, Wiki Publisher and PDF Import
extensions
- update/add Presentation Minimizer conditionals
+ * debian/broffice.org.{preinst,postrm}.in,
+ debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs,
+ - update
* debian/rules, debian/control.in: URE is now a part of the "tree-layer
office". Remove PACKAGE_URE conditionals and make -core depend on ure.
* debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 12 May 2008 01:24:21 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 19 May 2008 22:37:00 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-05-15 11:54:35 +0000
+++ b/control 2008-05-19 20:49:56 +0000
@@ -3,11 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-<<<<<<< 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-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-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
@@ -398,7 +394,7 @@
Package: openoffice.org-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno
+Depends: python, python-uno
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:3.0.0~)
Description: E-Mail Mailmerge component for OpenOffice.org
@@ -2977,6 +2973,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}
Recommends: java2-runtime
+Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
@@ -2991,7 +2988,7 @@
Section: devel
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: ${shlibs:Depends}, ure (= ${ure:Version})
+Depends: ure (= ${ure:Version})
Description: UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
@@ -3169,7 +3166,7 @@
* the current time and/or the elapsed time
* navigation buttons for going to the previous/next slide
-Package: openoffice.org-pdf-import
+Package: openoffice.org-pdfimport
Section: misc
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
@@ -3203,43 +3200,6 @@
This package contains the debug symbols of all OpenOffice.org and
OpenOffice.org SDK components.
-Package: openoffice.org-dev
-Section: devel
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${dev-stl-depends}
-Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends}
-Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
-Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org2-dev,
openoffice.org-java, openoffice.org-common (<< 2.0.2-3), openoffice.org-dev-doc
(<< 2.0.2-4)
-Conflicts: openoffice.org-debian-files, openoffice.org2-dev
-Provides: openoffice.org2-dev
-Description: OpenOffice.org SDK -- development files
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the files needed to build plugins/add-ons for
- OpenOffice.org (includes, IDL files, build tools, ...). It also contains
- the zipped source of the UNO Java libraries for use in IDEs like eclipse.
-
-Package: openoffice.org-dev-doc
-Section: doc
-Architecture: all
-Recommends: www-browser
-Suggests: g++, java2-compiler, openoffice.org-dtd-officedocument1.0
-Replaces: openoffice.org-dev (<< 2.1), openoffice.org2-dev-doc
-Provides: openoffice.org2-dev-doc
-Conflicts: openoffice.org2-dev-doc
-Description: OpenOffice.org SDK -- documentation
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the documentation of the OpenOffice.org SDK:
- .
- * C++/Java API reference
- * IDL reference
- * C++/Java/Basic examples
- .
- It also contains the gsicheck utility.
-
Package: openoffice.org-sdbc-postgresql
Section: misc
Priority: optional
=== modified file 'control.ure.in'
--- a/control.ure.in 2008-05-13 18:35:45 +0000
+++ b/control.ure.in 2008-05-19 20:49:56 +0000
@@ -3,6 +3,7 @@
Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends}
Recommends: java2-runtime
+Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of OpenOffice.org, packaged up as an individual product.
=== modified file 'openoffice.org-dtd-officedocument1.0.xmlcatalogs'
--- a/openoffice.org-dtd-officedocument1.0.xmlcatalogs 2006-08-17 14:26:35
+0000
+++ b/openoffice.org-dtd-officedocument1.0.xmlcatalogs 2008-05-19 20:49:56
+0000
@@ -1,2 +1,2 @@
-local;debian/openoffice.org-dtd-officedocument1.0/usr/lib/openoffice/share/dtd/officedocument/1_0/catalog.xml;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml
+local;debian/openoffice.org-dtd-officedocument1.0/usr/lib/openoffice/basis3.0/share/dtd/officedocument/1_0/catalog.xml;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml
root-and-package;public;-//OpenOffice.org//DTD OfficeDocument
1.0//EN;/usr/share/xml/openoffice.org-dtd-officedocument1.0/catalog.xml
=== modified file 'openoffice.org-qa-tools.postrm.in'
--- a/openoffice.org-qa-tools.postrm.in 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-qa-tools.postrm.in 2008-05-19 20:49:56 +0000
@@ -11,8 +11,8 @@
case "$1" in remove)
dpkg-divert --package $THIS_PACKAGE --remove --rename --divert \
- /usr/lib/openoffice/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/presets/basic/Standard/script.xlb
+
/usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb.no-smoketest \
+ /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb
;;
esac
=== modified file 'openoffice.org-qa-tools.preinst.in'
--- a/openoffice.org-qa-tools.preinst.in 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-qa-tools.preinst.in 2008-05-19 20:49:56 +0000
@@ -11,8 +11,8 @@
case "$1" in install|upgrade)
dpkg-divert --package $THIS_PACKAGE --add --rename --divert \
- /usr/lib/openoffice/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/presets/basic/Standard/script.xlb
+
/usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb.no-smoketest \
+ /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb
;;
esac
=== modified file 'rules'
--- a/rules 2008-05-15 11:54:35 +0000
+++ b/rules 2008-05-19 20:49:56 +0000
@@ -14,10 +14,16 @@
###################################################################################
#VER:=3
+OOVER:=3.0
SHELL:=/bin/bash
PKGDIR:=debian/openoffice.org$(VER)
OODIRNAME=openoffice$(VER)
-OODIR:=usr/lib/$(OODIRNAME)
+OOBASISDIR:=usr/lib/$(OODIRNAME)/basis$(OOVER)
+OOBRANDDIR:=usr/lib/openoffice
+OOUREDIR:=usr/lib/openoffice/ure
+OOSDKDIR:=usr/lib/openoffice/sdk
+# compatability
+OODIR:=$(OOBASISDIR)
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
@@ -130,7 +136,7 @@
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
USE_OOO_BUILD_DESKTOPS=n
-PACKAGE_SDK=y
+PACKAGE_SDK=n
RUN_SMOKETEST=n
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
@@ -1543,9 +1549,9 @@
# move resources which have been installed outside of common there
cd debian/tmp/pkg; \
- for i in `find . -name "*en-US.res" | grep -v common`; do \
- mv $$i
openoffice.org-common/$(OODIR)/program/resource/`basename $$i`; \
- done
+ cp -r openoffice.org-l10n-en-US/* \
+ openoffice.org-common && \
+ rm -rf openoffice.org-l10n-en-US
ifeq "$(ENABLE_JAVA)" "y"
# move officebean.jar into -officebean (They will be moved out of -core
@@ -1596,9 +1602,9 @@
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
# Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
- mkdir -p -m755 debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
- mv
debian/tmp/pkg/openoffice.org-common/$(OODIR)/share/xdg/qstart.desktop \
- debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
+ mkdir -p -m755
debian/tmp/pkg/openoffice.org-gnome/$(OOBRANDDIR)/share/xdg
+ mv
debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
+ debian/tmp/pkg/openoffice.org-gnome/$(OOBRANDDIR)/share/xdg
# move gengal stuff into -dev
mkdir -p debian/tmp/pkg/openoffice.org-dev/$(OODIR)/program
@@ -1645,11 +1651,12 @@
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
- echo "" >> $$MAINTSCRIPT; \
+ echo "" >> $$MAINTSCRIPT; \
cat debian/shell-lib.sh >> $$MAINTSCRIPT; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
perl -pi -e "s/[EMAIL PROTECTED]@/$(LANGPACKISOS)/"
$$MAINTSCRIPT; \
perl -pi -e "s,[EMAIL PROTECTED]@,$(OODIR),g" $$MAINTSCRIPT; \
+ perl -pi -e "s,[EMAIL PROTECTED]@,$(OOBRANDDIR),g" $$MAINTSCRIPT;
\
perl -pi -e "s/[EMAIL PROTECTED]@/$(VER)/g" $$MAINTSCRIPT; \
fi; \
done; \
@@ -1812,12 +1819,24 @@
rm -rf debian/ure debian/ure.*.debhelper ;\
cp -r --preserve=mode debian/tmp/pkg/ure debian/ure || exit 1
- # not needed
- rm -f debian/ure/usr/lib/ure/LICENSE
- rm -f debian/ure/usr/lib/ure/THIRDPARTYLICENSEREADME.html
- # should go into /usr/share/doc
- mkdir -p debian/ure/usr/share/doc/ure
- mv debian/ure/usr/lib/ure/README debian/ure/usr/share/doc/ure
+ # move URE Java stuff to /usr/share/java
+ mkdir -p debian/ure/usr/share/java/$(OODIRNAME)
+ mv debian/ure/$(OOUREDIR)/lib//JREProperties.class \
+ debian/ure/usr/share/java/$(OODIRNAME)
+ mv debian/ure/$(OOUREDIR)/share/java/* \
+ debian/ure/usr/share/java/$(OODIRNAME)
+ ln -sf /usr/share/java/$(OODIRNAME)/JREProperties.class \
+ debian/ure/$(OOUREDIR)/lib/JREProperties.class
+ cd debian/ure/$(OOUREDIR)/share/java && \
+ for i in
$(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/*.jar; do \
+ ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'`
`basename $$i`; \
+ done
+
+ # add MySQL, MaxDB and PostgreSQL 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|' \
+ debian/ure/$(OOUREDIR)/lib/jvmfwk3rc
rm -rf debian/mozilla-openoffice.org
debian/mozilla-openoffice.org.*.debhelper
rm -rf $(PKGDIR) $(PKGDIR).*.debhelper
@@ -1849,12 +1868,10 @@
rm -rf $(PKGDIR)-gtk
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mkdir -p -m755 $(PKGDIR)-gtk/$(OOBRANDDIR)/share
+ mv $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
$(PKGDIR)-gtk/$(OOBRANDDIR)/share
mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
$(PKGDIR)-gnome/$(OODIR)/program/
- mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-set-default-application \
- $(PKGDIR)-gnome/$(OODIR)/program/
mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
$(PKGDIR)-gnome/$(OODIR)/program
@@ -1993,7 +2010,7 @@
sed -i -e "s,Exec=openoffice.org$$PRODUCTVERSION,Exec=ooffice$(VER)," \
-e "s,Name=OpenOffice.org $$PRODUCTVERSION,Name=OpenOffice.org
$(VER)," \
-e "s/ / /" \
- $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ $(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
# we don't need the share/xdgs except qstart
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`;
do \
rm -f $$f; done
@@ -2054,9 +2071,8 @@
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
- chmod 755 debian/python-uno/$(OODIR)/program/mailmerge.py
perl -pi -e 's,/bin,/usr/bin,' \
- debian/python-uno/$(OODIR)/program/mailmerge.py
+ debian/openoffice.org-emailmerge/$(OODIR)/program/mailmerge.py
mkdir -p debian/python-uno/usr/share/doc/python-uno
for i in doc demo; do \
@@ -2157,8 +2173,8 @@
LIBGCC=`readlink `PATH=$(BUILD_PATH) gcc
--print-file-name=libgcc_s.so``; \
LIBSTDCPP_SOVER=`echo $$LIBSTDCPP | sed -e 's/.*\.//'`; \
LIBGCC_SOVER=`echo $$LIBGCC | sed -e 's/.*\.//'`; \
- cp $$LIBSTDCPP $(PKGDIR)-core/$(OODIR)/program; \
- cp $$LIBGCC $(PKGDIR)-core/$(OODIR)/program; \
+ cp $$LIBSTDCPP debian/ure/$(OOUREDIR)/lib; \
+ cp $$LIBGCC debian/ure/$(OOUREDIR)/lib; \
echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
@@ -2262,10 +2278,10 @@
# in 2.3 and the actual report builde as an extension, without which
# the *rpt* stuff is a no-op.
install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
-
$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
+
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/install/sun-report-builder.oxt
# unneeded license files
- for i in THIRDPARTYREADMELICENSE.html license_en-US.html
readme_en-US.html readme_en-US.txt; do \
- zip -d
$(CURDIR)/$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
$$i; \
+ for i in THIRDPARTYREADMELICENSE.html readme_en-US.html
readme_en-US.txt; do \
+ zip -d
$(CURDIR)/$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/install/sun-report-builder.oxt
$$i; \
done
endif
endif
@@ -2273,18 +2289,18 @@
ifeq "$(ENABLE_MINIMIZER)" "y"
rm -rf $(PKGDIR)-presentation-minimizer
install -D -m644 $(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/sun-presentation-minimizer.oxt \
-
$(PKGDIR)-presentation-minimizer/$(OODIR)/share/extension/install/sun-presentation-minimizer.oxt
+
$(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extension/install/sun-presentation-minimizer.oxt
endif
ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
rm -rf $(PKGDIR)-presenter-screen
install -D -m644 $(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/presenter-screen.oxt \
-
$(PKGDIR)-presenter-screen/$(OODIR)/share/extension/install/presenter-screen.oxt
+
$(PKGDIR)-presenter-screen/$(OOBRANDDIR)/share/extension/install/presenter-screen.oxt
endif
rm -rf $(PKGDIR)-sdbc-postgresql
install -D -m644 $(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep
^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk |
cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip \
-
$(PKGDIR)-sdbc-postgresql/$(OODIR)/share/extension/install/postgresql-sdbc-$(shell
grep ^PQ_SDBC_M
$(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"="
-f2 | xargs | sed -e s/\ /\./g).zip
+
$(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/install/postgresql-sdbc-$(shell
grep ^PQ_SDBC_M
$(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"="
-f2 | xargs | sed -e s/\ /\./g).zip
ifeq "$(ENABLE_OPENGL)" "y"
rm -rf $(PKGDIR)-ogltrans
@@ -2299,7 +2315,7 @@
ifeq "$(ENABLE_PDFIMPORT)" "y"
rm -rf $(PKGDIR)-pdfimport
install -D -m644 $(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/pdfimport.oxt \
-
$(PKGDIR)-pdfimport/$(OODIR)/share/extension/install/pdfimport.oxt
+
$(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extension/install/pdfimport.oxt
endif
for i in $(ARCH_DEP_PACKAGES); do \
@@ -2326,22 +2342,22 @@
rm -rf debian/broffice.org
mkdir -p debian/broffice.org/usr/bin
mkdir -p debian/broffice.org/usr/share/applications
- mkdir -p debian/broffice.org/usr/lib/openoffice/program/resource
- mkdir -p
debian/broffice.org/usr/lib/openoffice/share/registry/data/org/openoffice
- cat $(PKGDIR)-common/$(OODIR)/program/bootstraprc \
+ mkdir -p debian/broffice.org/$(OOBRANDDIR)/program/resource
+ mkdir -p
debian/broffice.org/$(OOBRANDDIR)/share/registry/data/org/openoffice
+ cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
| sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
- > debian/broffice.org/$(OODIR)/program/bootstraprc
- cat $(PKGDIR)-common/$(OODIR)/program/versionrc \
+ > debian/broffice.org/$(OOBRANDDIR)/program/bootstraprc
+ cat $(PKGDIR)-common/$(OOBRANDIR)/program/versionrc \
| sed -e "s/en-US/pt-BR/" | sed -e "s/openo/bro/" \
- > debian/broffice.org/$(OODIR)/program/versionrc
- cat
$(PKGDIR)-common/$(OODIR)/share/registry/data/org/openoffice/Setup.xcu \
+ > debian/broffice.org/$(OOBRANDDIR)/program/versionrc
+ cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup.xcu \
| sed -e "s/OpenO/BrO/" \
- >
debian/broffice.org/$(OODIR)/share/registry/data/org/openoffice/Setup.xcu
+ >
debian/broffice.org/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup.xcu
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo
$$iso | tr A-Z a-z`; fi; \
- cat $(PKGDIR)-$$p/$(OODIR)/program/resource/ooo$$iso.res \
+ cat $(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res \
| sed -e "s/OpenO/BrO/" \
- > debian/broffice.org/$(OODIR)/program/resource/ooo$$iso.res; \
+ >
debian/broffice.org/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
done
for i in startcenter writer calc draw impress math base; do \
cat $(PKGDIR)-$$i/usr/share/applications/ooo-$$i.desktop \
@@ -2357,14 +2373,14 @@
if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+";
then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
- debian/broffice.org/$(OODIR)/program/intro.bmp; \
+ debian/broffice.org/$(OOBRANDDIR)/program/intro.bmp; \
else \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/nologo_broffice/introabout/intro.bmp \
- debian/broffice.org/$(OODIR)/program/intro.bmp; \
+ debian/broffice.org/$(OOBRANDDIR)/program/intro.bmp; \
fi
install -m644
$(SOURCE_TREE)/ooo_custom_images/broffice/introabout/about.bmp \
- debian/broffice.org/$(OODIR)/program/about.bmp
+ debian/broffice.org/$(OOBRANDDIR)/program/about.bmp
cd debian/broffice.org/usr/bin && ln -s ooffice broffice
touch $@
@@ -2399,7 +2415,7 @@
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
- cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract
openoffice.org-debian-menus_*_all.deb . && cd usr/share/icons && \
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract
openoffice.org$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d ||
exit 1 ;\
done &&\
@@ -2460,13 +2476,11 @@
endif
ifeq "$(ENABLE_JAVA)" "y"
+ # move common Java stuff to -java-common
rm -rf $(PKGDIR)-java-common
- # move common Java stuff to -java-common
mkdir -p $(PKGDIR)-java-common/$(OODIR)/program/classes
mkdir -p $(PKGDIR)-java-common/$(OODIR)/share/Scripts
mkdir -p $(PKGDIR)-java-common/usr/share/java/$(OODIRNAME)
- mv $(PKGDIR)-common/$(OODIR)/program/JREProperties.class \
- $(PKGDIR)-java-common/$(OODIR)/program
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/java \
$(PKGDIR)-java-common/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/program/classes/* \
@@ -2509,13 +2523,16 @@
# move uno_packages/cache to /var and create symlink for for
# documentation referencing it...
- rm -rf $(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
+ rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/uno_packages/cache
mkdir -p $(PKGDIR)-common/var/spool/$(OODIRNAME)/uno_packages/cache
ln -s /var/spool/$(OODIRNAME)/uno_packages/cache \
- $(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
+ $(PKGDIR)-common/$(OOBRANDDIR)/share/uno_packages/cache
perl -pi -e \
's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/$(OODIRNAME)/uno_packages/cache,g'
\
$(PKGDIR)-common/$(OODIR)/program/unorc
+ # FIXME: What is this? unorc per default only mentiones
+ # share/uno_packages/cache...
+ rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
# install DicOOo; we need to do this manually; the
# dictionaries/ module isn't built with --without-myspell-dicts
@@ -2568,27 +2585,20 @@
endif
endif
# remove extra license files
- rm -rf $(PKGDIR)-commmon/$(OODIR)/licenses
- rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
- rm -f $(PKGDIR)-common/$(OODIR)/THIRDPARTYLICENSEREADME.html
- rm -f $(PKGDIR)-common/$(OODIR)/LICENSE.html
+ rm -rf $(PKGDIR)-commmon/$(OOBRANDDIR)/licenses
+ rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/LICENSE*
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/THIRDPARTYLICENSEREADME.html
+ rm -f $(PKGDIR)-common/$(OOBRANDIR)/LICENSE.html
# remove extra readme files
- rm -rf $(PKGDIR)-common/$(OODIR)/readmes
- rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/README*
+ rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/readmes
+ rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
# install Ximian desktop icons
mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
cp ooo-build/desktop/48x48/*.png \
$(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
- # add MySQL, MaxDB and PostgreSQL JDBC drivers to OOos CLASSPATH
- TMP=`mktemp -q`; \
- sed -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|' <
$(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc > $$TMP && \
- mv $$TMP $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc
-
# move psprint.conf into /etc
mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
mv $(PKGDIR)-common/$(OODIR)/share/psprint/psprint.conf \
@@ -2599,18 +2609,18 @@
# prepare a fake sofficerc in the place where OOo expects it
# which does nothing except reference the "normal" one
# which we put into /etc
- mv $(PKGDIR)-common/$(OODIR)/program/sofficerc \
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc \
$(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc
( \
echo "# *DO NOT* CHANGE THIS FILE. IT ONLY TAKES THE SETTINGS FROM"; \
echo "# /etc/$(OODIRNAME)/sofficerc. CHANGE THAT FILE IF YOU"; \
echo "# REALLY WANT TO CHANGE SOMETHING."; \
echo "FHS_CONFIG_FILE=file:///etc/$(OODIRNAME)/sofficerc"; \
- echo "" >> $(PKGDIR)-common/$(OODIR)/program/sofficerc; \
- ) > $(PKGDIR)-common/$(OODIR)/program/sofficerc
+ echo "" >> $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc; \
+ ) > $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc
cat $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc \
| perl -p -e
's/(.*)=(.*)/$$1=\$${\$$FHS_CONFIG_FILE:Bootstrap:$$1}/' \
- >> $(PKGDIR)-common/$(OODIR)/program/sofficerc
+ >> $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc
install -m 644 debian/soffice.sh \
$(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
@@ -2718,17 +2728,17 @@
ifneq "$(DIST)" "Ubuntu"
# ooo-build has a patch with this hardcoded.
- perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OODIR)/program/soffice
- perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OODIR)/program/soffice
- perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OODIR)/program/soffice
+ perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+ perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+ perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -rf $(PKGDIR)-wiki-publisher
install -D -m644 $(SOURCE_TREE)/swext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/wiki-publisher.oxt \
-
$(PKGDIR)-wiki-publisher/$(OODIR)/share/extension/install/wiki-publisher.oxt
+
$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/install/wiki-publisher.oxt
# unneeded license file
- zip -d
$(CURDIR)/$(PKGDIR)-wiki-publisher/$(OODIR)/share/extension/install/wiki-publisher.oxt
license/THIRDPARTYLICENSEREADME.html
+ zip -d
$(CURDIR)/$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/install/wiki-publisher.oxt
license/THIRDPARTYLICENSEREADME.html
endif
for i in $(ARCH_INDEP_DEP_PACKAGES); do \
@@ -2748,11 +2758,11 @@
if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+";
then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo/introabout/intro.bmp \
- $(PKGDIR)-common/$(OODIR)/program/intro.bmp; \
+ $(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
else \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/nologo/introabout/intro.bmp \
- $(PKGDIR)-common/$(OODIR)/program/intro.bmp; \
+ $(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
fi
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
@@ -2781,7 +2791,7 @@
done
dh_installdocs -A -Nlibmythes-dev debian/README.Debian \
- debian/tmp/pkg/openoffice.org-l10n-en-US/$(OODIR)/README
+ debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/README
dh_installdocs -plibmythes-dev debian/copyright
dh_installman -s
# fix manpage symlinks
@@ -2826,7 +2836,6 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -s -Nure -n -V -Xlibxmlsec
dh_makeshlibs -pure -n -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }'))"
dh_installdeb -s
ifneq "$(USE_SYSTEM_XMLSEC)" "y"
@@ -2842,44 +2851,47 @@
# /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 referenced there)
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
- -l$(PKGDIR)-core/$(OODIR)/program \
- -l$(PKGDIR)-base/$(OODIR)/program \
+ -Lure \
+
-ldebian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program
\
$(SHLIBS_OVERRIDE)
ifeq "$(ENABLE_JAVA)" "y"
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dh_shlibdeps -popenoffice.org$(VER)-officebean \
- -l$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
+ -Lure \
+
-ldebian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
endif
# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We
need to do
# it manually.
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
ifeq "$(ENABLE_MINIMIZER)" "y"
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program"
\
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/SunPresentationMinimizer.uno.so \
>
debian/openoffice.org$(VER)-presentation-minimizer.substvars
endif
ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program"
\
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/PresenterScreen.uno.so \
> debian/openoffice.org$(VER)-presenter-screen.substvars
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program"
\
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
+ -Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/bin/xpdfimport \
$(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so \
> debian/openoffice.org$(VER)-pdfimport.substvars
-
endif
-
ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -s -V
dh_clideps -s
@@ -2893,7 +2905,7 @@
-Nopenoffice.org$(VER)-presenter-screen \
-Nopenoffice.org$(VER)-pdfimport \
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
- -V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2` \
+ -V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
@@ -2990,7 +3002,7 @@
perl -pi -e 's,html/,html /,g'
debian/openoffice.org-dev-doc.doc-base.udk-common-ref
endif
dh_installdocs -A debian/README.Debian \
- debian/tmp/pkg/openoffice.org-l10n-en-US/$(OODIR)/README
+ debian/tmp/pkg/openoffice.org-common/$(OOBRANDDIR)/README
ifeq "$(PACKAGE_PCVSLIB)" "y"
dh_installexamples -plibpcvslib-perl \
$(SOURCE_TREE)/solenv/bin/modules/PCVSLib/samples/*
