------------------------------------------------------------
revno: 1602
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-06-19 21:44:15 +0200
message:
oxygen icons
modified:
changelog
control
control.in
control.kde.in
rules
=== modified file 'changelog'
--- a/changelog 2009-06-18 19:29:42 +0000
+++ b/changelog 2009-06-19 19:44:15 +0000
@@ -4,7 +4,7 @@
- fixes sort when involving formulas (closes: #529430)
* ooo-build:
- - use 'master' again (75ee0dca57fb598bdacf0f7fdcf6923eec3be846)
+ - use 'master' again (9bb64f6fa29ac3c7db1ad54a222010c6f9d4a115)
+ adds "a JVM and" to javaldx' message if no Java is found
(closes: #532549)
@@ -13,9 +13,11 @@
- add conditionals for KDE4, enable -kde for KDE4 again (closes: #528487)
- don't set VERBOSE=true on ia64/buildd now that the quiet-buildd.diff
is more complete.
- * debian/README.Debian: mention kde4 for OOO_FORCE_DESKTOP
+ * debian/README.Debian: mention kde4 for OOO_FORCE_DESKTOP
+ * debian/control*in, debian/rules: add -style-oxygen package and synchroniize
+ style handling in rules by just relying on $(IMAGES)
- -- Rene Engelhard <[email protected]> Thu, 18 Jun 2009 21:27:41 +0200
+ -- Rene Engelhard <[email protected]> Fri, 19 Jun 2009 20:54:32 +0200
openoffice.org (1:3.1.0-6) UNRELEASED; urgency=low
=== modified file 'control'
--- a/control 2009-06-19 16:27:53 +0000
+++ b/control 2009-06-19 19:44:15 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes,
xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common
(>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>=
1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips
mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm armel amd64
ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
libqt4-dev (>= 4.5) , kdelibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes,
xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common
(>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>=
1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips
mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm armel amd64
ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs5-dev , libqt4-dev (>= 4.5) , libxrandr-dev , liblucene2-java (>= 2.3.2)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
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, 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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], base-files (= 5)
Standards-Version: 3.8.1
XS-Python-Version: current
@@ -116,7 +116,7 @@
Architecture: all
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
-Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
xfonts-mathml
+Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
openoffice.org-style-oxygen, xfonts-mathml
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<<
${base-version}), openoffice.org-writer (<< ${base-version}),
openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<<
${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math
(<< ${base-version}), broffice.org (<< ${base-version}),
openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14),
openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>=
1:${basis-version}.99)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
@@ -258,7 +258,18 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "crystal" symbol style, default style for KDE.
+ This package contains the "crystal" symbol style, default style for KDE 3.
+
+Package: openoffice.org-style-oxygen
+Architecture: all
+Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Suggests: kde-icons-oxyen, oxygencursors
+Replaces: openoffice.org-common (<< 2.1~m190)
+Description: full-featured office productivity suite -- Oxygen symbol style
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "oxygen" symbol style, default style for KDE 4.
Package: openoffice.org-style-industrial
Architecture: all
@@ -3455,7 +3466,7 @@
Package: openoffice.org-kde
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${binary:Version}),
openoffice.org-style-crystal, ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), ${kde-iconset-dep},
${shlibs:Depends}, ${misc:Depends}
Suggests: konqueror, kmail, openoffice.org-kab
Section: kde
Enhances: openoffice.org
=== modified file 'control.in'
--- a/control.in 2009-06-13 22:01:02 +0000
+++ b/control.in 2009-06-19 19:44:15 +0000
@@ -267,6 +267,7 @@
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal,
+ openoffice.orgVER-style-oxygen,
xfonts-mathml
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
@@ -509,7 +510,19 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "crystal" symbol style, default style for KDE.
+ This package contains the "crystal" symbol style, default style for KDE 3.
+
+Package: openoffice.orgVER-style-oxygen
+Architecture: all
+Depends: openoffice.orgVER-common (= ${source:Version}),
+ ${misc:Depends}
+Suggests: kde-icons-oxyen, oxygencursors
+Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Description: full-featured office productivity suite -- Oxygen symbol style
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "oxygen" symbol style, default style for KDE 4.
Package: openoffice.orgVER-style-industrial
Architecture: all
=== modified file 'control.kde.in'
--- a/control.kde.in 2009-04-17 18:24:15 +0000
+++ b/control.kde.in 2009-06-19 19:44:15 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-kde
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-style-crystal,
+ ${kde-iconset-dep},
${shlibs:Depends},
${misc:Depends}
Suggests: konqueror,
=== modified file 'rules'
--- a/rules 2009-06-19 16:27:53 +0000
+++ b/rules 2009-06-19 19:44:15 +0000
@@ -230,6 +230,7 @@
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
# otherwise
INTERNAL_STDLIBS=n
+IMAGES:=industrial crystal hicontrast tango oxygen classic
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -864,12 +865,14 @@
ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS+= --disable-kde
CONFIGURE_FLAGS-= --disable-kde4
- CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
+ CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
else
ifeq "$(KDE_VER)" "4"
CONFIGURE_FLAGS += --disable-kde
+ KDE_ICONSET_DEP=openoffice.org$(VER)-style-oxygen
else
CONFIGURE_FLAGS += --disable-kde4
+ KDE_ICONSET_DEP=openoffice.org$(VER)-style-crystal
endif
BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev
$(KDELIBS_MINVER)
ifeq "$(KDE_VER)" "4"
@@ -892,7 +895,7 @@
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-gtk
-Nopenoffice.org$(VER)-gnome
- CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
+ CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
endif
ifeq "$(ENABLE_EVO2)" "n"
@@ -2853,7 +2856,10 @@
# Add them now because openoffice.org-help-* packaged in contrib or so
# will need them
set -e; \
- for z in images.zip images_classic.zip images_industrial.zip
images_crystal.zip images_hicontrast.zip images_tango.zip $(IMAGES_HUMAN_ZIP);
do \
+ for i in $(IMAGES); do \
+ s=_$$i.zip; \
+ case "$$i" in galaxy) s=.zip; esac; \
+ z=images$$s; \
echo "adding helpimgs to $$z..."; \
rm -rf $$z; mkdir $$z; \
cd $$z; \
@@ -2866,13 +2872,13 @@
done
endif
set -e; \
- for s in galaxy andromeda industrial crystal hicontrast tango $(HUMAN);
do \
- z=images_$$s.zip; \
- case "$$s" in galaxy) z=images.zip; esac; \
- case "$$s" in andromeda) z=images_classic.zip; esac; \
- mkdir -p $(PKGDIR)-style-$$s/$(OODIR)/share/config; \
+ for i in $(IMAGES); do \
+ z=images_$$i.zip; p=$$i; \
+ case "$$i" in galaxy) z=images.zip; esac; \
+ case "$$i" in classic) p=andromeda; esac; \
+ mkdir -p $(PKGDIR)-style-$$p/$(OODIR)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
- $(PKGDIR)-style-$$s/$(OODIR)/share/config/; \
+ $(PKGDIR)-style-$$p/$(OODIR)/share/config/; \
done
rm -rf $(PKGDIR)-dtd-officedocument1.0
@@ -3114,6 +3120,7 @@
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
+ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
