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

CVS:oo-debian-files/bin oooprelink,1.10,1.10.2.1



Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv26534/bin

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_1
	oooprelink 
Log Message:
- target to experimental
- split prelinking to not try to prelink e.g. msgbox-gnome
- rc2-1+1


Index: oooprelink
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/oooprelink,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- oooprelink	5 Jan 2004 03:04:10 -0000	1.10
+++ oooprelink	16 Mar 2004 13:28:28 -0000	1.10.2.1
@@ -38,7 +38,14 @@
 	echo -n "Prelinking OpenOffice.org binaries... "
 	/usr/sbin/prelink $DEBUG \
 		--ld-library-path=/usr/lib/openoffice/program \
-		--conserve-memory /usr/lib/openoffice/
+		--conserve-memory --libs-only /usr/lib/openoffice/
+ 	/usr/sbin/prelink $DEBUG \
+		--ld-library-path=/usr/lib/openoffice/program \
+		--conserve-memory /usr/lib/openoffice/program/*.bin \
+		/usr/lib/openoffice/program/ooovirg \
+		/usr/lib/openoffice/program/regcomp \
+		/usr/lib/openoffice/program/pagein \
+		/usr/lib/openoffice/program/gnomeint
 	if [ ! -d /var/state/openoffice ]; then
 		mkdir -p /var/state/openoffice
 	fi
@@ -55,10 +62,17 @@
 elif [ "$prelink" = "false" ]; then
 	if [ -f /var/state/openoffice/ooo_is_prelinked ]; then
 		echo -n "Undoing prelinking of OpenOffice.org binaries... "
-		/usr/sbin/prelink --undo --all $DEBUG \
+		/usr/sbin/prelink --undo $DEBUG \
 			--ld-library-path=/usr/lib/openoffice/program \
 			--conserve-memory /usr/lib/openoffice \
 			2>/dev/null
+		#/usr/sbin/prelink --undo $DEBUG \
+		#	--ld-library-path=/usr/lib/openoffice/program \
+		#	--conserve-memory \
+		#	/usr/lib/openoffice/program/*.bin \
+		#	/usr/lib/openoffice/program/regcomp \
+		#	/usr/lib/openoffice/program/pagein \
+		#	/usr/lib/openoffice/program/gnomeint
 		rm -f /var/state/openoffice/ooo_is_prelinked
 		echo "done."
 	fi



Reply to: