Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv18642
Modified Files:
changelog rules
Log Message:
kill ca from the ooo645*.desktop files for now
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -d -r1.407 -r1.408
--- changelog 24 Dec 2004 18:40:54 -0000 1.407
+++ changelog 2 Jan 2005 17:49:45 -0000 1.408
@@ -1,4 +1,4 @@
-openoffice.org (1.1.3-3.4pre) unstable; urgency=low
+openoffice.org (1.1.3-4) unstable; urgency=low
* Modified patches:
- vcl-gtk-rtl-fix.diff: move to end of [VCLPlug] section
@@ -19,8 +19,11 @@
(not needed since the binary-arch/indep split and breaks Ubuntu) [CH]
- don't add splashscreen on Ubuntu [CH]
- fix typo and substiute missed variables in setsdkenv_unix generation [RE]
+ - remove calc ca translation of the desktop files, CVS does weird things
+ with it (which results in breaking the encoding); also remove the rest
+ for consistency (closes: #284139) [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 24 Dec 2004 19:37:32 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 2 Jan 2005 17:42:19 +0100
openoffice.org (1.1.3-3) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- rules 24 Dec 2004 18:40:55 -0000 1.250
+++ rules 2 Jan 2005 17:49:45 -0000 1.251
@@ -1126,7 +1126,13 @@
sed -e s/" $(OOVERSIONNO)"// < $$i > $$i.new; \
mv $$i.new $$i; \
done
-
+
+ # HACK: somehow CVS breaks the encoding depending on the machine
+ # you check it out; kill ca for now
+ for I in $(MAINPKGDIR)/usr/share/applications/*.desktop; do \
+ perl -pi -e 's/Comment\[ca\].*\n//' $$I; \
+ done
+
# StartupNotify=true
for I in $(MAINPKGDIR)/usr/share/applications/*.desktop; do \
perl -pi -e 's/StartupNotify=.*/StartupNotify=true/' $$I; \
