------------------------------------------------------------
revno: 1101
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-05-23 10:05:12 +0200
message:
updates for m13
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-05-19 21:35:52 +0000
+++ b/changelog 2008-05-23 08:05:12 +0000
@@ -6,7 +6,7 @@
- now properly complains about missing permissions when trying to write
to a read-only location (closes: #238906)
* ooo-build:
- - update (r12601)
+ - update (r12642)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -15,8 +15,8 @@
* debian/scripts/installoverrides: remove
* debian/rules:
- run dh_lintian
- - lots of updates for removed $UPD and changed locations and the
- "three-layer OOo" (of which we merge the layers in ooo-build)
+ - lots of updates for removed $UPD, removed files and changed locations
+ and the "three-layer OOo" (of which we merge the layers in ooo-build)
- bump ant builddep to ant (>= 1.7.0) and additonally build-dep on
ant-optional when we build the mediawiki extension
- remove scsolver conditionals, not disableabe in Suns version.
@@ -27,6 +27,7 @@
/usr/lib/openoffice/ure (easier to maintain with the three-layer OOo)
- temporarily disable SDK package (until jsc21)
- update get-orig-source target for fixed hyph_en_US.dic
+ - add --enable-gio conditional
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -52,7 +53,7 @@
* debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 19 May 2008 23:31:16 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 23 May 2008 09:50:22 +0200
openoffice.org (1:2.4.1~ooh680m14-1.2pre) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-05-21 19:50:32 +0000
+++ b/control 2008-05-23 08:05:12 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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], ant-optional (>= 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] , iceape-dev (>= 1.1.9-5) [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.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 , 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] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>=
5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+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], ant-optional (>= 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] , iceape-dev (>= 1.1.9-5) [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.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 , 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] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>=
5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10) ,
libglib2.0-dev (>= 2.15.0)
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
=== modified file 'rules'
--- a/rules 2008-05-21 10:24:21 +0000
+++ b/rules 2008-05-23 08:05:12 +0000
@@ -166,6 +166,7 @@
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_SCREEN=y
ENABLE_PDFIMPORT=y
+ENABLE_GIO=y
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
@@ -236,6 +237,7 @@
USE_STLPORT=y
PACKAGE_WRITER2LATEX=y
MOZILLA=xulrunner
+ ENABLE_GIO=n
endif
#############
@@ -844,6 +846,11 @@
endif
endif
+ifeq "$(ENABLE_GIO)" "y"
+ CONFIGURE_FLAGS += --enable-gio
+ BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@ -2364,9 +2371,6 @@
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-$$i.desktop; \
done
- cat $(PKGDIR)-common/usr/share/applications/ooo-extensionmgr.desktop \
- | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
- >
debian/broffice.org/usr/share/applications/ooo-extensionmgr.desktop
cat $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
>
debian/broffice.org/usr/share/applications/ooo-startcenter.desktop
@@ -2765,19 +2769,6 @@
$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
fi
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
- # menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
- mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
- sed -e 's,Exec=unopkg,Exec=/$(OODIR)/program/unopkg,' \
- -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
- -e 's/ / /' \
- < $$dirname/extensionmgr.desktop \
- >
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extensionmgr.desktop || exit 1
- sed -i -e 's/Application;//'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extensionmgr.desktop
- sed -i -e 's/Office;/Office;System;/'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extensionmgr.desktop
-endif
-
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@ -2943,7 +2934,7 @@
endif
ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
dh_gencontrol -popenoffice.org$(VER)-presenter-screen -- \
- -v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
-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`
