CVS:oo-deb/debian changelog,1.221,1.222 control,1.130,1.131 control.in,1.98,1.99 rules,1.160,1.161
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25696/debian
Modified Files:
changelog control control.in rules
Log Message:
- if we are building under a user 'buildd' build only resources for en
- add missing libfreetype6-dev | g++-3.0 [!powerpc] to Build-Depends
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- rules 27 Oct 2003 10:32:51 -0000 1.160
+++ rules 28 Oct 2003 03:04:57 -0000 1.161
@@ -61,6 +61,11 @@
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
BUILD_ALL_LANGPACKS=n
BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
+else
+ ifeq (buildd,$(shell whoami))
+ BUILD_ALL_LANGPACKS=n
+ BUILDLANG:=en
+ endif
endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- control.in 24 Oct 2003 16:33:26 -0000 1.98
+++ control.in 28 Oct 2003 03:04:57 -0000 1.99
@@ -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.75-1) | bison (>= 1:1.875a-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, 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
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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, 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]
Standards-Version: 3.5.6
Package: openoffice.org
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- changelog 27 Oct 2003 09:46:51 -0000 1.221
+++ changelog 28 Oct 2003 03:04:57 -0000 1.222
@@ -10,6 +10,8 @@
- Add lang=<isocode> option to DEB_BUILD_OPTIONS. With this
set, resources for only the given language will be generated
and the build will be faster [CH]
+ - if we are building under a user 'buildd' build only resources for
+ en [RE]
- Remove openoffice/program directory from dh_shlibdeps
invocation - now there are more warnings again but ldd does
not crash sometimes when used with fakeroot [CH]
@@ -18,11 +20,12 @@
- Build-Depends:
- libfontconfig1-dev | g++-3.0 to build without fontconfig on
Woody [CH]
+ - add missing libfreetype6-dev | g++-3.0 [RE]
* debian/MANIFEST.powerpc:
- Remove python-core so powerpc doesn't have to be built with
IGNORE_MANIFEST_CHANGES=1 [CH]
- -- Chris Halls <halls@debian.org> Mon, 27 Oct 2003 09:46:20 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 28 Oct 2003 04:31:00 +0100
openoffice.org (1.1.0-2) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- control 24 Oct 2003 16:33:26 -0000 1.130
+++ control 28 Oct 2003 03:04:57 -0000 1.131
@@ -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.75-1) | bison (>= 1:1.875a-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, 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
+Build-Depends: bison (<= 1:1.75-1) | bison (>= 1:1.875a-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, 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]
Standards-Version: 3.5.6
Package: openoffice.org
Reply to: