File ooo-build-3.0.0.9-prune-duplicities.diff of Package OpenOffice_org-bootstrap

--- bin/piece/file-list-calc
+++ bin/piece/file-list-calc
@@ -10,3 +10,6 @@
 
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
--- bin/piece/file-list-components
+++ bin/piece/file-list-components
@@ -18,8 +18,11 @@
 
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
+
 # solver is not in the file list, so rm is enough
 rm -f "$DESTDIR/$OO_INSTDIR/solver/bin/packinfo*.txt"
+rm -f "$DESTDIR/$OO_INSTDIR/solver/bin/userland.txt"
 
 exit 0
--- bin/piece/file-list-impress
+++ bin/piece/file-list-impress
@@ -15,3 +15,6 @@
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "draw"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
--- bin/piece/file-list-libs_core
+++ bin/piece/file-list-libs_core
@@ -42,6 +42,7 @@
 
 # mess
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/services.rdb"
 remove_dir  "files-$piece.txt" "$OO_INSTDIR/ure"
 
--- bin/piece/file-list-libs_extern
+++ bin/piece/file-list-libs_extern
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+$OO_TOOLSDIR/piece/merge-file-lists "files-$piece.txt" $DESTDIR/gid_*
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+
+exit 0
--- bin/piece/file-list-writer
+++ bin/piece/file-list-writer
@@ -17,3 +17,6 @@
 # install the prebuilt registry files
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "$piece"
 $OO_TOOLSDIR/piece/install-registry $piece $ooo_build_tag "math"
+
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
--- bin/piece/post-inst-postprocess
+++ bin/piece/post-inst-postprocess
@@ -40,5 +40,8 @@
 #        it has been already generated by bin/piece/file-list-ure
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/program/pythonloader.unorc"
 
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis3.0/ure-link"
+
 # no need for solver bits at this late stage
 rm -Rf "$DESTDIR/$OO_INSTDIR/solver"