upgpkg: r 3.1.1-1

update to 3.1.1; remove upstream patch

git-svn-id: file:///srv/repos/svn-packages/svn@218370 eb2447ed-0c53-47e4-bac8-5bc4a241df78
archrelease: copy trunk to extra-i686, extra-x86_64

git-svn-id: file:///srv/repos/svn-packages/svn@218371 eb2447ed-0c53-47e4-bac8-5bc4a241df78