CVS:oo-deb/debian changelog,1.311,1.312 control,1.164,1.165 control.in,1.131,1.132 rules,1.204,1.205
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5436/debian
Modified Files:
changelog control control.in rules
Log Message:
- merge changelog entries wrt Build-Depends:
- use system stlport again, add appropriate build-depends
- use /usr as stlport-home and don't create stlport-home anymore
- merge configure switches for system-* on sid together
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- rules 4 May 2004 10:00:16 -0000 1.204
+++ rules 4 May 2004 22:21:54 -0000 1.205
@@ -116,15 +116,11 @@
_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_STLPORT=y
+ STLPORT_HOME=/usr
USE_SYSTEM_DB=y
- CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D) \
- --with-system-altlinuxhyph --with-system-curl \
- --with-system-neon
PATCHSET=Debian
PYTHON=/usr/bin/python
PYMAJOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
@@ -133,7 +129,11 @@
# a.k.a a python-pyuno pkg
PYTHON_DEPENDS=$(shell echo "python (>= $(PYMAJOR).$(PYMINOR)), \
python (<< $(PYMAJOR).$$(($(PYMINOR) +1)))")
- CONFIGURE_FLAGS+= --with-python=$(PYTHON)
+ CONFIGURE_FLAGS+= --with-system-db --with-db-version=$(D) \
+ --with-system-altlinuxhyph --with-system-curl \
+ --with-system-neon --with-system-myspell \
+ --enable-fontconfig --with-stlport4-home=/usr \
+ --with-python=$(PYTHON)
else
## Woody backport
# use latest gcc-3.x compiler version
@@ -529,15 +529,6 @@
dh_testdir $(OOO_BUILD)/patches/apply.pl
$(MAKE) -f debian/rules control
-
-ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # making stlport home
- if [ ! -d stlport-home ]; then \
- mkdir stlport-home ;\
- ln -s /usr/include stlport-home/include ;\
- ln -s /usr/lib stlport-home/lib ;\
- fi
-endif
ifneq "$(ARCH)" "i386"
ifneq "$(MOZILLA)" "n"
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- control.in 22 Apr 2004 06:40:31 -0000 1.131
+++ control.in 4 May 2004 22:21:54 -0000 1.132
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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.8), 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 | gimp1.2, 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-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc]
+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.8), 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 | gimp1.2, 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-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 2.6.2-1) | g++-3.0 [!powerpc]
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- changelog 4 May 2004 22:11:24 -0000 1.311
+++ changelog 4 May 2004 22:21:54 -0000 1.312
@@ -15,14 +15,15 @@
* debian/control.in:
- extend build-conflicts on libart, 2.3.16-4 too is broken.
2.3.13 introduced new functions. build-conflict on 2.3.16-4... [RE]
- - ugh, "gimp" exists only in sid currently, build-depend on
- gimp | gimp1.2 [RE]
- - reverse xlibs-dev | libxext-dev et al. builddeps in spirit of the
- xlibs-split, remove unneccessary xlibs-pic (>= 4.2.1-6) piece since it
- is a metapackage and we already have xlibs-static-pic there [RE]
- - do not require python-dev on woody [RE]
- - add libneon23-dev | g++-3.0 [!powerpc] [RE]
- - add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [powerpc]
+ - Build-Depends:
+ + ugh, "gimp" exists only in sid currently, build-depend on
+ gimp | gimp1.2 [RE]
+ + reverse xlibs-dev | libxext-dev et al. builddeps in spirit of the
+ xlibs-split, remove unneccessary xlibs-pic (>= 4.2.1-6) piece since it
+ is a metapackage and we already have xlibs-static-pic there [RE]
+ + do not require python-dev on woody [RE]
+ + add libneon23-dev | g++-3.0 [!powerpc] [RE]
+ + add libstlport4.6-dev (>= 4.6.2-1) | g++-3.0 [powerpc]
* debian/rules:
- add support for building using KDE icon set, use
DEB_BUILD_OPTIONS=kdeicons [CH]
@@ -42,7 +43,7 @@
- add Turkish debconf template translation, thanks Mehmet Türker
(closes: #246073) [RE]
- -- Chris Halls <halls@debian.org> Tue, 4 May 2004 11:56:55 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 5 May 2004 00:38:36 +0200
openoffice.org (1.1.1-2) unstable; urgency=high
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- control 22 Apr 2004 06:40:31 -0000 1.164
+++ control 4 May 2004 22:21:54 -0000 1.165
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Jan-Hendrik Palic <jan.palic@linux-debian.de>, Rene Engelhard <rene@debian.org>
-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.8), 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 | gimp1.2, 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-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc]
+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.8), 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 | gimp1.2, 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-static-pic | g++-3.0 [!powerpc], libx11-dev | xlibs-dev, libsm-dev | xlibs-dev, libxt-dev | xlibs-dev, libxext-dev | xlibs-dev, libice-dev | xlibs-dev, libsane-dev, libcurl2-dev (>= 7.9.8) | g++-3.0 [!powerpc], libmyspell-dev (>= 1:3.1-1) | g++-3.0 [!powerpc], libaltlinuxhyph-dev |
g++-3.0 [!powerpc], libxrender-dev | xlibs-dev (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev, python-dev | g++-3.0 [!powerpc], libneon23-dev | g++-3.0 [!powerpc], libstlport4.6-dev (>= 2.6.2-1) | g++-3.0 [!powerpc]
Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3), libart-2.0-dev (= 2.3.16-4)
Standards-Version: 3.6.1
Reply to: