CVS:oo-deb/debian .cvsignore,1.9,1.10 changelog,1.276,1.277 rules,1.184,1.185
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv12565
Modified Files:
.cvsignore changelog rules
Log Message:
remove version infos from the remaining .desktop files to get them synchron; add openoffice.org-thesaurus-??-?? to .cvsignore, forgotten
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- rules 22 Mar 2004 15:20:14 -0000 1.184
+++ rules 25 Mar 2004 13:58:30 -0000 1.185
@@ -918,14 +918,18 @@
rm -f vnd.sun.xml.$$i.desktop; \
done
- # remove the version from the files
- cd $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/application && \
- for i in *; do \
- TMP=`mktemp -q`; \
- cat $$i | sed -e s/"1.1.1 "// > $$TMP && \
- mv $$TMP $$i; \
- done
-
+ # remove the version number from the .desktop files
+ for i in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
+ $(MAINPKGDIR)/usr/share/applications/*.desktop \
+ $(MAINPKGDIR)-mimelnk/usr/share/mimelnk/*/*.desktop; do \
+ sed -e s/"$(OOVERSIONNO) "// < $$i > $$i.new; \
+ mv $$i.new $$i; \
+ done && \
+ for i in $(MAINPKGDIR)/usr/share/applnk/*/.directory; do \
+ sed -e s/" $(OOVERSIONNO)"// < $$i > $$i.new; \
+ mv $$i.new $$i; \
+ done
+
# convert program/icon paths in desktop shortcuts
for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
$(MAINPKGDIR)/usr/share/applications/*.desktop; do \
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- changelog 23 Mar 2004 02:54:08 -0000 1.276
+++ changelog 25 Mar 2004 13:58:30 -0000 1.277
@@ -5,10 +5,12 @@
least 1.1.1rc3 (closes: #239193) [CH]
* debian/rules:
- Remove new binary bitmaps for Red Hat [CH]
+ - remove version infos from the remaining .desktop files to get
+ them synchron (closes: #224313) [RE]
* debian/shell-lib.sh:
- add message() taken from xfree86 (closes: #233424)
- -- Rene Engelhard <rene@debian.org> Tue, 23 Mar 2004 03:52:17 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 25 Mar 2004 01:06:23 +0100
openoffice.org (1.1.0+cvs20040317-1) unstable; urgency=low
Index: .cvsignore
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- .cvsignore 11 Oct 2003 18:35:26 -0000 1.9
+++ .cvsignore 25 Mar 2004 13:58:30 -0000 1.10
@@ -8,6 +8,7 @@
openoffice.org-mimelnk
openoffice.org-l10n-??
openoffice.org-l10n-??-??
+openoffice.org-thesaurus-??-??
openoffice.org.substvars
openoffice.org-*.substvars
openintro_debian.bmp
Reply to: