Merge lp:~andrea.corbellini/beeseek/proxy-setup.py into lp:beeseek

Proposed by Andrea Corbellini
Status: Merged
Merged at revision: 41
Proposed branch: lp:~andrea.corbellini/beeseek/proxy-setup.py
Merge into: lp:beeseek
Diff against target: 61 lines (+37/-0)
3 files modified
.bzrignore (+1/-0)
trackers/proxy/Makefile (+5/-0)
trackers/proxy/setup.py (+31/-0)
To merge this branch: bzr merge lp:~andrea.corbellini/beeseek/proxy-setup.py
Reviewer Review Type Date Requested Status
Andrea Colangelo Approve
Lorenzo Allegrucci Approve
Review via email: mp+29538@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lorenzo Allegrucci (l-allegrucci) wrote :

ok as the previous one

review: Approve
Revision history for this message
Andrea Colangelo (warp10) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-07-08 07:22:54 +0000
3+++ .bzrignore 2010-07-09 11:23:43 +0000
4@@ -1,2 +1,3 @@
5 node/beeseek/_version_info.py
6+trackers/proxy/build/
7 trackers/sniffer/beeseek-sniffer
8
9=== modified file 'trackers/proxy/Makefile'
10--- trackers/proxy/Makefile 2010-07-08 07:03:54 +0000
11+++ trackers/proxy/Makefile 2010-07-09 11:23:43 +0000
12@@ -2,8 +2,13 @@
13 # GNU Affero General Public License version 3 (see the file LICENSE).
14
15 build:
16+ python3 setup.py build
17+
18+install: build
19+ python3 setup.py install
20
21 check:
22 python3 ../../tools/test-proxy.py
23
24 clean:
25+ python3 setup.py clean
26
27=== added file 'trackers/proxy/setup.py'
28--- trackers/proxy/setup.py 1970-01-01 00:00:00 +0000
29+++ trackers/proxy/setup.py 2010-07-09 11:23:43 +0000
30@@ -0,0 +1,31 @@
31+#!/usr/bin/python3
32+# Copyright 2010 BeeSeek Developers. This software is licensed under the
33+# GNU Affero General Public License version 3 (see the file LICENSE).
34+
35+import os.path
36+from distutils.core import setup
37+
38+setup(
39+ name='BeeSeek Proxy',
40+ version='1.1',
41+ author='BeeSeek Developers',
42+ author_email='feedback@beeseek.org',
43+ url='http://www.beeseek.org/',
44+ description='HTTP proxy that tracks the pages visited by the user',
45+ long_description=
46+ 'This proxy works by injecting a JavaScript script in each page\n'
47+ "visited by the user. This script tracks the user's actions and\n"
48+ 'sends the information to a node of the BeeSeek network, that will\n'
49+ 'store it anonymously in the database.\n',
50+ download_url='https://launchpad.net/beeseek/+download',
51+ classifiers=[
52+ 'Development Status :: 1 - Planning',
53+ 'Environment :: Web Environment',
54+ 'Intended Audience :: System Administrators',
55+ 'License :: OSI Approved :: GNU Affero General Public License v3',
56+ 'Operating System :: OS Independent',
57+ 'Topic :: Internet :: WWW/HTTP :: Indexing/Search'],
58+ packages=[
59+ path for path, _, files in os.walk('beeseekproxy')
60+ if '__init__.py' in files],
61+ scripts=['beeseek-proxy'])

Subscribers

People subscribed via source and target branches