[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian rules,1.214.2.13,1.214.2.14



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv9470

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_2
	rules 
Log Message:
don't add an abolute icon patch and strip it away again just after this :-), thanks martink

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.13
retrieving revision 1.214.2.14
diff -u -d -r1.214.2.13 -r1.214.2.14
--- rules	6 Jul 2004 19:46:22 -0000	1.214.2.13
+++ rules	7 Jul 2004 20:18:10 -0000	1.214.2.14
@@ -1009,19 +1009,12 @@
 	    sed -e 's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
 	        -e 's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),' \
 		-e 's,/oooffice ,/ooffice ,' \
-	        -e 's,Icon=.*/\([^/]*\.png\),Icon=/usr/lib/openoffice$(VER)/share/icons/\1,' \
+		-e 's,Icon=.*/\([^/]*\.png\),Icon=\1,' \
+		-e 's,\.png,,' \
 	        < "$$I" > "$$I.new" ;\
 	    rm "$$I"; mv "$$I.new" "$$I" ;\
 	done
 
-	# strip absolute paths in .desktop files
-	for i in $(MAINPKGDIR)/usr/share/applications/*.desktop; do \
-		sed -e s,/usr/lib/openoffice/share/icons/,, \
-		    -e s/\.png// \
-		   < $$i > $$i.new ;\
-		rm $$i; mv $$i.new $$i; \
-	done
-	
 	# insert NoDisplay=true to force the extra dir not being displayed
 	# on KDE 3.2
 	echo "NoDisplay=true" >> \



Reply to: