r795 ./packages/openofficeorg/2.2.1/unstable: -8 (better late than never)
------------------------------------------------------------
revno: 795
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-28 00:35:13 +0200
message:
-8 (better late than never)
modified:
changelog
control
control.in
control.sdk.in
openoffice.org-base.overrides.lintian
openoffice.org-calc.overrides.lintian
openoffice.org-draw.overrides.lintian
openoffice.org-gtk.overrides.lintian
openoffice.org-impress.overrides.lintian
openoffice.org-math.overrides.lintian
openoffice.org-writer.overrides.lintian
rules
template.desktop.in
=== modified file 'changelog'
--- a/changelog 2007-07-30 21:01:50 +0000
+++ b/changelog 2007-08-27 22:35:13 +0000
@@ -1,3 +1,36 @@
+openoffice.org (2.2.1-8) unstable; urgency=medium
+
+ * ooo-build:
+ - update (r10110
+ - ooo59127.vcl.honourcairofont.diff: fix for gdk hang. [CC]
+ (closes: #433870)
+ - cairo-canvas-ppc-fix.diff: fix endianness to fix yellow color in
+ presentation mode under cairo (closes: #339439)
+ * merge from 2.3 branch:
+ - debian/control.in:
+ + build-conflict against gjdoc (= 0.7.8-2)
+ + make the openoffice.org metapackage depend on openoffice.org-officebean
+ as the officebean is a "standard part of the office"
+ + fix -devs description; Xmerge Javadoc is not there for now, mention
+ gsicheck instead
+ + fix X-KDE-Protocols addition to not add it a second, third etc. time on
+ incremental builds
+ + remove version from java-common-depends since it is substituted
+ - debian/rules:
+ + use system-libwpg
+ + remove debian/libuno-cil.installcligac in clean
+ + fix testtoolrc (non)installation
+ + fix control target dependencies
+ - debian/rules, debian/overrides.lintian:
+ + fix or override (package depends on package containing the file)
+ lintians new desktop warnings
+ + remove share/xdgs .desktop files (except qstart.desktop), not
+ needed
+ * merge from Ubuntu:
+ - fix JAWT_DEPENDS for new gcj-4.2
+
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Aug 2007 00:24:00 +0200
+
openoffice.org (2.2.1-7) unstable; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2007-07-27 10:50:19 +0000
+++ b/control 2007-08-27 22:35:13 +0000
@@ -3,15 +3,15 @@
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) [i386 powerpc sparc amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64], sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64], libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386 powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev [i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64], libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386 powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386 powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386 powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64] , libsuitesparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64], sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64], libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386 powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev [i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64], libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386 powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386 powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386 powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc sparc amd64] , libwpg-dev [i386 powerpc sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64] , libsuitesparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
Standards-Version: 3.7.2
XS-Python-Version: current
Package: openoffice.org
Architecture: i386 powerpc sparc amd64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
-Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, openoffice.org-officebean, java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-officebean, ${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -201,7 +201,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc amd64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij | java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends}, ${java-common-depends} (>> 2.2.0-4)
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij | java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends}, ${java-common-depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj
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)
@@ -381,7 +381,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc amd64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${jawt-depends}, ${java-common-depends} (>> 2.2.0-4)
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${jawt-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -3203,7 +3203,7 @@
* IDL reference
* C++/Java/Basic examples
.
- It also contains the Javadoc of the XMerge API.
+ It also contains the gsicheck utility.
.
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
=== modified file 'control.in'
--- a/control.in 2007-07-27 10:50:19 +0000
+++ b/control.in 2007-08-27 22:35:13 +0000
@@ -49,7 +49,7 @@
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
libdb4.4-dev [%OOO_ARCHS%]
%BUILD_DEPS%
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -62,6 +62,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
+ openoffice.orgVER-officebean,
${ooo-binfilter-dep},
openoffice.orgVER-filter-mobiledev,
${java-common-depends}
@@ -81,7 +82,6 @@
msttcorefonts,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
- openoffice.orgVER-officebean,
java-gcj-compat | j2re1.4 | java2-runtime,
openclipart-openoffice.org,
pstoedit,
@@ -408,7 +408,7 @@
${shlibs:Depends},
gij | java-gcj-compat | j2re1.4 | java2-runtime,
${base-hsqldb-depends},
- ${java-common-depends} (>> 2.2.0-4)
+ ${java-common-depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libsapdbc-java,
@@ -615,7 +615,7 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
${jawt-depends},
- ${java-common-depends} (>> 2.2.0-4)
+ ${java-common-depends}
Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
=== modified file 'control.sdk.in'
--- a/control.sdk.in 2007-06-28 09:42:00 +0000
+++ b/control.sdk.in 2007-08-27 22:35:13 +0000
@@ -50,7 +50,7 @@
* IDL reference
* C++/Java/Basic examples
.
- It also contains the Javadoc of the XMerge API.
+ It also contains the gsicheck utility.
.
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
=== modified file 'openoffice.org-base.overrides.lintian'
--- a/openoffice.org-base.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-base.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-base: binary-or-shlib-defines-rpath
openoffice.org-base: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-base:4
+openoffice.org-base: desktop-command-not-in-package ./usr/share/applications/ooo-base.desktop ooffice
=== modified file 'openoffice.org-calc.overrides.lintian'
--- a/openoffice.org-calc.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-calc.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
openoffice.org-calc: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-calc.xpm
openoffice.org-calc: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-calc:5
+openoffice.org-calc: desktop-command-not-in-package ./usr/share/applications/ooo-calc.desktop ooffice
=== modified file 'openoffice.org-draw.overrides.lintian'
--- a/openoffice.org-draw.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-draw.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
openoffice.org-draw: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-draw.xpm
openoffice.org-draw: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-draw:5
+openoffice.org-draw: desktop-command-not-in-package ./usr/share/applications/ooo-draw.desktop ooffice
=== modified file 'openoffice.org-gtk.overrides.lintian'
--- a/openoffice.org-gtk.overrides.lintian 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-gtk.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,1 +1,2 @@
openoffice.org-gtk: binary-or-shlib-defines-rpath
+openoffice.org-gtk: desktop-command-not-in-package ./usr/lib/openoffice/share/xdg/qstart.desktop ooffice
=== modified file 'openoffice.org-impress.overrides.lintian'
--- a/openoffice.org-impress.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-impress.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
openoffice.org-impress: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-impress.xpm
openoffice.org-impress: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-impress:5
+openoffice.org-impress: desktop-command-not-in-package ./usr/share/applications/ooo-impress.desktop ooffice
=== modified file 'openoffice.org-math.overrides.lintian'
--- a/openoffice.org-math.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-math.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-math: binary-or-shlib-defines-rpath
openoffice.org-math: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-math.xpm
openoffice.org-math: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-math:5
+openoffice.org-math: desktop-command-not-in-package ./usr/share/applications/ooo-math.desktop ooffice
=== modified file 'openoffice.org-writer.overrides.lintian'
--- a/openoffice.org-writer.overrides.lintian 2007-07-18 08:32:00 +0000
+++ b/openoffice.org-writer.overrides.lintian 2007-08-27 22:35:13 +0000
@@ -1,3 +1,4 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
openoffice.org-writer: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg22-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-writer:5
+openoffice.org-writer: desktop-command-not-in-package ./usr/share/applications/ooo-writer.desktop ooffice
=== modified file 'rules'
--- a/rules 2007-07-30 21:01:50 +0000
+++ b/rules 2007-08-27 22:35:13 +0000
@@ -104,7 +104,7 @@
USE_LIBXSLT=y
USE_EXTERNAL_MYTHES=n
USE_SYSTEM_ICU=y
-USE_SYSTEM_LIBWPG=n
+USE_SYSTEM_LIBWPG=y
USE_SYSTEM_LIBWPS=y
USE_SYSTEM_XMLSEC=n
BUILD_CAIROCANVAS=y
@@ -191,6 +191,7 @@
LPSOLVE_MIN_VERSION=
USE_LIBCURL4=n
USE_LIBSUITESPARSE=n
+ USE_SYSTEM_LIBWPG=n
endif
#############
@@ -349,7 +350,7 @@
JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
else
ifeq "$(GCJ_VERSION)" "4.2"
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-0-awt
+ JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
else
JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
endif
@@ -844,6 +845,7 @@
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
+ rm -f debian/libuno-cil.installcligac
ifeq "$(ENABLE_MONO)" "y"
rm -rf $(MONO_SHARED_DIR)/.wapi
@@ -864,7 +866,7 @@
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
control: debian/control
-debian/control: debian/control.in debian/control.lang.in debian/control.help.in ooo-build/bin/openoffice-xlate-lang debian/rules
+debian/control: debian/control.in debian/control.lang.in debian/control.help.in debian/control.fonts.in debian/control.sdk.in debian/control.mozilla.in debian/control.gcj.in debian/control.gcj.in debian/control.mono.in debian/control.qa.in ooo-build/bin/openoffice-xlate-lang debian/rules
chmod 755 ooo-build/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
@@ -1270,11 +1272,10 @@
cd debian/tmp/pkg; \
mv openoffice.org-common/$(OODIR)/program/testtoolrc \
openoffice.org-core/$(OODIR)/program
+endif
# remove eventually sneaked in .testtoolrc
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
-
-endif
ifeq "$(PACKAGE_QUICKSTART)" "y"
# ooqstart should go into -core; we have just a glib dependency
@@ -1556,10 +1557,8 @@
mv $(PKGDIR)-core/$(OODIR)/program/slideshow.uno.so \
$(PKGDIR)-impress/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-base/$(OODIR)/program
- for i in dba; do \
- mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
- $(PKGDIR)-base/$(OODIR)/program; \
- done
+ mv $(PKGDIR)-core/$(OODIR)/program/libdba* \
+ $(PKGDIR)-base/$(OODIR)/program
for i in odbcbase2 dbpool2 jdbc2 odbc2 sdbc2 mysql2 adabas2; do \
mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
$(PKGDIR)-base/$(OODIR)/program; \
@@ -1645,7 +1644,7 @@
rm -f $(PKGDIR)-core/$(OODIR)/program/testtool.bin
rm -f $(PKGDIR)-core/$(OODIR)/program/libcommuni*
rm -f $(PKGDIR)-core/$(OODIR)/program/libsimplecm*
- rm -f $(PKGDIR)-core/$(OODIR)/program/testtoolrc
+ rm -f $(PKGDIR)-common/$(OODIR)/program/testtoolrc
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
@@ -1673,16 +1672,24 @@
-e "s,Name=OpenOffice.org $$PRODUCTVERSION,Name=OpenOffice.org $(VER)," \
-e "s/ / /" \
$(PKGDIR)-gtk/$(OODIR)/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
for f in `find debian -name '*.desktop'`; do \
sed -i -e '/^Comment\[de\]/s/- *\([a-zA-Z0-9]*\) *macht.*glich.*$$/mit \1/' $$f; \
- echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
+ if ! grep -q X-KDE-Protocols $$f; then \
+ echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
+ fi; \
done
sed -i -e '/^MimeType/s,text/rtf,text/rtf;application/rtf,' \
$(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
sed -i -e 's/Office;/Office;System;/' $(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
- #mv $(PKGDIR)-base/usr/share/applications/ooo$(VER)-base.desktop $(PKGDIR)-core/usr/share/applications
- #rm -r $(PKGDIR)-base
+ # invalid, according to lintian. make it shut up.
+ for i in writer calc impress draw math base extension; do \
+ perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+ done
+ perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
else
# menu files from ooo-build/desktop
for p in writer calc impress draw math base; do \
@@ -2214,7 +2221,7 @@
set -e; \
for z in images.zip images_industrial.zip images_crystal.zip images_hicontrast.zip\
images_tango.zip; do \
- echo "repackaging $$z..."; \
+ echo "adding helpimgs to $$z..."; \
rm -rf $$z; mkdir $$z; \
cd $$z; \
unzip -q $(CURDIR)/$(PKGDIR)-common/$(OODIR)/share/config/$$z && \
=== modified file 'template.desktop.in'
--- a/template.desktop.in 2007-04-23 12:19:01 +0000
+++ b/template.desktop.in 2007-08-27 22:35:13 +0000
@@ -7,5 +7,5 @@
Icon=ooo-template.png
Terminal=false
Type=Application
-Categories=GNOME;Application;Office;X-Ximian-Main;
+Categories=Office
StartupNotify=true
Reply to: