./packages/openofficeorg/2.4/experimental r1013: OOH680_m8; update ooo-build; some etch backport fixes; remove obsolete libstartup-notification0-dev builddep
------------------------------------------------------------
revno: 1013
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-02-28 21:09:08 +0100
message:
OOH680_m8; update ooo-build; some etch backport fixes; remove obsolete libstartup-notification0-dev builddep
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-02-26 07:45:31 +0000
+++ b/changelog 2008-02-28 20:09:08 +0000
@@ -1,3 +1,19 @@
+openoffice.org (1:2.4.0~rc2-0.1pre) unstable; urgency=low
+
+ * OpenOffice.org 2.4.0 rc2 (aka OOH680_m8)
+ - fixes printing of control elements (closes: #467168)
+ * ooo-build:
+ - update (r11747)
+ * debian/rules, debian/control.ure.in:
+ - introduce ure:Version variable (closes: #466932)
+ * debian/rules:
+ - fix self-reference of GCJ_JAWT_DEPENDS on etch-backports
+ (closes: #466932)
+ * debian/control.in:
+ - remove obsolete libstartup-notification0-dev builddep
+
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Feb 2008 20:56:31 +0100
+
openoffice.org (1:2.4.0~rc1-3) unstable; urgency=low
* ooo-build:
@@ -16,7 +32,7 @@
- build with libdb4.6 (closes: #464754)
- add symlink /usr/share/doc/openoffice.org-dev/index.html ->
/usr/lib/openoffice/sdk/index.html. Is the other way around like
- the submitter suggested but still closes: #420803 AFAIS.
+ the submitter suggested but still closes: #420804 AFAIS.
Replace non-working link to license.html with link to
http://www.gnu.org/licenses/lgpl.html
- openoffice$(VER) -> $(OODIRNAME)
=== modified file 'control'
--- a/control 2008-02-26 07:45:31 +0000
+++ b/control 2008-02-28 20:09:08 +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 mips mipsel arm armel amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , 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] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , 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] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel arm amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64]
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, 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
=== modified file 'control.in'
--- a/control.in 2008-02-19 17:55:48 +0000
+++ b/control.in 2008-02-28 20:09:08 +0000
@@ -29,7 +29,6 @@
libxrender-dev [%OOO_ARCHS%],
libcupsys2-dev [%OOO_ARCHS%],
libarchive-zip-perl [%OOO_ARCHS%],
- libstartup-notification0-dev [%OOO_ARCHS%],
libpng12-dev [%OOO_ARCHS%],
libjpeg62-dev [%OOO_ARCHS%],
libxml2-dev [%OOO_ARCHS%],
=== modified file 'rules'
--- a/rules 2008-02-26 07:45:31 +0000
+++ b/rules 2008-02-28 20:09:08 +0000
@@ -58,17 +58,17 @@
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
# For SRC680 milestones, use only ~mX
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)
-MILESTONE=m7
-TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-#TAG=$(MWS)_$(MILESTONE)
+MILESTONE=m8
+#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
+TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-2-4
SOURCE_TREE=ooo-build/build/$(TAG)
STAMP_DIR=debian/stampdir
-CORE_TARBALL=$(TAG)-core.tar.bz2
-SYSTEM_TARBALL=$(TAG)-system.tar.bz2
-#CORE_TARBALL=OOo_2.4.0_src_core.tar.bz2
-#SYSTEM_TARBALL=OOo_2.4.0_src_system.tar.bz2
+#CORE_TARBALL=$(TAG)-core.tar.bz2
+#SYSTEM_TARBALL=$(TAG)-system.tar.bz2
+CORE_TARBALL=OOo_2.4.0_src_core.tar.bz2
+SYSTEM_TARBALL=OOo_2.4.0_src_system.tar.bz2
ifeq "$(DISTREL)" "etch"
ETCH_BACKPORT=y
@@ -519,10 +519,11 @@
SYSTEM_XALAN=y
SYSTEM_XERCES=y
SYSTEM_XML_APIS=y
+ifneq "$(ETCH_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
+else
# workaround for etch; etch only has libgcj7-awt
-ifeq "$(ETCH_BACKPORT)" "y"
- GCJ_JAWT_DEPENDS= $(shell echo $(GCJ_JAWT_DEPENDS) | sed -e s/-0//)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/ | sed -e s/-0//)
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = java-gcj-compat
@@ -2907,6 +2908,7 @@
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
ifeq "$(PACKAGE_URE)" "y"
dh_gencontrol -pure -pure-dbg -- \
+ -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$(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`
endif
dh_md5sums -s
Reply to: