Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv18550
Modified Files:
changelog rules
Log Message:
- add lost config_office cleaning bits
- ignore the exitcode of $(ENVVFILE) sourcing
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- changelog 23 Oct 2003 15:47:24 -0000 1.217
+++ changelog 24 Oct 2003 08:33:25 -0000 1.218
@@ -1,4 +1,4 @@
-openoffice.org (1.1.0-1.2pre1) unstable; urgency=low
+openoffice.org (1.1.0-2) unstable; urgency=low
* The "Wohoo-we-are-going-to-main" release.
Many thanks to Josh Triplett (JT)..
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- rules 22 Oct 2003 16:06:12 -0000 1.151
+++ rules 24 Oct 2003 08:33:25 -0000 1.152
@@ -279,8 +279,14 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(TOOLS_DIR)/desktop/*.png $(TOOLS_DIR)/www/*.png
+ cd $(SOURCE_TREE)/config_office && \
+ rm -f config.cache config.log \
+ config.status config.parms \
+ warn set_soenv && \
+ rm -rf autom4te.cache
+
if [ -f $(SOURCE_TREE)/$(ENVFILE) ]; then \
- cd $(SOURCE_TREE) && . ./$(ENVFILE) && \
+ cd $(SOURCE_TREE) && . ./$(ENVFILE); \
dmake distclean; \
fi
