texlive-pstricks:version bump and fixed file conflicts
texlive-plainextra:version bump