Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv27454/debian
Modified Files:
changelog control.in rules
Log Message:
- Suggest openclipart (currently in NEW...)
- readd special-casing of built languages for Debian
(until we find out the cause of the double building on binary-only
builds)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -d -r1.412 -r1.413
--- changelog 6 Jan 2005 23:31:34 -0000 1.412
+++ changelog 9 Jan 2005 20:21:47 -0000 1.413
@@ -5,8 +5,11 @@
* debian/control.in:
- Suggest xlibmesa-gl | libgl1 [RE]
- Conflict against kwin-style-baghira, kwin-baghira (<< 0.6) [RE]
+ - Suggest openclipart (currently in NEW...) [RE]
+ * debian/rules:
+ - readd special-casing of built languages for Debian [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 5 Jan 2005 16:16:36 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 10 Jan 2005 05:50:47 +0100
openoffice.org (1.1.3-4) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- control.in 6 Jan 2005 23:31:35 -0000 1.163
+++ control.in 9 Jan 2005 20:21:47 -0000 1.164
@@ -10,7 +10,7 @@
Package: openoffice.org
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>>
1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) |
openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts, ttf-opensymbol
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1,
msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome |
openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1, openclipart
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2),
openoffice.org-gnome, openoffice.org-spellcheck-nb-no (<= 20020814-1),
openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1,
openoffice.org-l10n-1.1.2, kwin-style-baghira, kwin-baghira (<< 0.6)
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
@@ -34,6 +34,7 @@
* libsane: Use your sane-supported scanner with OpenOffice.org
* libxrender1: Speed up display by using Xrender library
* xlibmesa-gl / libgl1: OpenGL support
+ * openclipart: Open Clip Art Gallery
* msttcorefonts: Installs standard MS truetype fonts (contrib)
.
See README.Debian for information about using OpenOffice.org in Debian, known
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- rules 3 Jan 2005 01:56:26 -0000 1.252
+++ rules 9 Jan 2005 20:21:47 -0000 1.253
@@ -121,6 +121,14 @@
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
BUILD_ALL_LANGPACKS=n
BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*lang=\([^,]*\),.*/\1/p')
+ ifeq "$(DIST)" "Debian"
+ # 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
+ endif
+ endif
endif
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
