./packages/openofficeorg/3.0/experimental r1069: merge
------------------------------------------------------------
revno: 1069
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-05-06 12:11:26 +0200
message:
merge
modified:
changelog
control
control.in
copyright
rules
------------------------------------------------------------
revno: 1022.1.66
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-30 11:06:02 +0200
message:
depend on ttf-dejavu
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.67
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-04-30 14:52:42 +0200
message:
* debian/control.in, debian/rules:
- remove the "build libmythes-dev only" option as OOo is now enabled
on all important archs. Remove the now unndeeded arch specifiers
on builddeps. Hopefully makes mips(el) parse the builddep line again
without segfault...
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.68
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-04-30 23:04:52 +0200
message:
merge changes for XRandR from 3.0 tree
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.69
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-05-03 14:51:02 +0200
message:
-6
modified:
changelog
------------------------------------------------------------
revno: 1022.1.70
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-04 00:18:43 +0200
message:
update for new xulrunner 1.9 packaging using iceape-dev
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.71
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-04 14:58:12 +0200
message:
fix "Obtained from"
modified:
changelog
copyright
------------------------------------------------------------
revno: 1022.1.72
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-05-04 15:11:33 +0200
message:
mention go-oo.org, remove obsolete section about odk/sdk_oo
modified:
changelog
copyright
------------------------------------------------------------
revno: 1022.1.73
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-05 02:37:12 +0200
message:
fix Vcs-Svn:, make it a generated field
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.74
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-05 02:45:39 +0200
message:
move ooo-build repository URL up, introduce variable and use it for control and get-ooo-build
modified:
rules
=== modified file 'changelog'
--- a/changelog 2008-05-06 09:50:18 +0000
+++ b/changelog 2008-05-06 10:11:26 +0000
@@ -33,24 +33,31 @@
- package the new Presenter Screen, Wiki Publisher and PDF Import
extensions
- update/add Presentation Minimizer conditionals
- * debian/control.in:
- - make impress recommend libxrandr2 as OOo now can detect size
- chages through it
- - build-depend against libxrandr-dev
* 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
+ * debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
-- Rene Engelhard <rene@debian.org> Tue, 06 May 2008 10:41:35 +0200
-openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
-
- * ooo-build:
- - update (r12325 - 2.4.0.8)
+openoffice.org (1:2.4.0-6.7pre) unstable; urgency=low
+
+ * ooo-build:
+ - update (r12455)
+ * debian/rules:
+ - update for new xulrunner 1.9 packaging using iceape-dev
+ * debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
+ section about odk/sdk_oo
+
+ -- Rene Engelhard <rene@debian.org> Sun, 04 May 2008 15:06:11 +0200
+
+openoffice.org (1:2.4.0-6) unstable; urgency=low
+
+ * ooo-build:
+ - update (r12409)
* debian/rules:
- fix debian/rules to add archs to OOO_SCSOLVER_ARCHS when they build OOo
- to not get usless build-deps there
+ to not get useless build-deps there
- support xulrunner 1.9
- fix java-gcj-compat-dev build-depends conditional logic to set the
right versioned build-dep for !etch
@@ -59,9 +66,21 @@
disabling java (-> arm(el)). Only depend on openoffice.org-writer2latex
when Java is enabled
- also install pythonscript.py into $(SITE_PACKAGES)
+ * debian/control.in:
+ - make the openoffice.org metapackage depend on ttf-dejavu, since upstream
+ OOo ships it
* debian/scripts/vars.ppc64: actually add
+ * debian/control.in, debian/rules:
+ - remove the "build libmythes-dev only" option as OOo is now enabled
+ on all important archs. Remove the now unndeeded arch specifiers
+ on builddeps. Hopefully makes mips(el) parse the builddep line
+ again without segfault...
+ * debian/control.in:
+ - make impress recommend libxrandr2 as OOo now can detect size
+ changes through it
+ - build-depend against libxrandr-dev
- -- Rene Engelhard <rene@debian.org> Tue, 29 Apr 2008 23:34:39 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 01 May 2008 16:25:12 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-06 08:42:12 +0000
+++ b/control 2008-05-06 10:11:26 +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 armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] libxrandr-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , 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) [i386 powerpc sparc mips mipsel armel s390 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] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , 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) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
+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-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
@@ -13,8 +13,8 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-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-officebean-dep}, ${ooo-binfilter-dep}, ${writer-w2l-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, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | 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, ttf-dejavu, ${ooo-officebean-dep}, ${ooo-binfilter-dep}, ${writer-w2l-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, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -102,7 +102,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
+Depends: ure (>= ${ure:Version})), openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2)
@@ -473,7 +473,7 @@
Package: libmythes-dev
Section: libdevel
Suggests: perl
-Architecture: any
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Description: simple thesaurus library (development files)
MyThes is a simple thesaurus that uses a structured
text data file and an index file with binary search
=== modified file 'control.in'
--- a/control.in 2008-05-06 09:50:18 +0000
+++ b/control.in 2008-05-06 10:11:26 +0000
@@ -5,51 +5,51 @@
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
Build-Depends: lsb-release,
bzip2,
- bison (>= 1:1.875a-1) [%OOO_ARCHS%],
- flex-old [%OOO_ARCHS%],
- libpam0g-dev [%OOO_ARCHS%],
- libxaw7-dev [%OOO_ARCHS%],
- unzip [%OOO_ARCHS%],
- zip [%OOO_ARCHS%],
- autoconf [%OOO_ARCHS%],
- sharutils [%OOO_ARCHS%],
- pkg-config [%OOO_ARCHS%],
- xutils [%OOO_ARCHS%],
- libfontconfig1-dev [%OOO_ARCHS%],
+ 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 [%OOO_ARCHS%],
- libfreetype6-dev [%OOO_ARCHS%],
- libx11-dev [%OOO_ARCHS%],
- libsm-dev [%OOO_ARCHS%],
- libxt-dev [%OOO_ARCHS%],
- libxext-dev [%OOO_ARCHS%],
- libxtst-dev [%OOO_ARCHS%],
- libice-dev [%OOO_ARCHS%],
- libsane-dev [%OOO_ARCHS%],
- libxrender-dev [%OOO_ARCHS%],
- libcupsys2-dev [%OOO_ARCHS%],
- libarchive-zip-perl [%OOO_ARCHS%],
- libpng12-dev [%OOO_ARCHS%],
- libjpeg62-dev [%OOO_ARCHS%],
- libxml2-dev [%OOO_ARCHS%],
- libldap2-dev [%OOO_ARCHS%],
- libexpat1-dev [%OOO_ARCHS%],
- libgnomevfs2-dev [%OOO_ARCHS%],
- fastjar [%OOO_ARCHS%],
- xsltproc [%OOO_ARCHS%],
- graphicsmagick-imagemagick-compat [%OOO_ARCHS%],
- netpbm [%OOO_ARCHS%],
- fdupes [%OOO_ARCHS%],
- xml-core [%OOO_ARCHS%],
- libxkbfile-dev [%OOO_ARCHS%],
- libxinerama-dev [%OOO_ARCHS%],
- x11proto-render-dev [%OOO_ARCHS%],
- unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
- libxml-parser-perl [%OOO_ARCHS%],
- gperf [%OOO_ARCHS%],
- libpq-dev [%OOO_ARCHS%]
- libxrandr-dev [%OOO_ARCHS%]
+ 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
%BUILD_DEPS%
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
@@ -67,6 +67,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
+ ttf-dejavu,
${ooo-officebean-dep},
${ooo-binfilter-dep},
${writer-w2l-dep},
@@ -80,7 +81,6 @@
unixodbc,
cupsys-bsd,
libsane,
- ttf-dejavu,
openoffice.org-hyphenation,
openoffice.org2-thesaurus,
libxrender1,
@@ -181,7 +181,7 @@
Package: openoffice.orgVER-core
Architecture: %OOO_ARCHS%
-Depends: ure (>= ${ure:Version}),
+Depends: ure (>= ${ure:Version})),
openoffice.orgVER-common (>> ${base-version}),
ttf-opensymbol,
${shlibs:Depends},
@@ -722,7 +722,7 @@
Package: libmythes-dev
Section: libdevel
Suggests: perl
-Architecture: any
+Architecture: %OOO_ARCHS%
Description: simple thesaurus library (development files)
MyThes is a simple thesaurus that uses a structured
text data file and an index file with binary search
=== modified file 'copyright'
--- a/copyright 2008-04-09 10:51:17 +0000
+++ b/copyright 2008-05-06 10:11:26 +0000
@@ -1,11 +1,8 @@
Package: OpenOffice.org
-Obtained from: http://ftp.stardiv.de/pub/OpenOffice.org/stable/2.2.0
-Upstream authors: OpenOffice.org developer team
+Obtained from: http://download.go-oo.org/DEV300
+Upstream authors: OpenOffice.org developer tead the go-oo.org team
Debian package authors: Peter Novodvorsky, Jan Palic, Chris Halls, Rene Engelhard
-The directories odk/ and sdk_oo/ were removed from the source due to non-free
-documentation.
-
Debian copyright(s)/license(s):
Modifications and additions are free software; you can redistribute them
and/or modify
=== modified file 'rules'
--- a/rules 2008-05-06 09:50:18 +0000
+++ b/rules 2008-05-06 10:11:26 +0000
@@ -64,11 +64,6 @@
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_3.0.0_src_core.tar.bz2
-SYSTEM_TARBALL=OOo_3.0.0_src_system.tar.bz2
-
ifeq "$(DISTREL)" "etch"
ETCH_BACKPORT=y
endif
@@ -334,8 +329,6 @@
OOO_NPSOPLUGIN_ARCHS=
endif
-OOO_SCSOLVER_ARCHS= $(OOO_ARCHS)
-
# builds long...
ifneq (,$(findstring arm,$(ARCH)))
BUILD_BINFILTERS=n
@@ -366,34 +359,6 @@
MOZILLA=
endif
-# We only build the main openoffice.org packages on those architectures where it works
-# all other architectures build libmythes-dev
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
- ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_ARCHS)))
- BUILD_ONLY_LIBMYTHES=y
- else
- # extra step needed for arm, as the if matches the arm in armel..
- ifeq "$(ARCH)" "arm"
- BUILD_ONLY_LIBMYTHES=y
- endif
- ifeq "$(ARCH)" "amd64"
- ifneq "$(BUILD_AMD64)" "y"
- BUILD_ONLY_LIBMYTHES=y
- endif
- endif
- ifeq "$(ARCH)" "ppc64"
- ifneq "$(BUILD_AMD64)" "y"
- BUILD_ONLY_LIBMYTHES=y
- endif
- endif
- ifeq "$(ARCH)" "ia64"
- ifneq "$(BUILD_IA64)" "y"
- BUILD_ONLY_LIBMYTHES=y
- endif
- endif
- endif
-endif
-
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
BUILDDEB_OPTIONS = -- -Zbzip2
@@ -402,7 +367,7 @@
ifeq "$(NEW_DPKG_SHLIBDEPS)" "y"
# new dpkg-dev whcih works - in contrast to 1.4.9 and .10 -
# without --ignore-missing-info
- BUILD_DEPS += , dpkg-dev (>= 1.14.11) [$(OOO_ARCHS)]
+ BUILD_DEPS += , dpkg-dev (>= 1.14.11)
endif
ifeq "$(ENABLE_OPENGL)" "y"
@@ -425,19 +390,19 @@
endif
ifeq "$(USE_LIBCURL4)" "y"
- BUILD_DEPS += , libcurl4-openssl-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libcurl4-openssl-dev
else
- BUILD_DEPS += , libcurl3-openssl-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libcurl3-openssl-dev
endif
ifeq "$(SYSTEM_OPENSSL)" "y"
- BUILD_DEPS += , libssl-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libssl-dev
CONFIGURE_FLAGS += --with-system-openssl
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
endif
# libdb-dev since 4.6 but it provides libdb4.6-dev, so keep this as-is...
- BUILD_DEPS += , libdb$(DBVER)-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libdb$(DBVER)-dev
ifneq "$(BUILD_DBG_PACKAGE)" "y"
SMALL_SYMBOLS = y
@@ -454,9 +419,10 @@
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(USE_PYCENTRAL)" "y"
- BUILD_DEPS += , python-central (>= 0.5) [$(OOO_ARCHS)]
+ BUILD_DEPS += , python-central (>= 0.5)
endif
- BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
+ BUILD_DEPS += , python-dev (>= 2.4)
+ WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python [$(OOO_ARCHS)]
@@ -494,7 +460,7 @@
endif
ifeq "$(RUN_SMOKETEST)" "y"
- BUILD_DEPS += , xvfb [$(OOO_ARCHS)], xbase-clients [$(OOO_ARCHS)], xfonts-base [$(OOO_ARCHS)]
+ BUILD_DEPS += , xvfb, xbase-clients, xfonts-base
endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
@@ -653,7 +619,11 @@
ifeq "$(MOZILLA)" "libxul"
BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev [$(OOO_MOZILLA_ARCHS)]
else
+ ifeq "$(MOZILLA)" "iceape"
+ BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)]
+ else
BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
+ endif
endif
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
endif
@@ -664,7 +634,7 @@
endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
- BUILD_DEPS += , dmake (>= 1:4.11) [$(OOO_ARCHS)]
+ BUILD_DEPS += , dmake (>= 1:4.11)
endif
ifeq "$(ENABLE_MONO)" "y"
@@ -681,15 +651,15 @@
endif
ifeq "$(USE_SYSTEM_HUNSPELL)" "y"
- BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
CONFIGURE_FLAGS+= --with-system-hunspell
endif
ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
ifeq "$(USE_LIBHYPHEN)" "y"
- BUILD_DEPS += , libhyphen-dev $(LIBHYPHEN_MINVER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libhyphen-dev $(LIBHYPHEN_MINVER)
else
- BUILD_DEPS += , libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER)
endif
CONFIGURE_FLAGS += --with-system-altlinuxhyph
endif
@@ -697,7 +667,7 @@
ifeq "$(USE_AGG)" "y"
CONFIGURE_FLAGS+= --with-agg
ifeq "$(SYSTEM_AGG)" "y"
- BUILD_DEPS += , libagg-dev (>= 2.3-2) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libagg-dev (>= 2.3-2)
CONFIGURE_FLAGS += --with-system-agg
endif
endif
@@ -714,61 +684,61 @@
endif
ifeq "$(USE_SYSTEM_BOOST)" "y"
- BUILD_DEPS += , libboost-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libboost-dev
CONFIGURE_FLAGS += --with-system-boost
endif
ifeq "$(USE_SYSTEM_VIGRA)" "y"
- BUILD_DEPS += , libvigraimpex-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libvigraimpex-dev
CONFIGURE_FLAGS += --with-system-vigra
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
- BUILD_DEPS += , libwpd8-dev $(LIBWPD8_MINVER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libwpd8-dev $(LIBWPD8_MINVER)
CONFIGURE_FLAGS+= --with-system-libwpd
ifeq "$(USE_SYSTEM_SABLOT)" "y"
- BUILD_DEPS += , libsablot0-dev (>= 1.0.2-4) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libsablot0-dev (>= 1.0.2-4)
CONFIGURE_FLAGS += --with-system-sablot
endif
ifeq "$(USE_EXTERNAL_MYTHES)" "y"
- BUILD_DEPS += , libmythes-dev (>= 1:1.0-3) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libmythes-dev (>= 1:1.0-3)
CONFIGURE_FLAGS += --with-system-mythes
DEBHELPER_OPTIONS+= -Nlibmythes-dev
endif
ifeq "$(USE_SYSTEM_LIBWPS)" "y"
- BUILD_DEPS += , libwps-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libwps-dev
CONFIGURE_FLAGS += --with-system-libwps
endif
ifeq "$(USE_SYSTEM_LIBWPG)" "y"
- BUILD_DEPS += , libwpg-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libwpg-dev
CONFIGURE_FLAGS += --with-system-libwpg
endif
endif
ifeq "$(USE_SYSTEM_ICU)" "y"
# 34 and 36 provide this and 38 changed the real name.
- BUILD_DEPS += , libicu-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libicu-dev
CONFIGURE_FLAGS += --with-system-icu
endif
ifeq "$(USE_LIBXSLT)" "y"
CONFIGURE_FLAGS += --with-system-libxslt
- BUILD_DEPS += , libxslt1-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libxslt1-dev
DBG_DBG_SUGGESTS+= , libxslt1-dbg
endif
ifeq "$(USE_SYSTEM_XMLSEC)" "y"
ifneq (,$(findstring xul,$(MOZILLA)))
- BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1) [$(OOO_ARCHS)], libxmlsec1-nss (>= 1.2.9-1.1) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9-1.1) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1), libxmlsec1-nss (>= 1.2.9-1.1), libxmlsec1-openssl (>= 1.2.9-1.1)
else
- BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9) [$(OOO_ARCHS)], libxmlsec1-nss (>= 1.2.9) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9), libxmlsec1-nss (>= 1.2.9), libxmlsec1-openssl (>= 1.2.9)
endif
CONFIGURE_FLAGS += --with-system-xmlsec
endif
ifeq "$(BUILD_CAIROCANVAS)" "y"
ifeq "$(USE_SYSTEM_CAIRO)" "y"
- BUILD_DEPS+= , libcairo2-dev [$(OOO_ARCHS)]
+ BUILD_DEPS+= , libcairo2-dev
CONFIGURE_FLAGS+= --with-system-cairo
endif
else
@@ -780,7 +750,7 @@
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-kde
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango $(HUMAN)"
else
- BUILD_DEPS += , kdelibs4-dev $(KDELIBS_MINVER) [$(OOO_ARCHS)]
+ BUILD_DEPS += , kdelibs4-dev $(KDELIBS_MINVER)
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
@@ -814,30 +784,32 @@
endif
endif
-ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
- ifeq "$(USE_SHARED_LPSOLVE)" "y"
- BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)], lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
- LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
- else
- BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
- endif
+ifeq "$(ENABLE_SCSOLVER)" "y"
+ ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
+ ifeq "$(USE_SHARED_LPSOLVE)" "y"
+ BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION), lp-solve $(LPSOLVE_MIN_VERSION)
+ LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
+ else
+ BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
+ endif
CONFIGURE_FLAGS += --with-system-lpsolve
ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
- BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0) [$(OOO_SCSOLVER_ARCHS)]
- else
+ BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0)
+ else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
- BUILD_DEPS += , libufsparse-dev [$(OOO_SCSOLVER_ARCHS)]
+ BUILD_DEPS += , libufsparse-dev
+ endif
endif
endif
ifeq "$(USE_DBUS)" "y"
- BUILD_DEPS += , libdbus-glib-1-dev (>= 0.60) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libdbus-glib-1-dev (>= 0.60)
CONFIGURE_FLAGS += --enable-dbus
endif
ifeq "$(USE_GSTREAMER)" "y"
- BUILD_DEPS += , libgstreamer-plugins-base0.10-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libgstreamer-plugins-base0.10-dev
GSTREAMER_PLUGINS_SUGGESTS += , gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
DBG_DBG_SUGGESTS+= , libgstreamer0.10-0-dbg
else
@@ -845,19 +817,19 @@
endif
ifeq "$(USE_SYSTEM_NEON)" "y"
- BUILD_DEPS += , libneon$(NEONSONR)-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libneon$(NEONSONR)-dev
DBG_DBG_SUGGESTS+= , libneon$(NEONSONR)-dbg
CONFIGURE_FLAGS += --with-system-neon
endif
# CairoFonts patchset is applied for sid and this patch needs Gtk 2.10
ifneq "$(CAIRO_FONTS_PATCH)" "y"
- BUILD_DEPS += , libgtk2.0-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libgtk2.0-dev
else
- BUILD_DEPS += , libgtk2.0-dev (>= 2.10) [$(OOO_ARCHS)]
+ BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
# cairo canvas might be disabled, but the patch needs cairo headers
ifneq "$(BUILD_CAIROCANVAS)" "y"
- BUILD_DEPS += , libcairo2-dev [$(OOO_ARCHS)]
+ BUILD_DEPS += , libcairo2-dev
CONFIGURE_FLAGS += --with-system-cairo
endif
endif
@@ -918,64 +890,6 @@
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
-ifeq "$(BUILD_ONLY_LIBMYTHES)" "y"
-clean:
- dh_testdir
- dh_testroot
-
- rm -rf ooo-build/build
- rm -rf debian/libmythes-dev
-
- dh_clean
-
-build:
- mkdir -p ooo-build/build
- cd ooo-build/build && \
- tar xfvj ../src/$(CORE_TARBALL) $(TAG)/lingucomponent/source/thesaurus/mythes \
- $(TAG)/lingucomponent/inc && \
- tar xfvj ../src/$(SYSTEM_TARBALL) $(TAG)/dictionaries/util
- cd $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes && \
- $(CXX) -O2 -Wall -ansi -pedantic -I. -I../../../inc/pch \
- -c mythes.cxx && \
- ar rc libmythes.a mythes.o && ranlib libmythes.a && \
- mv libmythes.a $(CURDIR)/ooo-build/build
- cd $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes && \
- $(CXX) -fPIC -O2 -Wall -ansi -pedantic -I. -I../../../inc/pch \
- -c mythes.cxx && \
- ar rc libmythes_pic.a mythes.o && ranlib libmythes_pic.a && \
- mv libmythes_pic.a $(CURDIR)/ooo-build/build
-
-install: $(CURDIR)/ooo-build/build/libmythes.a $(CURDIR)/ooo-build/build/libmythes_pic.a
- mkdir -p debian/libmythes-dev/usr/lib
- mkdir -p debian/libmythes-dev/usr/include
- mkdir -p debian/libmythes-dev/usr/share/mythes
- install -m644 \
- $(CURDIR)/ooo-build/build/libmythes.a \
- debian/libmythes-dev/usr/lib/libmythes.a
- install -m644 \
- $(CURDIR)/ooo-build/build/libmythes_pic.a \
- debian/libmythes-dev/usr/lib/libmythes_pic.a
- install -m644 $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes/mythes.hxx \
- debian/libmythes-dev/usr/include
- install -m755 $(SOURCE_TREE)/dictionaries/util/th_gen_idx.pl \
- debian/libmythes-dev/usr/share/mythes/th_gen_idx.pl
-
-binary: binary-arch
-
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installdocs -plibmythes-dev
- dh_installchangelogs -plibmythes-dev
- dh_lintian
- dh_link -plibmythes-dev
- dh_fixperms -plibmythes-dev
- dh_compress -plibmythes-dev
- dh_installdeb -plibmythes-dev
- dh_gencontrol -plibmythes-dev -- -v$(BINARY_VERSION)
- dh_md5sums -plibmythes-dev
- dh_builddeb -plibmythes-dev
-else
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
@@ -3147,6 +3061,5 @@
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
.PHONY: build build-indep build-arch install-arch install-indep
.PHONY: $(stampdir_targets)
-endif
# vim:set noet ai sts=8 sw=8 tw=0:
Reply to: