------------------------------------------------------------
revno: 1111
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-05-26 13:39:06 +0200
message:
merge; fix changelog formatting
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1097.1.9
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-05-23 17:25:25 +0200
message:
remove overseen OOO_ARCHS and fix control and maintscripts dependencies
modified:
changelog
rules
------------------------------------------------------------
revno: 1097.1.10
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-05-26 13:32:43 +0200
message:
disable mono
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-05-23 12:18:15 +0000
+++ b/changelog 2008-05-26 11:39:06 +0000
@@ -4,22 +4,25 @@
- now doesn't need a patched icu (public SetBreakType) anymore for
building
* ooo-build:
- - use ooo-build-2-4-1 branch
- - update (r12643)
- + allows to change broken java configuration
- This closes: #451928, #452925
- Most probably also closes: #454996
+ - use ooo-build-2-4-1 branch
+ - update (r12662 - ooo-build 2.4.1)
+ + allows to change broken java configuration
+ This closes: #451928, #452925
+ Most probably also closes: #454996
* debian/rules:
- - we also need to build-depend on libnss3-dev (closes: #481996)
- - reenable system-icu for etch backports
- - add get-orig-source target
+ - we also need to build-depend on libnss3-dev (closes: #481996)
+ - reenable system-icu for etch backports
+ - add get-orig-source target
+ - remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
+ .ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
+ - temporarily disable mono
* debian/control.in:
- remove libicu build-conflicts
* debian/control.in, debian/rules:
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 21 May 2008 00:52:39 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 26 May 2008 13:38:20 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
@@ -39,7 +42,7 @@
* debian/control.in, debian/rules:
- fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 23 May 2008 09:39:40 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 12 May 2008 11:38:39 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-23 10:27:03 +0000
+++ b/control 2008-05-26 11:39:06 +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-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 (>= 5.0.51~) , 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.6.5) [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] , 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 (>= 5.0.51~) , 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.6.5) [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] , 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) , 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-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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -3019,19 +3019,6 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-Package: libuno-cil
-Architecture: i386 sparc amd64 ia64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}),
mono-gac, ${cli:Depends}
-Description: CLI binding for OpenOffice.org
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the CLI bindings to OpenOffice.org for
- accessing the OpenOffice.org API from Mono languages (e.g. C# and Boo)
- .
- Note that currently the use of Mono for add-ins & scripting inside
- OpenOffice.org is *not* yet supported.
-
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
=== modified file 'rules'
--- a/rules 2008-05-23 10:27:03 +0000
+++ b/rules 2008-05-26 11:39:06 +0000
@@ -95,7 +95,7 @@
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
-ENABLE_MONO=y
+ENABLE_MONO=n
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
@@ -417,7 +417,7 @@
WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
- BUILD_DEPS += , python [$(OOO_ARCHS)]
+ BUILD_DEPS += , python
endif
ifeq "$(ETCH_BACKPORT)" "y"
@@ -1087,7 +1087,7 @@
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <[EMAIL PROTECTED]>
control: debian/control
-debian/control: debian/control.in debian/control.lang.in
debian/control.help.in debian/control.fonts.in debian/control.sdk.in
debian/control.mozilla.in debian/control.gcj.in debian/control.gcj.in
debian/control.mono.in debian/control.qa.in debian/control.postgresql.in
ooo-build/bin/openoffice-xlate-lang debian/rules
+debian/control: $(wildcard debian/control*in)
ooo-build/bin/openoffice-xlate-lang debian/rules
chmod 755 ooo-build/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
@@ -1612,7 +1612,7 @@
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: debian/shell-lib.sh debian/control
+$(STAMP_DIR)/maintscripts: debian/shell-lib.sh $(wildcard debian/*.preinst.in)
$(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard
debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
