Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2695
Modified Files:
changelog control control.in rules
Log Message:
* debian/control.in:
- modify libdb builddeps to not require it on woody [RE]
- Standards-Version: 3.6.1 (no changes needed)
* debian/rules:
- disable use of external libdb and libmyspell for woody builds,
thanks Severin Greimel for the pointer [RE]
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- rules 29 Mar 2004 23:38:30 -0000 1.189
+++ rules 1 Apr 2004 04:24:28 -0000 1.190
@@ -44,17 +44,14 @@
include debian/scripts/vars.$(ARCH)
# Default flags to pass to configure
-D=$(shell debian/scripts/dbdevver)
CONFIGURE_FLAGS= --enable-libart \
--disable-rpath \
--enable-crashdump \
--without-fonts \
--with-system-zlib \
- --with-system-db --with-db-version=$(D) \
--with-system-nas \
--with-system-sane-headers \
--with-system-curl \
- --with-system-myspell \
--with-system-altlinuxhyph \
--with-system-x11-extensions-headers \
--with-system-unixodbc-headers
@@ -117,9 +114,13 @@
_CC:=gcc
CXX:=g++
endif
+ D=$(shell debian/scripts/dbdevver)
USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
CONFIGURE_FLAGS+= --enable-fontconfig
+ CONFIGURE_FLAGS+= --with-system-myspell
+ USE_SYSTEM_DB=y
+ CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D)
#CONFIGURE_FLAGS+= --with-system-neon
PATCHSET=Debian
DEBIANUTILSDEPENDS=, debianutils (>= 2.0)
@@ -131,6 +132,7 @@
# Don't use system libstlport
USE_SYSTEM_STLPORT=n
PATCHSET=DebianWoody
+ D=$(shell ls -1 berkeleydb/download | cut -d"-" -f2 | cut -d"." -f1,2)
endif
# gcc version can be overriden by setting GCCVER in scripts/vars[.arch]
@@ -586,6 +588,7 @@
test -r /usr/share/java/xalan.jar
test -r /usr/share/java/xml-apis.jar
test -r /usr/share/java/xalan2.jar
+ifeq "$(USE_SYSTEM_DB)" "y"
if [ "`echo $(D) | cut -d'.' -f1`" = "3" ] \
|| [ "`echo $(D) | cut -d'.' -f1`" = "4" -a \
"`echo $(D) | cut -d'.' -f2`" = "0" ]; then \
@@ -597,6 +600,7 @@
test -r $(LIBDB_JAR); \
fi
endif
+endif
ifeq "$(USE_JAVA)" "y"
ifeq "$(ARCH)" "powerpc"
@@ -850,6 +854,13 @@
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/libfreetype.so.6
endif
+ifneq "$(USE_SYSTEM_DB)" "y"
+ for i in libdb-$(D).so libdb_cxx-$(D).so; do \
+ cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
+ $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program; \
+ done
+endif
+
# If building with a JDK, install the additional files
ifeq "$(USE_JAVA)" "y"
ifeq "$(LIBSUFFIX)" ""
@@ -866,6 +877,10 @@
cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program; \
done
+ifneq "$(USE_SYSTEM_DB)" "y"
+ cp -rf $(PKGOPENOFFICEDIR)/program/libdb_java-$(D).so \
+ $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
+endif
endif
ifneq "$(USE_SYSTEM_STLPORT)" "y"
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- control.in 30 Mar 2004 02:07:03 -0000 1.119
+++ control.in 1 Apr 2004 04:24:28 -0000 1.120
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev, libaudio-dev
| nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc],
xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev
| libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev, libxrender-dev | xlibs-de
v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0
[!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic |
g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev |
libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev,
libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev,
libx
render-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1),
unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
-Standards-Version: 3.5.6
+Standards-Version: 3.6.1
Package: openoffice.org
Architecture: all
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- changelog 31 Mar 2004 15:16:51 -0000 1.283
+++ changelog 1 Apr 2004 04:24:28 -0000 1.284
@@ -1,7 +1,18 @@
+openoffice.org (1.1.1-1.2pre) unstable; urgency=low
+
+ * debian/control.in:
+ - modify libdb builddeps to not require it on woody [RE]
+ - Standards-Version: 3.6.1 (no changes needed)
+ * debian/rules:
+ - disable use of external libdb and libmyspell for woody builds,
+ thanks Severin Greimel for the pointer [RE]
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 1 Apr 2004 06:01:22 +0200
+
openoffice.org (1.1.1-1) unstable; urgency=low
* 1.1.1 final release; generate a new .orig.tar.gz from the official
- source .tar.bz2
+ source .tar.bz2 [RE]
* debian/control.in:
- Tighten dependencies between packages to ensure all main packages are at
least 1.1.1rc3 (closes: #239193) [CH, RE]
@@ -13,7 +24,7 @@
- fix libhpi existence check to be only executed on Java builds; it
otherwise searches beginning from / which wastes much ressources... [RE]
* debian/shell-lib.sh:
- - add message() taken from xfree86 (closes: #233424)
+ - add message() taken from xfree86 (closes: #233424) [RE]
-- Rene Engelhard <[EMAIL PROTECTED]> Tue, 30 Mar 2004 03:59:37 +0200
@@ -36,7 +47,7 @@
openoffice.org (1.1.0+cvs20040312-1) experimental; urgency=low
* CVS co of OpenOffice_1_1_1 tag as of 20040312. binary packages versioned
- 1.1.0+1.1.1rc2.
+ 1.1.0+1.1.1rc2. [RE]
* New patches:
- system-neon: build and link dynamically against system neon
(now only against 0.23 which isn't in Debian anymore :/ ) [RE]
@@ -58,7 +69,7 @@
render-dev | xlibs-dev (<< 4.3.0-1) to Build-Depends: [RE]
* debian/local/openoffice-xlate-lang:
- add (yet commented) 47:nb-NO:NORBOK:Norwegian (Bokmal) and
- 79:nn-no:NORNYN:Norwegian (Nynorsk)
+ 79:nn-no:NORNYN:Norwegian (Nynorsk) [RE]
* debian/po:
- add cs.po, thanks Miroslav Kure (closes: #237576) [RE]
* debian/MANIFEST.*: update [RE]
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- control 30 Mar 2004 02:08:06 -0000 1.152
+++ control 1 Apr 2004 04:24:28 -0000 1.153
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL
PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev, libaudio-dev
| nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc],
xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev
| libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev, libxrender-dev | xlibs-de
v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev |
libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0
[!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev |
libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc
(>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl |
gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev | libdb++-dev | g++-3.0
[!powerpc], libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic |
g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev |
libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev,
libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev,
libx
render-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1),
unixodbc-dev
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3)
Standards-Version: 3.5.6
