Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv28016
Modified Files: Tag: OPENOFFICE_ORG_1_1_4 changelog rules Log Message: merge uuencode fix Index: changelog =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.417.2.12 retrieving revision 1.417.2.13 diff -u -d -r1.417.2.12 -r1.417.2.13 --- changelog 25 Feb 2005 07:34:08 -0000 1.417.2.12 +++ changelog 25 Feb 2005 10:10:30 -0000 1.417.2.13 @@ -24,10 +24,11 @@ - fix get-ooo-build to get right ooo-build branch [RE] - 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] * debian/control.in: - version conflict with kwin-style-baghira (<< 0.6) [CH] - -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Feb 2005 14:00:07 +0100 + -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 25 Feb 2005 11:01:13 +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.4 retrieving revision 1.253.2.5 diff -u -d -r1.253.2.4 -r1.253.2.5 --- rules 25 Feb 2005 07:57:36 -0000 1.253.2.4 +++ rules 25 Feb 2005 10:10:31 -0000 1.253.2.5 @@ -451,7 +451,7 @@ if [ -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \ uuencode $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \ ximian-openoffice-$$i.png \ - >> $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu &&\ + > $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu &&\ touch -r $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png.uu \ $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ;\ fi; \ @@ -605,7 +605,7 @@ touch -r $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/opens___.ttf.uu ;\ fi - # uuencode Ximian desktop icons + # uudecode Ximian desktop icons for i in calc draw impress math template web writer; do \ if [ ! -s $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png ]; then \ uudecode -o $(OOO_BUILD)/desktop/ximian-openoffice-$$i.png \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]