[Pkg-privacy-commits] [torbrowser-launcher] 52/476: merge conflict

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit efbdd8f8f1eb909ec1eafaa2073e7d0d182b0221
Merge: f26c98f 8d08df3
Author: Micah Lee <micahflee at riseup.net>
Date:   Mon Feb 18 12:39:45 2013 -0800

    merge conflict

 keys/README                 |   6 ++
 erinn.asc => keys/erinn.asc |   0
 keys/sebastian.asc          | 161 ++++++++++++++++++++++++++++++++++++++++++++
 setup.py                    |   2 +-
 verify.sh                   |   1 +
 5 files changed, 169 insertions(+), 1 deletion(-)

diff --cc setup.py
index ad7cda5,f794dc6..cf071c4
--- a/setup.py
+++ b/setup.py
@@@ -19,6 -19,6 +19,6 @@@ Tor Browser Launcher will get updated e
  
        scripts=['torbrowser-launcher'],
        data_files=[('/usr/share/applications', ['torbrowser.desktop']),
 -                  ('/usr/share/pixmaps', ['torbrowser32.xpm', 'torbrowser80.xpm']),
 +                  ('/usr/share/pixmaps', ['img/torbrowser32.xpm', 'img/torbrowser80.xpm']),
-                   ('/usr/share/torbrowser-launcher', ['erinn.asc', 'verify.sh'])]
+                   ('/usr/share/torbrowser-launcher', ['keys/erinn.asc', 'keys/sebastian.asc', 'verify.sh'])]
        )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git