CVS:oo-deb/debian README,1.29,1.30 changelog,1.218,1.219 control,1.129,1.130 control.in,1.97,1.98 rules,1.155,1.156
- To: debian-openoffice@lists.debian.org
- Subject: CVS:oo-deb/debian README,1.29,1.30 changelog,1.218,1.219 control,1.129,1.130 control.in,1.97,1.98 rules,1.155,1.156
- From: Chris Halls <halls@gluck.debian.org>
- Date: Fri, 24 Oct 2003 16:33:28 +0000
- Message-id: <[🔎] E1AD4sS-0002to-00@gluck.debian.org>
- Reply-to: debian-openoffice@lists.debian.org
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv10762
Modified Files:
README changelog control control.in rules
Log Message:
* Mention setup-in-bind-mount change in changelog
* debian/rules:
- Don't set C++ compiler on Woody to 'ccache ccache g++' and
simplify ccache logic [CH]
- 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]
* debian/control*:
- Build-Depends:
- libfontconfig1-dev | g++-3.0 to build without fontconfig on
Woody [CH]
* Use Ximian icons version 1.1-5 [CH]
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- rules 24 Oct 2003 10:41:05 -0000 1.155
+++ rules 24 Oct 2003 16:33:26 -0000 1.156
@@ -57,12 +57,20 @@
export IGNORE_MANIFEST_CHANGES
endif
+# You build just one language by passing lang=<langcode> such as 'en' in DEB_BUILD_OPTIONS
+ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
+ BUILD_ALL_LANGPACKS=n
+ BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
+endif
+
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
# Build langpacks for all known languages
- LANGPACKLANGS=all
+ LANGPACKISOS=$(shell debian/local/openoffice-xlate-lang -i all)
+ CONFIGURE_FLAGS+=--with-lang=ALL
else
# Build only 1 language pack
- LANGPACKLANGS=$(BUILDLANG)
+ LANGPACKISOS=$(BUILDLANG)
+ CONFIGURE_FLAGS+=--with-lang=$(shell debian/local/openoffice-xlate-lang -r $(BUILDLANG))
endif
# This is where the upstream install rules will put their stuff.
@@ -76,8 +84,8 @@
# automatic configuration for woody backports
# check that default compiler is not gcc 2.x (as it is on Woody)
ifneq (gcc-2.9,$(findstring gcc-2.9,$(shell readlink /usr/bin/gcc)))
- _CC=gcc
- CXX=g++
+ _CC:=gcc
+ CXX:=g++
#USE_SYSTEM_STLPORT=y
USE_SYSTEM_STLPORT=n
#CONFIGURE_FLAGS+= --with-stlport4-home=$(CURDIR)/stlport-home
@@ -85,8 +93,8 @@
CONFIGURE_FLAGS+= --enable-fontconfig
else
# use latest gcc-3.x compiler version
- _CC=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
- CXX=$(subst gcc,g++,$(_CC))
+ _CC:=$(shell cd /usr/bin; ls gcc-3.* | tail -1)
+ CXX:=$(subst gcc,g++,$(_CC))
# Don't use system libstlport
USE_SYSTEM_STLPORT=n
@@ -165,13 +173,8 @@
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
- CCACHE=ccache
- CCACHE_LOGFILE=$(STAMP_DIR)/ccache.log
_CC:=ccache $(_CC)
CXX:=ccache $(CXX)
- export CCACHE_LOGFILE
-else
- CCACHE=
endif
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -550,7 +553,6 @@
cd $(SOURCE_TREE)/config_office && autoconf && \
CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
- --with-lang=ALL \
--enable-libart \
--disable-rpath \
--enable-crashdump \
@@ -913,15 +915,15 @@
langpacks: $(STAMP_DIR)/langpacks
$(STAMP_DIR)/langpacks: $(STAMP_DIR)/setupins debian/local/openoffice-xlate-lang
- for ext in `debian/local/openoffice-xlate-lang -i $(LANGPACKLANGS) |tr A-Z a-z` ; do \
+ for ext in `echo $(LANGPACKISOS) |tr A-Z a-z` ; do \
rm -rf $(MAINPKGDIR)-l10n-$$ext;\
rm -rf $(MAINPKGDIR)-l10n-$$ext.*.debhelper;\
done
# Install the lang packs
- for prefix in `debian/local/openoffice-xlate-lang -p $(LANGPACKLANGS) `; do \
+ for prefix in $(LANGPACKISOS) ; do \
echo "Unpack "`debian/local/openoffice-xlate-lang -l $$prefix`" l10n..."; \
- langiso=`debian/local/openoffice-xlate-lang -i $$prefix|tr A-Z a-z`; \
+ langiso=`echo $$prefix | tr A-Z a-z`; \
debian/local/openoffice-dpack-lang \
-d="debian/openoffice.org$(VER)-l10n-$$langiso$(OPENOFFICEDIR)" \
-i=$(SOURCE_TREE)/instsetoo/$(ARCHBUILDDIR)/$$prefix/normal/setup.ins \
@@ -1017,10 +1019,13 @@
@echo '$$(_CC)' is "$(_CC)"
@echo '$$(CXX)' is "$(CXX)"
@echo '$$(BUILDCMD)' is "$(BUILDCMD)"
+ @echo '$$(CONFIGURE_FLAGS)' is "$(CONFIGURE_FLAGS)"
@echo '$$(BUILDFLAGS)' is "$(BUILDFLAGS)"
@echo '$$(DMAKEFLAGS)' is "$(DMAKEFLAGS)"
@echo '$$(SHLIBS_OVERRIDE)' is "$(SHLIBS_OVERRIDE)"
-
+ @echo '$$(BUILD_ALL_LANGPACKS)' is "$(BUILD_ALL_LANGPACKS)"
+ @echo '$$(BUILDLANG)' is "$(BUILDLANG)"
+
@echo 'See debian/control for build dependencies.'
# Get the ximian packaging directory from gnome anoncvs
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- control.in 22 Oct 2003 16:06:12 -0000 1.97
+++ control.in 24 Oct 2003 16:33:26 -0000 1.98
@@ -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, 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
Standards-Version: 3.5.6
Package: openoffice.org
Index: README
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README 15 Oct 2003 10:41:03 -0000 1.29
+++ README 24 Oct 2003 16:33:26 -0000 1.30
@@ -50,6 +50,9 @@
jdkhome=/absolute/path/to/jdk - use the JDK installed in this path.
+ lang=<code>
+ - Build only the specified language number
+
JDK Support
-----------
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- changelog 24 Oct 2003 08:33:25 -0000 1.218
+++ changelog 24 Oct 2003 16:33:26 -0000 1.219
@@ -1,3 +1,22 @@
+openoffice.org (1.1.0-2.3pre1) unstable; urgency=low
+
+ * Modified patches:
+ + setup-in-bind-mount: Use official fix from IZ#20459 using
+ realpath(); also return non-zero exit code on failure. [CH]
+ * debian/rules:
+ - Don't set C++ compiler on Woody to 'ccache ccache g++' and
+ simplify ccache logic [CH]
+ - 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]
+ * debian/control*:
+ - Build-Depends:
+ - libfontconfig1-dev | g++-3.0 to build without fontconfig on
+ Woody [CH]
+ * Use Ximian icons version 1.1-5 [CH]
+
+ -- Chris Halls <halls@debian.org> Fri, 24 Oct 2003 18:04:07 +0200
+
openoffice.org (1.1.0-2) unstable; urgency=low
* The "Wohoo-we-are-going-to-main" release.
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- control 22 Oct 2003 16:06:12 -0000 1.129
+++ control 24 Oct 2003 16:33:26 -0000 1.130
@@ -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, 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
Standards-Version: 3.5.6
Package: openoffice.org
@@ -97,12 +97,12 @@
Replaces: openoffice.org1.1-l10n-en
Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-en
Suggests: myspell-dictionary-en, openoffice.org-hyphenation-en, openoffice.org-thesaurus-en, openoffice.org-help-en
-Description: English (US) language package for openoffice.org
+Description: English US language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
with features comparable to Microsoft(R) Office features.
.
This package contains the localization of openoffice.org 1.1 in
- English (US).
+ English US.
It contains the user interface, the help, the templates and
the autotext features. (please note that not all this is available for
all possible language). You can switch user interface language using
@@ -529,12 +529,12 @@
Replaces: openoffice.org1.1-l10n-pt-br
Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-pt-br
Suggests: myspell-dictionary-pt-br, openoffice.org-hyphenation-pt-br, openoffice.org-thesaurus-pt-br, openoffice.org-help-pt-br
-Description: Brazilian Portuguese language package for openoffice.org
+Description: Português do Brasil language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
with features comparable to Microsoft(R) Office features.
.
This package contains the localization of openoffice.org 1.1 in
- Brazilian Portuguese.
+ Português do Brasil.
It contains the user interface, the help, the templates and
the autotext features. (please note that not all this is available for
all possible language). You can switch user interface language using
@@ -610,12 +610,12 @@
Replaces: openoffice.org1.1-l10n-zh-cn
Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-zh-cn
Suggests: myspell-dictionary-zh-cn, openoffice.org-hyphenation-zh-cn, openoffice.org-thesaurus-zh-cn, openoffice.org-help-zh-cn
-Description: Chinese (simplified) language package for openoffice.org
+Description: Chinese Simplified language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
with features comparable to Microsoft(R) Office features.
.
This package contains the localization of openoffice.org 1.1 in
- Chinese (simplified).
+ Chinese Simplified.
It contains the user interface, the help, the templates and
the autotext features. (please note that not all this is available for
all possible language). You can switch user interface language using
@@ -637,12 +637,12 @@
Replaces: openoffice.org1.1-l10n-zh-tw
Provides: openoffice.org-l10n-1.1.0.final, openoffice.org1.1-l10n-zh-tw
Suggests: myspell-dictionary-zh-tw, openoffice.org-hyphenation-zh-tw, openoffice.org-thesaurus-zh-tw, openoffice.org-help-zh-tw
-Description: Chinese (traditional) language package for openoffice.org
+Description: Chinese Traditional language package for openoffice.org
OpenOffice is a complete modern office suite, licensed under the GPL,
with features comparable to Microsoft(R) Office features.
.
This package contains the localization of openoffice.org 1.1 in
- Chinese (traditional).
+ Chinese Traditional.
It contains the user interface, the help, the templates and
the autotext features. (please note that not all this is available for
all possible language). You can switch user interface language using
Reply to: