[Python-apps-commits] r11064 - in packages/apachedex/trunk (16 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Mon Jul 14 06:37:16 UTC 2014
Date: Monday, July 14, 2014 @ 06:37:15
Author: arnau
Revision: 11064
[svn-inject] Applying Debian modifications (1.6.2-1) to trunk
Added:
packages/apachedex/trunk/debian/
packages/apachedex/trunk/debian/changelog
packages/apachedex/trunk/debian/compat
packages/apachedex/trunk/debian/control
packages/apachedex/trunk/debian/copyright
packages/apachedex/trunk/debian/docs
packages/apachedex/trunk/debian/patches/
packages/apachedex/trunk/debian/patches/do-not-use-embedded-js.patch
packages/apachedex/trunk/debian/patches/ignore-non-supported-apache-log-formats.patch
packages/apachedex/trunk/debian/patches/logfile-required-if-no-state-file.patch
packages/apachedex/trunk/debian/patches/series
packages/apachedex/trunk/debian/rules
packages/apachedex/trunk/debian/source/
packages/apachedex/trunk/debian/source/format
packages/apachedex/trunk/debian/source/options
packages/apachedex/trunk/debian/watch
Property changes on: packages/apachedex/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/apachedex/trunk/debian/changelog
===================================================================
--- packages/apachedex/trunk/debian/changelog (rev 0)
+++ packages/apachedex/trunk/debian/changelog 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,5 @@
+apachedex (1.6.2-1) unstable; urgency=low
+
+ * Initial upload. Closes: #754352.
+
+ -- Arnaud Fontaine <arnau at debian.org> Fri, 11 Jul 2014 12:01:19 +0900
Added: packages/apachedex/trunk/debian/compat
===================================================================
--- packages/apachedex/trunk/debian/compat (rev 0)
+++ packages/apachedex/trunk/debian/compat 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1 @@
+7
Added: packages/apachedex/trunk/debian/control
===================================================================
--- packages/apachedex/trunk/debian/control (rev 0)
+++ packages/apachedex/trunk/debian/control 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,43 @@
+Source: apachedex
+Maintainer: Arnaud Fontaine <arnau at debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Section: python
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3),
+ python (>= 2.6.6-3),
+ debhelper (>= 7.4.3)
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.7
+Homepage: http://git.erp5.org/gitweb/apachedex.git
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/apachedex/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/apachedex/trunk/
+
+Package: apachedex
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ libjs-jquery,
+ libjs-jquery-ui (>= 1.10),
+ libjs-jquery-flot
+Description: Compute APDEX from Apache-style logs
+ APacheDEX parses Apache-style logs and generates several statistics
+ intended for a website developer audience:
+ .
+ * APDEX (Application Performance inDEX, see http://www.apdex.org) ratio
+ (plotted) because you want to know how satisfied your users are.
+ .
+ * hit count (plotted) because achieving 100% APDEX is easy when there
+ is nobody around.
+ .
+ * HTTP status codes, with optional detailed output of the most frequent
+ URLs per error status code, along with their most frequent referers
+ because your forgot to update a link to that conditionally-used
+ browser compatibility javascript you renamed.
+ .
+ * Hottest pages (pages which use rendering time the most) because you
+ want to know where to invest time to get highest user experience
+ improvement.
+ .
+ * ERP5 sites: per-module statistics, with module and document views
+ separated because module and document types are not born equal in
+ usage patterns.
Added: packages/apachedex/trunk/debian/copyright
===================================================================
--- packages/apachedex/trunk/debian/copyright (rev 0)
+++ packages/apachedex/trunk/debian/copyright 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,64 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: APacheDEX
+Upstream-Contact: Vincent Pelletier <vincent at nexedi.com>
+Source: https://pypi.python.org/pypi/APacheDEX/
+Files-Excluded: apachedex/jquery-ui.js
+ apachedex/jquery.flot.js
+ apachedex/jquery.flot.time.js
+ apachedex/jquery.js
+ apachedex/jquery.flot.labels.js
+
+Files: *
+Copyright: 2013 Nexedi SA and Contributors
+ 2013 Vincent Pelletier <vincent at nexedi.com>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2014, Arnaud Fontaine <arnaud at debian.org>
+License: GPL-2+
+
+Files: apachedex/jquery.flot.axislabels.js
+Copyright: 2010-2012 Xuan Luo
+License: Expat
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Added: packages/apachedex/trunk/debian/docs
===================================================================
--- packages/apachedex/trunk/debian/docs (rev 0)
+++ packages/apachedex/trunk/debian/docs 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,2 @@
+README.rst
+TODO
Added: packages/apachedex/trunk/debian/patches/do-not-use-embedded-js.patch
===================================================================
--- packages/apachedex/trunk/debian/patches/do-not-use-embedded-js.patch (rev 0)
+++ packages/apachedex/trunk/debian/patches/do-not-use-embedded-js.patch 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,42 @@
+Description: Use libjs-jquery* packages when available rather than embedded ones
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+
+Index: apachedex-1.6.2/setup.py
+===================================================================
+--- apachedex-1.6.2.orig/setup.py
++++ apachedex-1.6.2/setup.py
+@@ -10,33 +10,14 @@ if sys.version_info >= (3, ):
+ else:
+ from urllib import urlretrieve
+
+-FLOT_SHA = 'aefe4e729b2d14efe6e8c0db359cb0e9aa6aae52'
+ FLOT_AXISLABELS_SHA = '80453cd7fb8a9cad084cf6b581034ada3339dbf8'
+-JQUERY_VERSION = '1.9.1'
+-JQUERY_UI_VERSION = '1.10.2'
+
+ DEPS = {
+- 'jquery.flot.js': (
+- 'http://raw.github.com/flot/flot/%s/jquery.flot.js' % FLOT_SHA,
+- '7b599c575f19c33bf0d93a6bbac3af02',
+- ),
+- 'jquery.flot.time.js': (
+- 'http://raw.github.com/flot/flot/%s/jquery.flot.time.js' % FLOT_SHA,
+- 'c0aec1608bf2fbb79f24d1905673e2c3',
+- ),
+ 'jquery.flot.axislabels.js': (
+ 'http://raw.github.com/markrcote/flot-axislabels/%s/'
+ 'jquery.flot.axislabels.js' % FLOT_AXISLABELS_SHA,
+ 'a8526e0c1ed3b5cbc1a6b3ebb22bf334',
+ ),
+- 'jquery.js': (
+- 'http://code.jquery.com/jquery-%s.min.js' % JQUERY_VERSION,
+- '397754ba49e9e0cf4e7c190da78dda05',
+- ),
+- 'jquery-ui.js': (
+- 'http://code.jquery.com/ui/%s/jquery-ui.min.js' % JQUERY_UI_VERSION,
+- '3e6acb1e6426ef90d2e786a006a4ea28',
+- ),
+ }
+
+ _file_dirname = os.path.dirname(__file__)
Added: packages/apachedex/trunk/debian/patches/ignore-non-supported-apache-log-formats.patch
===================================================================
--- packages/apachedex/trunk/debian/patches/ignore-non-supported-apache-log-formats.patch (rev 0)
+++ packages/apachedex/trunk/debian/patches/ignore-non-supported-apache-log-formats.patch 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,17 @@
+Description: Ignore Apache log formats which are not supported
+Applied-Upstream: http://git.erp5.org/gitweb/apachedex.git/commitdiff/ea4376d05e3b2c9ce6c251d6c78ae4a6a36504da
+Author: Arnaud Fontaine <arnau at debian.org>
+
+--- a/apachedex/__init__.py
++++ b/apachedex/__init__.py
+@@ -1334,7 +1334,9 @@
+ key += n()
+ elif fmt == '>':
+ key += n()
+- char = logformat_dict[key]
++ # XXX: Consider unknown fields have no whitespaces (ie, support for
++ # quotes)
++ char = logformat_dict.get(key, r'\S*')
+ expensive_char = expensive_logformat_dict.get(key, char)
+ line_regex += char
+ expensive_line_regex += expensive_char
Added: packages/apachedex/trunk/debian/patches/logfile-required-if-no-state-file.patch
===================================================================
--- packages/apachedex/trunk/debian/patches/logfile-required-if-no-state-file.patch (rev 0)
+++ packages/apachedex/trunk/debian/patches/logfile-required-if-no-state-file.patch 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,16 @@
+Description: Either --state-file or logfile arguments must be specified
+Applied-Upstream: http://git.erp5.org/gitweb/apachedex.git/commitdiff/ca61b13f5acd578c95f68392dfb8ad56c17d6937
+Author: Arnaud Fontaine <arnau at debian.org>
+
+--- a/apachedex/__init__.py
++++ b/apachedex/__init__.py
+@@ -1304,6 +1304,9 @@
+ 'ignored. Useful to exclude monitoring systems.')
+
+ args = parser.parse_args()
++ if not args.logfile and not args.state_file:
++ parser.error('Either --state-file or logfile arguments '
++ 'must be specified.')
+ if DURATION_US_FORMAT in args.logformat:
+ getDuration = lambda x: int(x.group('duration'))
+ elif DURATION_S_FORMAT in args.logformat:
Added: packages/apachedex/trunk/debian/patches/series
===================================================================
--- packages/apachedex/trunk/debian/patches/series (rev 0)
+++ packages/apachedex/trunk/debian/patches/series 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,3 @@
+ignore-non-supported-apache-log-formats.patch
+do-not-use-embedded-js.patch
+logfile-required-if-no-state-file.patch
Added: packages/apachedex/trunk/debian/rules
===================================================================
--- packages/apachedex/trunk/debian/rules (rev 0)
+++ packages/apachedex/trunk/debian/rules 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+PYVER := $(shell pyversions -vd)
+
+%:
+ dh $@ --with python2 --no-guessing-versions --buildsystem=python_distutils
+
+override_dh_link:
+ dh_link /usr/share/javascript/jquery/jquery.js \
+ usr/lib/python$(PYVER)/dist-packages/apachedex/jquery.js
+
+ dh_link /usr/share/javascript/jquery-ui/jquery-ui.js \
+ usr/lib/python$(PYVER)/dist-packages/apachedex/jquery-ui.js
+
+ dh_link /usr/share/javascript/jquery-flot/jquery.flot.js \
+ usr/lib/python$(PYVER)/dist-packages/apachedex/jquery.flot.js
+
+ dh_link /usr/share/javascript/jquery-flot/jquery.flot.time.js \
+ usr/lib/python$(PYVER)/dist-packages/apachedex/jquery.flot.time.js
+
+override_dh_install:
+ dh_install
+ cp parallel_parse.sh debian/apachedex/usr/bin/apachedex-parallel-parse
Property changes on: packages/apachedex/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/apachedex/trunk/debian/source/format
===================================================================
--- packages/apachedex/trunk/debian/source/format (rev 0)
+++ packages/apachedex/trunk/debian/source/format 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/apachedex/trunk/debian/source/options
===================================================================
--- packages/apachedex/trunk/debian/source/options (rev 0)
+++ packages/apachedex/trunk/debian/source/options 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1 @@
+extend-diff-ignore = "\.egg-info"
Added: packages/apachedex/trunk/debian/watch
===================================================================
--- packages/apachedex/trunk/debian/watch (rev 0)
+++ packages/apachedex/trunk/debian/watch 2014-07-14 06:37:15 UTC (rev 11064)
@@ -0,0 +1,2 @@
+version=3
+https://pypi.python.org/packages/source/A/APacheDEX/APacheDEX-([\d.]*)\.tar\.gz
More information about the Python-apps-commits
mailing list