Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv27521
Modified Files:
README changelog rules
Log Message:
* reorganise some sections in changelog
* README: remove instructions about prebuild moz libs
* rules: reorganise prepare targets so icons,backup,convert are independent
and don't have to run every time one of the others changes
* rules: update some of the comments
* scripts/vars: change OOO_ICONS_VER to 1_1-4
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- changelog 8 Oct 2003 17:39:02 -0000 1.206
+++ changelog 9 Oct 2003 15:17:24 -0000 1.207
@@ -3,12 +3,11 @@
* The "Wohoo-we-are-going-to-main" release.
Many thanks to Josh Triplett (JT)..
- * ignore python-core for the MANIFEST check [RE]
- * new patches (taken from Mandrake) [RE]
- - system-zlib: use system zlib
- - system-getopt: use the getopt from system's glibc...
* Build without a JDK. (closes: #211288) [JT]
* Added patches:
+ - system-zlib: use system zlib (from Mandrake) [RE]
+ - system-getopt: use the getopt from system's glibc
+ (from Mandrake) [RE]
- allow-no-jdk.diff [JT]: If java is disabled with --disable-java,
don't look for a JDK, but do look for xsltproc, and set XSLTPROC
in set_soenv.
@@ -61,7 +60,11 @@
* debian/README:
- update documentation to reflect that OpenOffice.org no longer requires
a JDK to build, but can optionally be built with one. [JT]
+ - remove instructions about prebuilt mozilla files needed because we
+ now build without on those platforms [CH]
+ - remove obsolete information old patch system [CH]
* debian/rules:
+ - ignore python-core for the MANIFEST check [RE]
- Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
(closes: #214673) [CH]
- conditionalize java support based on finding jdkhome in
@@ -76,6 +79,11 @@
of CONFIGURE_FLAGS [JT]
- move installation of files only built with a JDK into debian/rules
surrounded by a conditional [JT]
+ - removed (commented out) distcc section; you can use CCACHE_PREFIX or
+ distcc's masquerading instead without needing special support [CH]
+ - reorganise the build targets that are run before configure so backups
+ are only made once, and it is possible to repatch without converting
+ all the icons again [CH]
* debian/scripts/detect_java.sh:
- removed [JT]
* debian/setperms:
@@ -88,8 +96,9 @@
- Remove Build-Depends for j2sdk1.3 and lib*-java [JT]
- Build-Depend on xsltproc [JT]
- Move from contrib to main [JT]
+ * Use Ximian icons version 1.1-4 [CH]
- -- Chris Halls <[EMAIL PROTECTED]> Wed, 8 Oct 2003 13:32:49 +0200
+ -- Chris Halls <[EMAIL PROTECTED]> Thu, 9 Oct 2003 16:32:46 +0200
openoffice.org (1.1.0-1) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- rules 8 Oct 2003 14:20:19 -0000 1.136
+++ rules 9 Oct 2003 15:17:24 -0000 1.137
@@ -160,19 +160,6 @@
BUILDFLAGS+= $(BUILDPARALLEL)
DMAKEFLAGS+= $(DMAKEPARALLEL)
-# distcc will be used if DISTCC_HOSTS is set
-# The number of processes (-PP) will be set to the number of DISTCC_HOSTS,
unless you
-# override it with -PPn or -Pn in DEB_BUILD_OPTIONS
-#ifdef DISTCC_HOSTS
-# # If there were no -PP or -P options, set to number of distcc hosts
-# ifeq "$(PARALLEL)" ""
-# PARALLEL:=-PP$(strip $(shell echo $(DISTCC_HOSTS) | wc -w))
-# fi
-#
-# _CC:=distcc $(_CC)
-# CXX:=distcc $(CXX)
-#endif
-
# 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)))
@@ -335,6 +322,7 @@
# Restore modified files
if cd $(SOURCE_TREE)/modified_files; then \
find . -type f -exec cp -v -p {} ../{} \; ;\
+ rm -f $(STAMP_DIR)/icons.backup ;\
fi
rm -rf $(SOURCE_TREE)/modified_files
@@ -385,7 +373,7 @@
# make run the target over.
patch.apply: $(STAMP_DIR)/patch.apply
-$(STAMP_DIR)/patch.apply:
+$(STAMP_DIR)/patch.apply: $(TOOLS_DIR)/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:
@@ -414,15 +402,20 @@
chmod 755 $(TOOLS_DIR)/patches/apply.pl
$(TOOLS_DIR)/patches/apply.pl $(TOOLS_DIR)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f -R
rm -f $(STAMP_DIR)/patch.apply
+
mkdir -p $(STAMP_DIR)
touch $@
-# Build step 1 - prepare source tree
-build.prepare: $(STAMP_DIR)/build.prepare
-$(STAMP_DIR)/build.prepare: $(STAMP_DIR)/patch.apply
- dh_testdir $(TOOLS_DIR)/patches/apply.pl
+# Back up files that we must modify in the source, into modified_files.
+files.backup: $(STAMP_DIR)/files.backup
+$(STAMP_DIR)/files.backup:
- $(MAKE) -f debian/rules control
+ mkdir -p modified_files
+
+ # 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 -fp --parent {} modified_files \;
# Back up source files that we modify
for f in dmake/configure config_office/configure; do \
@@ -430,6 +423,26 @@
cp -v -p $$f modified_files/$$f ;\
done
+ mkdir -p $(STAMP_DIR)
+ touch $@
+
+# Scale all icons in the tree; a long process so it gets
+# its own target
+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)
+
+ 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
+
+ $(MAKE) -f debian/rules control
+
#rm -rf $(SOURCE_TREE)/external/gpc
ifeq "$(USE_SYSTEM_LIBS)" "y"
@@ -457,20 +470,10 @@
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
+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: debian/openintro_debian.xcf.uu
- # remove ximian about since we do not have the full Ximian edition...
- rm -f $(OOO_ICONS_VER)/offmgr/res/openabout.bmp
-
# add the splashscreen with the Debian logo
uudecode debian/openintro_debian.xcf.uu > \
debian/openintro_debian.xcf && \
@@ -479,8 +482,11 @@
# mogrify -colors 8 debian/openintro_debian.bmp && \
- chmod 755 $(TOOLS_DIR)/bin/scale-icons
- $(TOOLS_DIR)/bin/scale-icons $(SOURCE_TREE)
+ cd $(TOOLS_DIR)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
+ tar xzf $(TOOLS_DIR)/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
# Copy new artwork into the tree
cp -avf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
@@ -490,9 +496,10 @@
touch $@
-# Build step 2 - configure
+# After build preparation, run configure
configure: $(STAMP_DIR)/configure
-$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare
$(STAMP_DIR)/build.prepare.icons
+$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare $(STAMP_DIR)/icons.scale
+$(STAMP_DIR)/configure: $(STAMP_DIR)/build.prepare.artwork
dh_testdir
$(MAKE) -f debian/rules environment
@@ -546,7 +553,7 @@
# --with-python \
-# Build step 3 - bootstrap
+# bootstrap build
bootstrap: $(STAMP_DIR)/bootstrap
$(STAMP_DIR)/bootstrap: $(STAMP_DIR)/configure
dh_testdir
@@ -562,7 +569,7 @@
touch $@
-# Build step . - build all projects needed for installation sets but do not
yet create instsets
+# Build all projects needed for installation sets but do not yet create
instsets
solver: $(STAMP_DIR)/solver
$(STAMP_DIR)/solver: $(STAMP_DIR)/bootstrap
dh_testdir
@@ -571,7 +578,7 @@
touch $@
-# Build step . - build full installation set for BUILDLANG language
+# Build full installation set for BUILDLANG language
instsetoo: $(STAMP_DIR)/instsetoo
$(STAMP_DIR)/instsetoo: $(STAMP_DIR)/solver
dh_testdir
@@ -580,7 +587,7 @@
touch $@
-# Build step . - build insetsetoo installation scrips for langpacks
+# Build insetsetoo installation scrips for langpacks
setupins: $(STAMP_DIR)/setupins
$(STAMP_DIR)/setupins: $(STAMP_DIR)/solver
ifeq "$(BUILD_ALL_LANGPACKS)" "y"
@@ -593,7 +600,7 @@
touch $@
endif
-# Build step 4a - project (build individual project)
+# build individual project (optional)
# for an overview, see:
#
http://www.openoffice.org/dev_docs/source/build_linux.html#BuildingIndividualProjects
# This target is not used by the main build, but may be useful to just build a
troublesome project.
@@ -611,7 +618,7 @@
-echo Project $(PRJ) build successful
-# Build all projects until the given project
+# Build all projects until the given project (optional)
# e.g. debian/rules builduntil-transex3
builduntil-%: $(STAMP_DIR)/bootstrap
dh_testdir
@@ -622,7 +629,7 @@
-echo Project $(PRJ) build successful
#
-# Build step 5 - generate maintainer scripts
+# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
$(STAMP_DIR)/maintscripts: debian/shell-lib.sh debian/control
dh_testdir
@@ -686,6 +693,7 @@
touch $@
+# Compare files copied by setup with known list of files
manifest: $(STAMP_DIR)/manifest
$(STAMP_DIR)/manifest: debian/MANIFEST.$(ARCH) $(STAMP_DIR)/setup
dh_testdir
@@ -709,6 +717,7 @@
fi;
touch $@
+# 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
@@ -791,7 +800,7 @@
touch $@
-# Install files generated by setup into package directories
+# Install files generated by setup into arch-independent package directories
install-indep: $(STAMP_DIR)/install
$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER).install
$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER)-mimelnk.install
@@ -967,6 +976,9 @@
binary: binary-arch binary-indep
+# -------------------------------------------------------
+# Miscellaneous targets used to do a few useful operations
+
# Use 'debian/rules environment' to help debug architecture-related problems
# with the rules file.
environment:
@@ -986,15 +998,13 @@
@echo 'See debian/control for build dependencies.'
-# -------------------------------------------------------
-# Miscellaneous targets used to do a few useful operations
-
# Get the ximian packaging directory from gnome anoncvs
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
+# 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
Index: README
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/README,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- README 8 Oct 2003 14:20:19 -0000 1.26
+++ README 9 Oct 2003 15:17:24 -0000 1.27
@@ -65,34 +65,6 @@
We are working on adding support for other JDKs to OOo. See this issue for
progress:
http://www.openoffice.org/issues/show_bug.cgi?id=10477
-Installing moz zips for powerpc, s390 and sparc
------------------------------------------------
-If you are building for powerpc, you need to manually get some precompiled
-files for mozilla. Jan has compiled these with gcc 3.2.1 and you can find
them here:
-
- http://sevdalia.hajvan.net/~palic/debian/OpenOffice.org/mozlibs/
-
- mkdir mozlibs; cd mozlibs
- wget -l2 -L -np --accept "*.zip" -nd -nH -m
http://sevdalia.hajvan.net/~palic/debian/OpenOffice.org/mozlibs/
-
-If you are building for s390, you need to manually get some precompiled
-files for mozilla. Gerhard has compiled these with gcc 3.2.2 and you can find
-them here:
-
- http://people.debian.org/~gt/mozlibs/
-
- mkdir mozlibs; cd mozlibs
- wget -l2 -L -np --accept "*.zip" -nd -nH -m
http://people.debian.org/~gt/mozlibs/
-
-If you are building for sparc; you need to manually get some precompiled
-files for mozilla. René has compiled these with gcc 3.2.3 and you can find
-them here:
-
- http://people.debian.org/~rene/openoffice.org/mozlibs/sparc
-
- mkdir mozlibs; cd mozlibs
- wget -l2 -L -np --accept "*.zip" -nd -nH -m
http://people.debian.org/~rene/openoffice.org/mozlibs/sparc/
-
The targets that are built during the package build
---------------------------------------------------
@@ -187,54 +159,10 @@
Build system file layout
========================
- Note: for OpenOffice builds, we have modified the build system to support
- binary patches that have been uuencoded (extension .uu).
-
- A chunk of makefile implementing Doogie's Build System (this is a pretty
- old, prototypical version, but it works well enough for me). You
- shouldn't need to use this makefile directly; you can call the rules you
- need from debian/rules. The purpose of Doogie's Build System is to avoid
- a difficult-to-manage Debian .diff.gz file by keeping our patches to the
- upstream sources separate and applying them at package build time. Here
- are a couple of targets that I have found useful:
- debian/rules source.unpack Simply unpacks the source
- archive(s); does not apply any
- Debian patches.
- debian/rules source.make Unpacks the source archive(s) and
- applies Debian patches.
- debian/rules checksource Unpacks the source archive(s),
- applies Debian patches, and ensures
- that the patches applied cleanly.
-
scripts:
Directory containing the internals of Doogie's Build System. If any
architecture-specific make variables need to be declared, you may do so
debian/scripts/vars.$(ARCH).
-
-patches:
- Directory containing patches applied in ASCIIbetical order.
- numeric prefix indicates disposition of patch
- 000 patches FROM upstream
-
- 001-899 patches that should be sent upstream
-
- 001-099 general-purpose patches
- 100-149 sparc/sparc64 architecture patches
- 150-199 powerpc architecture patches
- 200-249 alpha architecture patches
- 250-299 m68k architecture patches
- 300-349 arm architecture patches
- 350-399 mips/mipsel architecture patches
- 400-449 hppa architecture patches
- 450-499 ia64 architecture patches
- 500-549 s390 architecture patches
- 800-849 GNU Hurd kernel patches
-
- 900-999 patches that should not be sent upstream
-
- 900-998 Debian-specific behavior and enhancements
- 999 experimental or debugging patches (should not
- generally be present in a production release)
local:
This contains Debian-specific programs and documentation that we include
