@@ -43,7 +43,7 @@ package=#PACKAGE#
4343ours=# DEB_DISPLACE_EXTENSION#
4444theirs=# DEB_DISPLACE_EXTENSION#-orig
4545
46- displace_link_displace ()
46+ displace_link_divert ()
4747{
4848 file=$1
4949 ourfile=$2
@@ -76,7 +76,7 @@ displace_link()
7676 file=$prefix$suffix
7777 ourfile=$prefix$ours$suffix
7878 theirfile=$prefix$theirs$suffix
79- displace_link_displace " $file " " $ourfile " " $theirfile "
79+ displace_link_divert " $file " " $ourfile " " $theirfile "
8080 displace_link_symlink " $file " " $ourfile " " $theirfile "
8181}
8282
@@ -85,7 +85,7 @@ displace_hide()
8585 file=$1
8686 ourfile=" "
8787 theirfile=$2
88- displace_link_displace " $file " " $ourfile " " $theirfile "
88+ displace_link_divert " $file " " $ourfile " " $theirfile "
8989}
9090
9191undisplace_unlink_symlink ()
@@ -102,7 +102,7 @@ undisplace_unlink_symlink()
102102 fi
103103}
104104
105- undisplace_unlink_displace ()
105+ undisplace_unlink_divert ()
106106{
107107 file=" $1 "
108108 if [ ! -L " $file " ] && [ ! -e " $file " ]; then
@@ -122,13 +122,13 @@ undisplace_unlink()
122122 theirfile=$prefix$theirs$suffix
123123
124124 undisplace_unlink_symlink " $file " " $ourfile " " $theirfile "
125- undisplace_unlink_displace " $file "
125+ undisplace_unlink_divert " $file "
126126}
127127
128128undisplace_unhide ()
129129{
130130 file=$1
131- undisplace_unlink_displace " $file "
131+ undisplace_unlink_divert " $file "
132132}
133133
134134check_undisplace_unlink ()
0 commit comments