CVS:oo-debian-files/bin oooprelink,1.10,1.11 openoffice,1.24,1.25

[Chris Halls]

Update of /home/halls/cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv30590/bin

Modified Files:
        oooprelink openoffice 
Log Message:
Merge changes from 1_1_1 branch to HEAD


Index: openoffice
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- openoffice  16 Feb 2004 12:34:54 -0000      1.24
+++ openoffice  16 Apr 2004 21:50:12 -0000      1.25
@@ -22,7 +22,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA      
 
 # this string should be exactly as in ~/.sversionrc
-OOVERSION="OpenOffice.org 1.1.0"
+OOVERSION="OpenOffice.org 1.1.1"
 VER=
 
 ##

Index: oooprelink
===================================================================
RCS file: /home/halls/cvs/debian-openoffice/oo-debian-files/bin/oooprelink,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- oooprelink  5 Jan 2004 03:04:10 -0000       1.10
+++ oooprelink  16 Apr 2004 21:50:12 -0000      1.11
@@ -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