Hi,
probably too late for RC3 packages, but here's a patch to integrate the
icons from OOoXE into the Debian build system.
Some additional patches are necessary:
gui-icon-composite.diff
gui-tbx-ctrl-bg.diff
gui-tbx-new-size.diff
gui-new-icons.diff would be nice, too.
Use the get-ooo-icons target to download the latest icons.
The MANIFEST has to be changed, but .install files can be left
untouched.
And, well, I didn't compile from scratch with exactly these changes,
so...
HTH anyway,
Martin
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.120
diff -u -r1.120 rules
--- rules 28 Aug 2003 10:15:42 -0000 1.120
+++ rules 28 Aug 2003 20:55:28 -0000
@@ -275,9 +275,8 @@
#
# we do not need them and they make problem with dpkg-source....
- rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/src/*tar.gz \
- $(TOOLS_DIR)/www/*.png
-
+ rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
+
# Clean rule, if we had a system dmake..
#if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
# cd $(SOURCE_TREE) && . ./$(ENVFILE) && \
@@ -293,13 +292,27 @@
$(SOURCE_TREE)/solver \
$(SOURCE_TREE)/dmake/autom4te.cache
+ # undo scaling (i.e. remove stamps, scaled icons)
+ $(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE) --remove
+
+ # Delete all bmp and bmp.orig files
+ find . ! -path './ooo-icons*' -a ! -path './debian*' \
+ -a ! -path *unx*.pro* -a ! -path './modified_files*' \
+ -a \( -name '*.bmp*' -o -name '*.bmp.org' \) -exec rm {} \;
+
+ # Delete artwork tarball
+ rm -f $(TOOLS_DIR)/src/*tar.gz
+
+ # and extracted artwork
+ rm -rf $(SOURCE_TREE)/$(OOO_ICONS_VER)
+
# Restore modified files
if cd $(SOURCE_TREE)/modified_files; then \
find . -type f -exec cp -v -p {} ../{} \; ;\
fi
rm -rf $(SOURCE_TREE)/modified_files
-
+
# Delete files in dmake
if [ -f dmake/Makefile ];then $(MAKE) -C dmake distclean; fi
rm -f dmake/dmakeroot.h
@@ -334,9 +347,6 @@
build: build-arch build-indep
build-arch: $(STAMP_DIR)/instsetoo
build-indep: $(STAMP_DIR)/solver
-#
-# apply ximian patches and install new icons
-debian/stampdir/source.patch: debian/stampdir/ximian.patchapply debian/stampdir/ximian.icons
# 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
@@ -385,7 +395,7 @@
dh_testdir $(TOOLS_DIR)/patches/apply.pl
$(MAKE) -f debian/rules control
-
+
# Back up source files that we modify
for f in dmake/configure config_office/configure; do \
mkdir -p modified_files/`dirname $$f` && \
@@ -419,9 +429,28 @@
touch $@
+build.prepare.icons: $(STAMP_DIR)/build.prepare.icons
+$(STAMP_DIR)/build.prepare.icons: $(STAMP_DIR)/build.prepare
+
+ # Back up all bmp files (!)
+ find . ! -path './ooo-icons*' -a ! -path './debian*' \
+ -a ! -path *unx*.pro* -a ! -path './modified_files*' \
+ -a -name '*.bmp' -exec cp -vfp --parent {} modified_files \;
+
+ cd $(TOOLS_DIR)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
+ tar xzf $(TOOLS_DIR)/src/$(OOO_ICONS_VER).tar.gz
+
+ $(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE)
+
+ # Copy new artwork into the tree
+ cp -avf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
+
+ # Force rebuild of image lists etc.
+ #find $(SOURCE_TREE) -name '*.src' -exec touch {} \;
+
# Build step 2 - configure
configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare
+$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare $(STAMP_DIR)/build.prepare.icons
dh_testdir
$(MAKE) -f debian/rules environment
@@ -448,8 +477,7 @@
$(CONFIGURE_FLAGS) \
< /dev/null
touch $@
-
-# --without-fonts \
+
# --with-python \
# Build step 3 - bootstrap
@@ -816,6 +844,11 @@
# 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
+
+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
# Get latest patch files from Chris' repository
PATCHNAME=000_prerc3_stolen_from_ooo11rc3
cvs server: Diffing local
cvs server: Diffing local/scripts
cvs server: Diffing po
cvs server: Diffing scripts
Index: scripts/vars
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/scripts/vars,v
retrieving revision 1.22
diff -u -r1.22 vars
--- scripts/vars 14 Aug 2003 17:20:48 -0000 1.22
+++ scripts/vars 28 Aug 2003 20:55:28 -0000
@@ -18,6 +18,9 @@
# Directory of patch apply file
PATCH_DIR=OOO_1_1_RC3
+# Ximian icons
+OOO_ICONS_VER=ooo-icons-RC3-3
+
SOURCE_TREE=.
# Language to use to generate main packages
