CVS:oo-deb/debian changelog,1.309,1.310 rules,1.203,1.204
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv10200
Modified Files:
changelog rules
Log Message:
* Remove entry about Dan's patch to the help font size because it needs to go
into openoffice.org-help-* packages
* Delete *.orig files under helpcontent/unx that are created by the patch process
and get into the installation set if not removed.
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
Binary files /tmp/cvsobiwyi and /tmp/cvsual1ar differ
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- rules 30 Apr 2004 11:47:04 -0000 1.203
+++ rules 4 May 2004 10:00:16 -0000 1.204
@@ -546,9 +546,14 @@
endif
endif
- # In the 1.0.1 tarball, some scripts are not executable
- #chmod ugo+x $(SOURCE_TREE)/solenv/bin/*.pl
-
+ # applying gui-font-help-large-diff leaves .orig files
+ # in the directory that are added to the install set, so
+ # remove them. [The effects of this patch are not seen in
+ # the main packages, because we package the help source
+ # seperately, but we apply it anyway to help with testing
+ # install sets]
+ rm -f $(SOURCE_TREE)/helpcontent/unx/common/*/*.orig
+
# uudecode OpenSymbol font
if [ ! -s $(OOO_BUILD)/fonts/opens___.ttf ]; then \
uudecode -o $(OOO_BUILD)/fonts/opens___.ttf \
Reply to: