Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24287
Modified Files:
changelog control control.in openoffice.org-bin.install
openoffice.org.install rules
Log Message:
- Merge -gnome back into main packages and exclude msgbox-gnome
and getstyle-gnome from shared lib dependency generation [CH]
- Don't set C++ compiler on Woody to 'ccache ccache g++' and
simplify ccache logic [CH]
- Change $(TOOLS_DIR) to $(OOO_BUILD) [CH]
- Use Ximian's enhanced OpenSymbol font with extra glyphs [CH]
- Move sed operation on instdb.ins to disable desktop integration files
copy into install-arch target. This was the cause of error messages
about failure to copy files into ~/.gnome and ~/.kde. [CH]
- Split 'solver' target into two passes. 'solver' only builds BUILDLANG;
'solver.langpacks' builds all languages. This speeds up the development
cycle and binary-only autobuilds. [CH]
- openoffice.org and -bin Replaces: openoffice.org-gnome [CH]
- openoffice.org Suggests: openoffice.org-gnome removed [CH]
Index: openoffice.org.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org.install,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- openoffice.org.install 16 Oct 2003 12:53:13 -0000 1.31
+++ openoffice.org.install 11 Nov 2003 14:16:43 -0000 1.32
@@ -560,6 +560,7 @@
usr/lib/openoffice/share/gallery/www-graf/ylwright.gif
usr/lib/openoffice/share/gallery/www-graf/ylwup.gif
usr/lib/openoffice/share/icons
+usr/lib/openoffice/share/gnome/net/ooo645*.desktop usr/share/applications
usr/lib/openoffice/share/kde/net/.directory usr/share/applnk/OpenOffice.org1.1
usr/lib/openoffice/share/kde/net/*.desktop usr/share/applnk/OpenOffice.org1.1
usr/lib/openoffice/share/kde/net/share/icons usr/share
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- control.in 5 Nov 2003 01:30:56 -0000 1.103
+++ control.in 11 Nov 2003 14:16:43 -0000 1.104
@@ -10,9 +10,9 @@
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus
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)
-Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2)
+Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
OpenOffice.org 1.1 is a full-featured office productivity suite that provides
@@ -30,7 +30,6 @@
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
- * openoffice.org-gnome: GNOME integration of OpenOffice.org (Icons, ..)
* openoffice.org-mimelnk: OpenOffice.org MIME bindings
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
@@ -46,7 +45,7 @@
Architecture: i386 powerpc s390 sparc
Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
Conflicts: openoffice.org1.1-bin
-Replaces: openoffice.org1.1-bin
+Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Description: OpenOffice.org office suite binary files
OpenOffice.org is a full-featured office productivity suite that provides
@@ -80,13 +79,4 @@
suite.
.
It is executed automatically when OpenOffice.org crashes for some reason.
-
-Package: openoffice.org-gnome
-Architecture: i386 powerpc s390 sparc
-Section: gnome
-Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
-Suggests: gnome
-Description: GNOME desktop integration for OpenOffice.org
- This package contains parts of OpenOffice.org that integrate with the Gnome
- desktop, and provides Gnome menu icons.
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- rules 11 Nov 2003 08:51:31 -0000 1.164
+++ rules 11 Nov 2003 14:16:43 -0000 1.165
@@ -42,7 +42,12 @@
# Read in architecture-specific variables of importance.
include debian/scripts/vars.$(ARCH)
-CONFIGURE_FLAGS=
+# Default flags to pass to configure
+CONFIGURE_FLAGS= --enable-libart \
+ --disable-rpath \
+ --enable-crashdump \
+ --without-fonts \
+ --with-system-zlib
# If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the
# JDK at /absolute/path/to/jdk.
@@ -71,11 +76,11 @@
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
# Build langpacks for all known languages
LANGPACKISOS=$(shell debian/local/openoffice-xlate-lang -i all)
- CONFIGURE_FLAGS+=--with-lang=ALL
+ CONFIGURE_LANGPACK_FLAGS+=--with-lang=ALL
else
# Build only 1 language pack
LANGPACKISOS=$(BUILDLANG)
- CONFIGURE_FLAGS+=--with-lang=$(shell debian/local/openoffice-xlate-lang -r
$(BUILDLANG))
+ CONFIGURE_LANGPACK_FLAGS+=--with-lang=$(shell
debian/local/openoffice-xlate-lang -r $(BUILDLANG))
endif
# Prefix where setup is built
@@ -241,7 +246,7 @@
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
# that match the given targets will be removed automagically.
stampdir_targets=files.backup icons.scale patch.apply build.prepare.artwork
-stampdir_targets+=build.prepare configure bootstrap solver instsetoo
+stampdir_targets+=build.prepare configure bootstrap solver solver.langpacks
instsetoo
stampdir_targets+=setupins setup install-arch install-indep manifest
stampdir_targets+=langpacks binary-common binary-arch binary-indep
ifdef FORCE
@@ -295,7 +300,7 @@
#
# we do not need them and they make problem with dpkg-source....
- rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
+ rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png
cd $(SOURCE_TREE)/config_office && \
rm -f config.cache config.log \
@@ -313,9 +318,9 @@
offmgr/res/openintro_debian.bmp
# undo scaling (i.e. remove stamps, scaled icons)
- chmod 755 $(TOOLS_DIR)/bin/scale-icons
+ chmod 755 $(OOO_BUILD)/bin/scale-icons
if [ -d modified_files ]; then \
- $(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE) --remove ;\
+ $(OOO_BUILD)/bin/scale-icons $(SOURCE_TREE) --remove ;\
fi
# Delete all bmp and bmp.orig files if we have the backup
@@ -329,7 +334,7 @@
rm -f $(SOURCE_TREE)/extras/source/gallery/htmlexpo/*.png
# Delete artwork tarball
- rm -f $(TOOLS_DIR)/src/*tar.gz
+ rm -f $(OOO_BUILD)/src/*tar.gz
# and extracted artwork
rm -rf $(SOURCE_TREE)/$(OOO_ICONS_VER)
@@ -355,7 +360,7 @@
dh_clean
rm -rf $(STAMP_DIR) $(DEBTREEDIR) stlport-home
- rm -f makefile.mk $(ENVFILE) $(subst Env.Set.sh,Env.Set,$(ENVFILE)) \
+ rm -f makefile.mk $(ENVFILE) $(ENVFILE).langpacks $(subst
Env.Set.sh,Env.Set,$(ENVFILE)) \
bootstrap
$(MAKE) -f debian/rules control
@@ -380,7 +385,7 @@
build: build-arch build-indep
build-arch: $(STAMP_DIR)/instsetoo
-build-indep: $(STAMP_DIR)/solver
+build-indep: $(STAMP_DIR)/setupins
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
@@ -393,16 +398,16 @@
# make run the target over.
patch.apply: $(STAMP_DIR)/patch.apply
-$(STAMP_DIR)/patch.apply: $(TOOLS_DIR)/patches/$(PATCH_DIR)/apply
+$(STAMP_DIR)/patch.apply: $(OOO_BUILD)/patches/$(PATCH_DIR)/apply
# Test that we have the Ximian packaging directory available. If your
# build stops here, you need to check it out.
# You can get the directory with the command:
# debian/rules get-ooo-build
- dh_testdir $(TOOLS_DIR)/patches/apply.pl
+ dh_testdir $(OOO_BUILD)/patches/apply.pl
rm -f $(STAMP_DIR)/patch.unapply
- chmod 755 $(TOOLS_DIR)/patches/apply.pl
- $(TOOLS_DIR)/patches/apply.pl $(TOOLS_DIR)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f
+ chmod 755 $(OOO_BUILD)/patches/apply.pl
+ $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f
ifeq "$(USE_INTERNAL_FREETYPE)" "y"
# Woody system - unapply system-freetype patch
@@ -417,10 +422,10 @@
patch.unapply: $(STAMP_DIR)/patch.unapply
$(STAMP_DIR)/patch.unapply:
- dh_testdir $(TOOLS_DIR)/patches/apply.pl
+ dh_testdir $(OOO_BUILD)/patches/apply.pl
- chmod 755 $(TOOLS_DIR)/patches/apply.pl
- $(TOOLS_DIR)/patches/apply.pl $(TOOLS_DIR)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f -R
+ chmod 755 $(OOO_BUILD)/patches/apply.pl
+ $(OOO_BUILD)/patches/apply.pl $(OOO_BUILD)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f -R
rm -f $(STAMP_DIR)/patch.apply
mkdir -p $(STAMP_DIR)
@@ -451,15 +456,15 @@
icons.scale: $(STAMP_DIR)/icons.scale
$(STAMP_DIR)/icons.scale: $(STAMP_DIR)/files.backup
- chmod 755 $(TOOLS_DIR)/bin/scale-icons
- $(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE)
+ chmod 755 $(OOO_BUILD)/bin/scale-icons
+ $(OOO_BUILD)/bin/scale-icons $(SOURCE_TREE)
touch $@
# prepare source tree
build.prepare: $(STAMP_DIR)/build.prepare
$(STAMP_DIR)/build.prepare: $(STAMP_DIR)/patch.apply
- dh_testdir $(TOOLS_DIR)/patches/apply.pl
+ dh_testdir $(OOO_BUILD)/patches/apply.pl
$(MAKE) -f debian/rules control
@@ -493,7 +498,7 @@
touch $@
build.prepare.artwork: $(STAMP_DIR)/build.prepare.artwork
-$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/files.backup
$(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz.uu
+$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/files.backup
$(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz.uu
$(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/icons.scale
$(STAMP_DIR)/build.prepare.artwork: debian/openintro_debian.xcf.uu
@@ -506,8 +511,8 @@
# mogrify -colors 8 debian/openintro_debian.bmp && \
- cd $(TOOLS_DIR)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
- tar xzf $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz
+ cd $(OOO_BUILD)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
+ tar xzf $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz
# remove ximian about since we do not have the full Ximian edition...
rm -f $(OOO_ICONS_VER)/offmgr/res/openabout.bmp
@@ -566,18 +571,28 @@
# Remove config.cache so we always generate config again
rm -f $(SOURCE_TREE)/config_office/config.cache
- cd $(SOURCE_TREE)/config_office && autoconf && \
+ rm -f $(SOURCE_TREE)/$(ENVFILE).langpacks
+
+ cd $(SOURCE_TREE)/config_office && autoconf
+
+ # Run configure twice: The first time we generate an
+ # environemnt file for lang-specific file creation, the
+ # second for the binary build without all languages
+ cd $(SOURCE_TREE)/config_office && \
CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
- --enable-libart \
- --disable-rpath \
- --enable-crashdump \
- --without-fonts \
- --with-system-zlib \
$(CONFIGURE_FLAGS) \
- < /dev/null
- touch $@
+ $(CONFIGURE_LANGPACK_FLAGS) \
+ < /dev/null
+ mv $(SOURCE_TREE)/$(ENVFILE) $(SOURCE_TREE)/$(ENVFILE).langpacks
-# --with-python \
+ # Normal complete build with only one language
+ cd $(SOURCE_TREE)/config_office && \
+ CC="$(_CC)" CXX="$(CXX)" $(ARCH_PREFIX) sh ./configure \
+ $(CONFIGURE_FLAGS) \
+ --with-lang=$(shell debian/local/openoffice-xlate-lang -r
$(BUILDLANG)) \
+ < /dev/null
+
+ touch $@
# bootstrap build
bootstrap: $(STAMP_DIR)/bootstrap
@@ -613,9 +628,21 @@
touch $@
+# Build all projects needed for installation sets for all possible languages
+solver.langpacks: $(STAMP_DIR)/solver.langpacks
+$(STAMP_DIR)/solver.langpacks: $(STAMP_DIR)/bootstrap
+ dh_testdir
+ . $(SOURCE_TREE)/$(ENVFILE).langpacks; cd $(SOURCE_TREE)/instsetoo && \
+ $(BUILDCMD) $(STARTFROM) $(BUILDFLAGS) -- instsetext= $(DMAKEFLAGS)
+
+ # This also builds everything needed for solver target
+ touch $(STAMP_DIR)/solver
+
+ touch $@
+
# Build insetsetoo installation scrips for langpacks
setupins: $(STAMP_DIR)/setupins
-$(STAMP_DIR)/setupins: $(STAMP_DIR)/solver
+$(STAMP_DIR)/setupins: $(STAMP_DIR)/solver.langpacks
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
dh_testdir
# we don't want to build $(BUILDLANG_PREFIX) so remove it from the list
@@ -742,7 +769,6 @@
# Install files generated by setup into arch-dependent package directories
install-arch: $(STAMP_DIR)/install-arch
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-bin.install
-$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gnome.install
$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-crashrep.install
$(STAMP_DIR)/install-arch: $(STAMP_DIR)/manifest
dh_testdir
@@ -750,9 +776,8 @@
umask 022
# Remove package directories
- rm -rf $(MAINPKGDIR)-bin $(MAINPKGDIR)-gnome $(MAINPKGDIR)-crashrep \
+ rm -rf $(MAINPKGDIR)-bin $(MAINPKGDIR)-crashrep \
rm -f $(MAINPKGDIR)-bin.*.debhelper \
- $(MAINPKGDIR)-gnome.*.debhelper \
$(MAINPKGDIR)-crashrep.*.debhelper
dh_installdirs -a
@@ -818,14 +843,11 @@
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/configimport.bin \
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
- # convert program/icon paths in desktop shortcuts in gnome (arch-dep)
package
- for I in $(MAINPKGDIR)-gnome/usr/share/applications/*.desktop; do \
- sed -e
's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
- -e
's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),'
\
- -e 's,/oooffice ,/ooffice ,' \
- -e
's,Icon=.*/\([^/]*\.png\),Icon=/usr/lib/openoffice$(VER)/share/icons/\1,' \
- < "$$I" > "$$I.new" ;\
- rm "$$I"; mv "$$I.new" "$$I" ;\
+ # Disable desktop (KDE, GNOME, CDE) integration for user installs
+ # Copied from Mandrake. Thanks, Gwenole!
+ for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde
gid_Module_Optional_Cde; do \
+ perl -pi -e "/^Module $$module/ .. /^End/ and s|(Installed.*)=.*|\1=
NO;|" \
+ $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/instdb.ins ;\
done
touch $@
@@ -848,15 +870,9 @@
dh_installdirs -i
dh_install --sourcedir=debian/tmp -i
- # Disable desktop (KDE, GNOME, CDE) integration for user installs
- # Copied from Mandrake. Thanks, Gwenole!
- for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde
gid_Module_Optional_Cde; do \
- perl -pi -e "/^Module $$module/ .. /^End/ and s|(Installed.*)=.*|\1=
NO;|" \
- $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/instdb.ins ;\
- done
-
# convert program/icon paths in desktop shortcuts
- for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop; do \
+ for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
+ $(MAINPKGDIR)/usr/share/applications/*.desktop; do \
sed -e
's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
-e
's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),'
\
-e 's,/oooffice ,/ooffice ,' \
@@ -865,9 +881,6 @@
rm "$$I"; mv "$$I.new" "$$I" ;\
done
- # Workaround for co-existing 1.0 and 1.1 - don't install icons in
/usr/share/icons for 1.1 yet
- #rm -r $(MAINPKGDIR)/usr/share/icons
-
ifneq "$(MOZILLA)" "n"
cp -rf $(PKGOPENOFFICEDIR)/program/defaults \
$(MAINPKGDIR)/$(OPENOFFICEDIR)/program
@@ -914,12 +927,14 @@
ifeq "$(USE_FONTCONFIG)" "y"
mkdir -p $(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
- install -m644 $(PKGOPENOFFICEDIR)/share/fonts/truetype/opens___.ttf \
+ install -m644 $(OOO_BUILD)/fonts/opens___.ttf \
$(MAINPKGDIR)/usr/share/fonts/truetype/openoffice
else
mkdir -p $(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
- for i in fonts.dir fonts.dir.global opens___.ttf; do \
- install -m644 $(PKGOPENOFFICEDIR)/share/fonts/truetype/$$i \
+ for i in $(PKGOPENOFFICEDIR)/share/fonts/truetype/fonts.dir \
+ $(PKGOPENOFFICEDIR)/share/fonts/truetype/fonts.dir.global \
+ $(OOO_BUILD)/fonts/opens___.ttf; do \
+ install -m644 $$i \
$(MAINPKGDIR)/usr/lib/openoffice/share/fonts/truetype
endif
@@ -975,7 +990,7 @@
dh_installman
dh_installchangelogs
if [ -e $(MAINPKGDIR)/usr/share/doc/openoffice.org$(VER) ]; then \
- install -m644 ooo-build/ChangeLog \
+ install -m644 $(OOO_BUILD)/ChangeLog \
$(MAINPKGDIR)/usr/share/doc/openoffice.org/changelog.ooo-build \
&& gzip -f9 \
$(MAINPKGDIR)/usr/share/doc/openoffice.org/changelog.ooo-build; \
@@ -993,7 +1008,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps $(SHLIBS_OVERRIDE)
+ dh_shlibdeps -X msgbox-gnome -X getstyle-gnome $(SHLIBS_OVERRIDE)
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
@@ -1050,13 +1065,13 @@
get-ooo-build:
# press enter at the password prompt
cvs -d:pserver:[EMAIL PROTECTED]:/cvs/gnome login
- cvs -z3 -d:pserver:[EMAIL PROTECTED]:/cvs/gnome co -d $(TOOLS_DIR)
openoffice
+ cvs -z3 -d:pserver:[EMAIL PROTECTED]:/cvs/gnome co -d $(OOO_BUILD)
openoffice
# Download the latest icons
get-ooo-icons:
- test -d $(TOOLS_DIR)/src || mkdir $(TOOLS_DIR)/src
- wget -O $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz
http://ooo.ximian.com/packages/$(OOO_ICONS_VER).tar.gz
- uuencode $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz
$(OOO_ICONS_VER).tar.gz > $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz.uu
+ test -d $(OOO_BUILD)/src || mkdir $(OOO_BUILD)/src
+ wget -O $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz
http://ooo.ximian.com/packages/$(OOO_ICONS_VER).tar.gz
+ uuencode $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz
$(OOO_ICONS_VER).tar.gz > $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz.uu
# Take a tarfile of all the non-stripped binaries in solver, for generating
backtraces
# from coredumps.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- changelog 11 Nov 2003 08:51:31 -0000 1.232
+++ changelog 11 Nov 2003 14:16:43 -0000 1.233
@@ -25,6 +25,8 @@
same size as the original OOo (closes: #218585) [CH]
* Use Ximian icons version 1.1-6 and update MANIFESTs [CH]
* debian/rules:
+ - Merge -gnome back into main packages and exclude msgbox-gnome
+ and getstyle-gnome from shared lib dependency generation [CH]
- 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
@@ -38,6 +40,14 @@
- Replace diff usage of obsolete -0 flag with -U0 [CH]
- Don't enable debug symbols with gcc-3.0 (Woody backport),
because gcc-3.0 -g1 generates huge debug info [CH]
+ - Change $(TOOLS_DIR) to $(OOO_BUILD) [CH]
+ - Use Ximian's enhanced OpenSymbol font with extra glyphs [CH]
+ - Move sed operation on instdb.ins to disable desktop integration files
+ copy into install-arch target. This was the cause of error messages
+ about failure to copy files into ~/.gnome and ~/.kde. [CH]
+ - Split 'solver' target into two passes. 'solver' only builds BUILDLANG;
+ 'solver.langpacks' builds all languages. This speeds up the development
+ cycle and binary-only autobuilds. [CH]
* debian/control*:
- Build-Depends:
- libfontconfig1-dev | g++-3.0 to build without fontconfig on
@@ -47,6 +57,8 @@
require version >= 1.0.30 [CH]
- Tighten openoffice.org, openoffice.org-bin dependencies to
force -1 with the java libs off the system (closes:#218928) [CH]
+ - openoffice.org and -bin Replaces: openoffice.org-gnome [CH]
+ - openoffice.org Suggests: openoffice.org-gnome removed [CH]
* debian/MANIFEST.powerpc:
- Remove python-core so powerpc doesn't have to be built with
IGNORE_MANIFEST_CHANGES=1 [CH]
@@ -55,7 +67,7 @@
is compatible with other backports that need a newer
libfreetype (X 4.3, Gnome 2 etc.) [CH]
- -- Chris Halls <[EMAIL PROTECTED]> Tue, 11 Nov 2003 09:40:26 +0100
+ -- Chris Halls <[EMAIL PROTECTED]> Tue, 11 Nov 2003 11:09:22 +0100
openoffice.org (1.1.0-2) unstable; urgency=low
Index: openoffice.org-bin.install
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.install,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- openoffice.org-bin.install 8 Oct 2003 14:20:19 -0000 1.16
+++ openoffice.org-bin.install 11 Nov 2003 14:16:43 -0000 1.17
@@ -26,6 +26,7 @@
usr/lib/openoffice/program/filter/libira645l[ips3].so
usr/lib/openoffice/program/filter/libitg645l[ips3].so
usr/lib/openoffice/program/filter/libiti645l[ips3].so
+usr/lib/openoffice/program/getstyle-gnome
usr/lib/openoffice/program/gnomeint
usr/lib/openoffice/program/implreg.uno.so
usr/lib/openoffice/program/instdb.ins
@@ -160,6 +161,7 @@
usr/lib/openoffice/program/libxo645l[ips3].so
usr/lib/openoffice/program/libxsltdlg645l[ips3].so
usr/lib/openoffice/program/libzip645l[ips3].so
+usr/lib/openoffice/program/msgbox-gnome
usr/lib/openoffice/program/namingservice.uno.so
usr/lib/openoffice/program/nestedreg.uno.so
usr/lib/openoffice/program/pagein
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- control 5 Nov 2003 01:30:56 -0000 1.135
+++ control 11 Nov 2003 14:16:43 -0000 1.136
@@ -10,9 +10,9 @@
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.0-2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
-Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
+Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus
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)
-Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2)
+Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice.org-thesaurus-en,
openoffice.org-thesaurus, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
OpenOffice.org 1.1 is a full-featured office productivity suite that provides
@@ -30,7 +30,6 @@
* openoffice.org-thesaurus: Thesauri for the use with OpenOffice.org
* openoffice.org-hyphenation: Hyphenation patterns for OpenOffice.org
* ooqstart-gnome/oooqs-kde: Quick start applet for Gnome/KDE desktops
- * openoffice.org-gnome: GNOME integration of OpenOffice.org (Icons, ..)
* openoffice.org-mimelnk: OpenOffice.org MIME bindings
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
@@ -46,7 +45,7 @@
Architecture: i386 powerpc s390 sparc
Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
Conflicts: openoffice.org1.1-bin
-Replaces: openoffice.org1.1-bin
+Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
Description: OpenOffice.org office suite binary files
OpenOffice.org is a full-featured office productivity suite that provides
@@ -80,15 +79,6 @@
suite.
.
It is executed automatically when OpenOffice.org crashes for some reason.
-
-Package: openoffice.org-gnome
-Architecture: i386 powerpc s390 sparc
-Section: gnome
-Depends: openoffice.org (>> 1.0.99+1.1rc), ${shlibs:Depends}
-Suggests: gnome
-Description: GNOME desktop integration for OpenOffice.org
- This package contains parts of OpenOffice.org that integrate with the Gnome
- desktop, and provides Gnome menu icons.
Package: openoffice.org-l10n-en
Architecture: all
