Merge lp:~launchpad/convoy/packaging into lp:convoy

[okeamah david]

Unmerged revisions

46. By Colin Watson on 2023-04-14

No-op commit to rebuild for production.

45. By Colin Watson on 2022-08-30

[r=lgp171188] Move /usr/share/convoy/convoy.wsgi to a new convoy-common package.

44. By Colin Watson on 2019-10-11

releasing package convoy version 0.4.4+bzr39-0lp5

43. By Colin Watson on 2019-10-11

Document earlier CONVOY_ROOT change.

42. By Colin Watson on 2019-10-11

Fix running of tests at package build time.

41. By Colin Watson on 2019-10-11

Add a python3-convoy binary package.

40. By Colin Watson on 2019-10-11

Run "wrap-and-sort -at".

39. By Colin Watson on 2019-10-11

Drop unused build-dependency on python-mocker.

38. By Colin Watson on 2019-10-11

Convert to pybuild.

37. By Colin Watson on 2019-08-08

[r=cjwatson] Set the default CONVOY_ROOT to the new dev domain.

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2024-04-20 23:55:23 +0000
@@ -0,0 +1,76 @@
+convoy (0.4.4+bzr39-0lp6) UNRELEASED; urgency=medium
+
+  * Drop unused dependencies on python-cssutils/python3-cssutils.
+  * Move /usr/share/convoy/convoy.wsgi to a new convoy-common package,
+    allowing it to be used in Python-3-only setups.
+
+ -- Colin Watson <[e-mail]>  Fri, 26 Aug 2022 19:44:41 +0100
+
+convoy (0.4.4+bzr39-0lp5) xenial; urgency=medium
+
+  [ zriv ]
+  * Set the default CONVOY_ROOT to the new dev domain.
+
+  [ Colin Watson ]
+  * Convert to pybuild.
+  * Drop unused build-dependency on python-mocker.
+  * Run "wrap-and-sort -at".
+  * Add a python3-convoy binary package.
+
+ -- Colin Watson <[e-mail]>  Sat, 12 Oct 2019 00:10:20 +0100
+
+convoy (0.4.4+bzr39-0lp4) xenial; urgency=medium
+
+  * CONVOY_ROOT comes from the request environment under mod_wsgi.  Adjust
+    the previous change so that it copes with both mod_wsgi and gunicorn.
+
+ -- Colin Watson <[e-mail]>  Fri, 29 Sep 2017 21:12:49 -0400
+
+convoy (0.4.4+bzr39-0lp3) xenial; urgency=medium
+
+  * Fix CONVOY_ROOT handling in convoy.wsgi: this must come from the process
+    environment, not the request environment.
+
+ -- Colin Watson <[e-mail]>  Wed, 20 Sep 2017 12:24:23 +0100
+
+convoy (0.4.4+bzr39-0lp2) precise; urgency=medium
+
+  * Install symlinks on the Python module path to
+    /usr/share/convoy/convoy.wsgi, so that it is importable as convoy.wsgi.
+
+ -- Colin Watson <[e-mail]>  Sat, 18 Feb 2017 13:38:43 +0000
+
+convoy (0.4.4+bzr39-0lp1) precise; urgency=medium
+
+  * New upstream snapshot.
+  * Rebase packaging on Landscape's to avoid python-support.
+    Remaining changes:
+    - Install LP's /usr/share/convoy/convoy.wsgi.
+    - Drop default no-op maintainer scripts.
+
+ -- William Grant <[e-mail]>  Mon, 14 Nov 2016 18:49:22 +1100
+
+convoy (0.2.4-0~bzr26ubuntu1) oneiric; urgency=low
+
+  * Fix binary package build to use distutils, not the Makefile.
+  * Rename binary package to python-convoy.
+
+ -- Steve Kowalik <[e-mail]>  Thu, 26 Apr 2012 09:58:11 +1000
+
+convoy (0.2.4-0~bzr23ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+
+ -- Steve Kowalik <[e-mail]>  Tue, 24 Apr 2012 11:30:25 +1000
+
+convoy (0.2.1-0~bzr17) oneiric; urgency=low
+
+  * New upstream release.
+
+ -- Steve Kowalik <[e-mail]>  Fri, 27 Jan 2012 15:01:09 +1100
+
+convoy (0.2.0-0ubuntu1~precise1) precise; urgency=low
+
+  * Initial Release.
+
+ -- Steve Kowalik <[e-mail]>  Fri, 20 Jan 2012 14:24:05 +1100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2024-04-20 23:55:23 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2024-04-20 23:55:23 +0000
@@ -0,0 +1,58 @@
+Source: convoy
+Section: python
+Priority: extra
+Maintainer: Launchpad Developers <[e-mail]>
+Build-Depends: debhelper (>= 7),
+               dh-python,
+               python-all,
+               python-nose,
+               python-paste,
+               python-setuptools,
+               python-webtest,
+               python3-all,
+               python3-nose,
+               python3-paste,
+               python3-setuptools,
+               python3-webtest,
+Standards-Version: 3.8.3
+Homepage: https://launchpad.net/convoy
+
+Package: convoy-common
+Architecture: all
+Depends: ${misc:Depends},
+Recommends: python3-convoy | python-convoy
+Breaks: python-convoy (<< 0.4.4+bzr39-0lp6~)
+Replaces: python-convoy (<< 0.4.4+bzr39-0lp6~)
+Description: A combo loader WSGI application (common files)
+ Provides a WSGI application that can be hooked up to a
+ generic WSGI container to create a combo loader server, for
+ loading Javascript and CSS files combined into a single
+ request.
+ .
+ This package installs common files for both Python 2 and 3.
+
+Package: python-convoy
+Architecture: all
+Depends: convoy-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+Description: A combo loader WSGI application (Python 2)
+ Provides a WSGI application that can be hooked up to a
+ generic WSGI container to create a combo loader server, for
+ loading Javascript and CSS files combined into a single
+ request.
+ .
+ This package installs the combo loader for Python 2.
+
+Package: python3-convoy
+Architecture: all
+Depends: convoy-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+Description: A combo loader WSGI application (Python 3)
+ Provides a WSGI application that can be hooked up to a
+ generic WSGI container to create a combo loader server, for
+ loading Javascript and CSS files combined into a single
+ request.
+ .
+ This package installs the combo loader for Python 3.

=== added file 'debian/convoy-common.install'
--- debian/convoy-common.install	1970-01-01 00:00:00 +0000
+++ debian/convoy-common.install	2024-04-20 23:55:23 +0000
@@ -0,0 +1,1 @@
+debian/convoy.wsgi usr/share/convoy

=== added file 'debian/convoy.wsgi'
--- debian/convoy.wsgi	1970-01-01 00:00:00 +0000
+++ debian/convoy.wsgi	2024-04-20 23:55:23 +0000
@@ -0,0 +1,32 @@
+#   Convoy is a WSGI app for loading multiple files in the same request.
+#   Copyright (C) 2010-2012  Canonical, Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from convoy.combo import combo_app
+
+def application(environ, start_response):
+    # CONVOY_ROOT may be set by SetEnv in Apache configuration, in which
+    # case mod_wsgi passes it in the request environment.  (This is safe
+    # because HTTP headers end up in HTTP_*.)
+    root = environ.get('CONVOY_ROOT')
+    if root is None:
+        # Alternatively, convoy may be run under a standalone WSGI server
+        # such as gunicorn, in which case we need to look for CONVOY_ROOT in
+        # the process environment.
+        root = os.environ.get('CONVOY_ROOT', '/srv/launchpad.test/convoy')
+    app = combo_app(root)
+    return app(environ, start_response)

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2024-04-20 23:55:23 +0000
@@ -0,0 +1,36 @@
+This work was packaged for Debian by:
+
+    Sidnei da Silva <[e-mail]> on Thu, 28 Jul 2011 08:26:39 -0300
+
+It was downloaded from:
+
+    https://launchpad.net/convoy
+
+Upstream Author(s):
+
+    Sidnei da Silva <[e-mail]>
+
+Copyright:
+
+    <Copyright (C) 2011 Canonical Services Ltd>
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+The Debian packaging is:
+
+    Copyright (C) 2011 Sidnei da Silva <[e-mail]>
+
+and is licensed under the GNU Affero General Public License.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2024-04-20 23:55:23 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2024-04-20 23:55:23 +0000
@@ -0,0 +1,18 @@
+#! /usr/bin/make -f
+
+export PYBUILD_NAME := convoy
+export PYBUILD_BEFORE_TEST := cp -a {dir}/convoy/tests {build_dir}/convoy/
+export PYBUILD_AFTER_TEST := rm -rf {build_dir}/convoy/tests
+
+%:
+	dh $@ --with python2,python3 --buildsystem pybuild
+
+override_dh_link:
+	set -e; for py2 in $$(pyversions -vr); do \
+		dh_link -ppython-convoy \
+		        usr/share/convoy/convoy.wsgi \
+		        usr/lib/python$$py2/dist-packages/convoy/wsgi.py; \
+	done
+	dh_link -ppython3-convoy \
+	        usr/share/convoy/convoy.wsgi \
+	        usr/lib/python3/dist-packages/convoy/wsgi.py