CVS:oo-deb/debian changelog,1.417.2.13,1.417.2.14 rules,1.253.2.5,1.253.2.6
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv23121
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog rules
Log Message:
merge clean fix
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.13
retrieving revision 1.417.2.14
diff -u -d -r1.417.2.13 -r1.417.2.14
--- changelog 25 Feb 2005 10:10:30 -0000 1.417.2.13
+++ changelog 25 Feb 2005 11:23:57 -0000 1.417.2.14
@@ -25,10 +25,11 @@
- add missing else to get the language-build special casing for the
buildds work again, makes them not build OOo completely twice.... [RE]
- fix typo at uuencoding, >, not >> [RE]
+ - minor fixes for clean target [RE]
* debian/control.in:
- version conflict with kwin-style-baghira (<< 0.6) [CH]
- -- Rene Engelhard <rene@debian.org> Fri, 25 Feb 2005 11:01:13 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 25 Feb 2005 12:16:36 +0100
openoffice.org (1.1.3-6) unstable; urgency=high
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.253.2.5
retrieving revision 1.253.2.6
diff -u -d -r1.253.2.5 -r1.253.2.6
--- rules 25 Feb 2005 10:10:31 -0000 1.253.2.5
+++ rules 25 Feb 2005 11:23:57 -0000 1.253.2.6
@@ -390,6 +390,7 @@
rm -f $(SOURCE_TREE)/external/glibc/rtufiles/readdir_r.c
rm -f $(SOURCE_TREE)/external/glibc/rtufiles/config.h
rm -f $(SOURCE_TREE)/external/glibc/rtufiles/makefile.mk
+ rm -f $(SOURCE_TREE)/external/glibc/patchinf
rm -f $(SOURCE_TREE)/svtools/bmpmaker/bmpmaker..dpr
@@ -473,7 +474,8 @@
rm -f external/common/parser.jar
# Files created in debian directory
- rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
+ rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm \
+ debian/openoffice.org-dev.links
rm -rf tools/$(ARCHBUILDDIR:.pro=.gnomevfs.pro)
Reply to: