r788 ./packages/openofficeorg/2.3/experimental: merge 2.2.1-6
------------------------------------------------------------
revno: 788
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-07-18 22:45:28 +0200
message:
merge 2.2.1-6
modified:
changelog
control
openoffice.org-base.overrides.lintian
openoffice.org-calc.overrides.lintian
openoffice.org-draw.overrides.lintian
openoffice.org-impress.overrides.lintian
openoffice.org-math.overrides.lintian
openoffice.org-writer.menu
openoffice.org-writer.overrides.lintian
rules
------------------------------------------------------------
revno: 772.1.7
merged: rene@debian.org-20070710085737-ac8c7b356fdfb344
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-07-10 10:57:37 +0200
message:
merge menu fixes from 2.3 branch
------------------------------------------------------------
revno: 772.1.8
merged: rene@debian.org-20070712093436-4ef1cb4fba10c8c2
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2007-07-12 11:34:36 +0200
message:
rules fixes; disable xmerge javadoc install again
------------------------------------------------------------
revno: 772.1.9
merged: rene@debian.org-20070712100024-6bb40975e0512fd1
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2007-07-12 12:00:24 +0200
message:
here, too
------------------------------------------------------------
revno: 772.1.10
merged: rene@debian.org-20070717144853-9501ad453959963c
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-07-17 16:48:53 +0200
message:
ooo-build update; build against libsuitesparse
------------------------------------------------------------
revno: 772.1.11
merged: rene@debian.org-20070718083200-0654cd02515811fd
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-07-18 10:32:00 +0200
message:
update lintian overrides
------------------------------------------------------------
revno: 772.1.12
merged: rene@debian.org-20070718203441-7e03a0501a2ab48c
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-07-18 22:34:41 +0200
message:
-6
=== modified file 'changelog'
--- a/changelog 2007-07-18 13:58:04 +0000
+++ b/changelog 2007-07-18 20:45:28 +0000
@@ -20,15 +20,34 @@
- build-depend on libxml-parser-perl
- Add XS-Vcs-{Bzr,Svn} fields
- we need to build-depend on dmake (>= 1:4.7)
+ * debian/*.menu, debian/*.overrides.lintian:
+ - update for 2.3
+ * ooo-build:
+ - use trunk again
+ - update (r9860)
+ * debian/README.Debian-source: update
+
+ -- Rene Engelhard <rene@debian.org> Wed, 18 Jul 2007 15:55:22 +0200
+
+openoffice.org (2.2.1-6) unstable; urgency=low
+
+ * ooo-build:
+ - update (r9849)
* debian/*.menu:
- adapt to the new menu sections
- fix icon=
- * ooo-build:
- - use trunk again
- - update (r9860)
- * debian/README.Debian-source: update
+ * debian/openoffice.org-*.overrides.lintian:
+ - update overrides for menu icons
+ * debian/rules:
+ - fix order in USE_LIBCURL4
+ - fix setting of path for the ICU utils, thanks calc
+ - (temporarily) stop install xmerge javadoc as its build broke with ant
+ 1.7.0. Fixes FTBFS because files were tried to be installed which aren't
+ there (the ant step doesn't fail...)
+ - build against lp-solve (>= 5.5.0.10-4) and libsuitesparse
+ (closes: #433486)
- -- Rene Engelhard <rene@debian.org> Wed, 18 Jul 2007 15:55:22 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 18 Jul 2007 10:28:49 +0200
openoffice.org (2.2.1-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-18 13:58:04 +0000
+++ b/control 2007-07-18 20:45:28 +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) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl3-gnutls-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64] , libufsparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], imagemagick [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libdb4.4-dev [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , libdb4.4-java [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu36-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon26-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'openoffice.org-base.overrides.lintian'
--- a/openoffice.org-base.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-base.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-base: binary-or-shlib-defines-rpath
-openoffice.org-base: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-base.xpm
+openoffice.org-base: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-base:4
=== modified file 'openoffice.org-calc.overrides.lintian'
--- a/openoffice.org-calc.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-calc.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
-openoffice.org-calc: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-calc.xpm
+openoffice.org-calc: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-calc.xpm
openoffice.org-calc: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-calc:5
=== modified file 'openoffice.org-draw.overrides.lintian'
--- a/openoffice.org-draw.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-draw.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
-openoffice.org-draw: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-draw.xpm
+openoffice.org-draw: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-draw.xpm
openoffice.org-draw: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-draw:5
=== modified file 'openoffice.org-impress.overrides.lintian'
--- a/openoffice.org-impress.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-impress.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
-openoffice.org-impress: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-impress.xpm
+openoffice.org-impress: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-impress.xpm
openoffice.org-impress: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-impress:5
=== modified file 'openoffice.org-math.overrides.lintian'
--- a/openoffice.org-math.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-math.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-math: binary-or-shlib-defines-rpath
-openoffice.org-math: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-math.xpm
+openoffice.org-math: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-math.xpm
openoffice.org-math: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-math:5
=== modified file 'openoffice.org-writer.menu'
--- a/openoffice.org-writer.menu 2007-07-10 08:49:09 +0000
+++ b/openoffice.org-writer.menu 2007-07-18 20:45:28 +0000
@@ -3,3 +3,4 @@
hints="Word Processors"\
kderemove="y"\
icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-writer.xpm"
+
=== modified file 'openoffice.org-writer.overrides.lintian'
--- a/openoffice.org-writer.overrides.lintian 2006-12-02 00:58:22 +0000
+++ b/openoffice.org-writer.overrides.lintian 2007-07-18 20:45:28 +0000
@@ -1,3 +1,3 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
-openoffice.org-writer: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg-21-writer.xpm
+openoffice.org-writer: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg23-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-writer:5
=== modified file 'rules'
--- a/rules 2007-07-18 08:50:12 +0000
+++ b/rules 2007-07-18 20:45:28 +0000
@@ -121,7 +121,7 @@
KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
-LPSOLVE_MIN_VERSION= (>= 5.5.0.10-2)
+LPSOLVE_MIN_VERSION= (>= 5.5.0.10-4)
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
@@ -257,9 +257,9 @@
endif
ifeq "$(USE_LIBCURL4)" "y"
+ BUILD_DEPS += , libcurl4-gnutls-dev [$(OOO_ARCHS)]
+else
BUILD_DEPS += , libcurl3-gnutls-dev [$(OOO_ARCHS)]
-else
- BUILD_DEPS += , libcurl4-gnutls-dev [$(OOO_ARCHS)]
endif
ifneq "$(BUILD_DBG_PACKAGE)" "y"
@@ -517,7 +517,7 @@
BUILD_DEPS += , libicu36-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-icu
# ICU utils are in /usr/sbin (!)
- PATH+=:/usr/sbin
+ PATH := $(PATH):/usr/sbin
endif
ifeq "$(USE_LIBXSLT)" "y"
@@ -588,8 +588,8 @@
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
endif
CONFIGURE_FLAGS += --with-system-lpsolve
- DBG_DBG_SUGGESTS+= , libufsparse-dbg
- BUILD_DEPS += , libufsparse-dev [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
+ BUILD_DEPS += , libsuitesparse-dev [$(OOO_ARCHS)]
endif
ifeq "$(USE_DBUS)" "y"
@@ -2063,13 +2063,6 @@
perl -pi -e 's,file:$(CURDIR)/ooo-build/build/(current|$(TAG))/odk/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
done
-ifeq "$(ENABLE_JAVA)" "y"
- rm -rf $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
- mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
- # install XMerge SDK javadoc
- cp -r $(SOURCE_TREE)/xmerge/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/class/javadoc/* \
- $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
-endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -2482,9 +2475,6 @@
# since it doesn't affect the files at the end of the lines...
# But fix it..
perl -pi -e 's,html/,html /,g' debian/openoffice.org-dev-doc.doc-base.udk-common-ref
- XMERGE_FILES=`find $(CURDIR)/debian/openoffice.org-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge | sed -e 's,$(CURDIR)/debian/openoffice.org-dev-doc,,g' | xargs`; \
- cp debian/xmerge-javadoc.in debian/openoffice.org-dev-doc.doc-base.xmerge-javadoc; \
- echo "Files: $$XMERGE_FILES" >> debian/openoffice.org-dev-doc.doc-base.xmerge-javadoc
# remove Autodoc_DiagnosticMessages.txt from doc-base files
for i in common cpp; do \
perl -pi -e "s,/usr/share/doc/openoffice.org-dev/docs/$$i/ref/Autodoc_DiagnosticMessages.txt ,," debian/openoffice.org-dev-doc.doc-base.udk-$$i-ref; \
Reply to: