CVS:oo-deb/debian changelog,1.302,1.303 control,1.162,1.163 rules,1.197,1.198
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv4714
Modified Files:
changelog control rules
Log Message:
don't build with system python on woody
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- changelog 20 Apr 2004 15:29:13 -0000 1.302
+++ changelog 20 Apr 2004 16:00:55 -0000 1.303
@@ -8,16 +8,19 @@
- 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]
+ - so not require python-dev on woody [RE]
* debian/rules:
- add support for building using KDE icon set, use
DEB_BUILD_OPTIONS=kdeicons [CH]
+ - build with system-python only on sid, woody's default python is too
+ old [RE]
* debian/scripts/vars:
- add KDE icon locations [CH]
* debian/README:
- add a section about how to build the Woody backport [CH]
- document DEB_BUILD_OPTIONS=kdeicons [CH]
- -- Chris Halls <halls@debian.org> Tue, 20 Apr 2004 17:24:40 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Apr 2004 17:58:47 +0200
openoffice.org (1.1.1-2) unstable; urgency=high
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- rules 20 Apr 2004 15:29:13 -0000 1.197
+++ rules 20 Apr 2004 16:00:55 -0000 1.198
@@ -44,15 +44,6 @@
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
-# python path and version
-PYTHON=/usr/bin/python
-PYMAJOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
-PYMINOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
-# this is for only supporting the default version
-# a.k.a a python-pyuno pkg
-PYTHON_DEPENDS=$(shell echo "python (>= $(PYMAJOR).$(PYMINOR)), \
- python (<< $(PYMAJOR).$$(($(PYMINOR) +1)))")
-
# Default flags to pass to configure
CONFIGURE_FLAGS= --enable-libart \
--disable-rpath \
@@ -62,8 +53,7 @@
--with-system-nas \
--with-system-sane-headers \
--with-system-x11-extensions-headers \
- --with-system-unixodbc-headers \
- --with-python=$(PYTHON)
+ --with-system-unixodbc-headers
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -85,6 +75,8 @@
BUILD_ALL_LANGPACKS=n
BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
else
+ # the buildds do binary-only builds; thefore we only need to build en
+ # (thanks James Troup for the username info)
ifeq (buildd,$(shell whoami))
BUILD_ALL_LANGPACKS=n
BUILDLANG:=en
@@ -134,6 +126,14 @@
--with-system-altlinuxhyph --with-system-curl
#CONFIGURE_FLAGS+= --with-system-neon
PATCHSET=Debian
+ PYTHON=/usr/bin/python
+ PYMAJOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
+ PYMINOR=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
+ # this is for only supporting the default version
+ # a.k.a a python-pyuno pkg
+ PYTHON_DEPENDS=$(shell echo "python (>= $(PYMAJOR).$(PYMINOR)), \
+ python (<< $(PYMAJOR).$$(($(PYMINOR) +1)))")
+ CONFIGURE_FLAGS+= --with-python=$(PYTHON)
else
## Woody backport
# use latest gcc-3.x compiler version
@@ -259,7 +259,7 @@
ifeq (deloutput,$(findstring deloutput,$(DEB_BUILD_OPTIONS)))
BUILDFLAGS+= --dlv_switch link deloutput
else
- # save disk space on buildds, thanks James Troup for the info...
+ # save disk space on buildds, thanks James Troup for the username info...
ifeq (buildd,$(shell whoami))
BUILDFLAGS+= --dlv_switch link deloutput
else
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- control 20 Apr 2004 15:19:25 -0000 1.162
+++ control 20 Apr 2004 16:00:55 -0000 1.163
@@ -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
+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]
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: