Release 4.0.0-1~trusty

jhermann · Jun 6, 2016 · 8f4f478 · 8f4f478
1 parent d19a4b2
commit 8f4f478
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/debianized-devpi/README.md b/debianized-devpi/README.md
@@ -5,7 +5,7 @@
 | `devpi-server` | `devpi-client` | `devpi-common` | `devpi-web` | `devpi-findlinks` | `requests` |
 |:---:|:---:|:---:|:---:|:---:|:---:|
 | [![devpi-server](http://img.shields.io/pypi/v/devpi-server.svg)](https://pypi.python.org/pypi/devpi-server/) | [![devpi-client](http://img.shields.io/pypi/v/devpi-client.svg)](https://pypi.python.org/pypi/devpi-client/) | [![devpi-common](http://img.shields.io/pypi/v/devpi-common.svg)](https://pypi.python.org/pypi/devpi-common/) | [![devpi-web](http://img.shields.io/pypi/v/devpi-web.svg)](https://pypi.python.org/pypi/devpi-web/) | [![devpi-findlinks](http://img.shields.io/pypi/v/devpi-findlinks.svg)](https://pypi.python.org/pypi/devpi-findlinks/) | [![requests](http://img.shields.io/pypi/v/requests.svg)](https://pypi.python.org/pypi/requests/) |
-| ![deb](http://img.shields.io/badge/deb-v3.1.1-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v2.6.2-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v2.0.10-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v3.1.0-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v1.0.1-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v2.10.0-d80854.svg) |
+| ![deb](http://img.shields.io/badge/deb-v4.0.0-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v2.6.3-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v3.0.0-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v3.1.0-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v1.0.1-d80854.svg) | ![deb](http://img.shields.io/badge/deb-v2.10.0-d80854.svg) |
 
 
 ## What is this?

diff --git a/debianized-devpi/debian/changelog b/debianized-devpi/debian/changelog
@@ -1,3 +1,11 @@
+devpi (4.0.0-1~trusty) trusty; urgency=high
+
+  * Upstream release: 4.0.0
+  * devpi-client: 2.6.3
+  * devpi-common: 3.0.0
+
+ -- Juergen Hermann <jh@web.de>  Mon, 06 Jun 2016 14:13:23 +0200
+
 devpi (3.1.1-2~trusty) trusty; urgency=high
 
   * Upstream release 3.1.1

diff --git a/debianized-devpi/debian/control b/debianized-devpi/debian/control
@@ -2,13 +2,13 @@ Source: devpi
 Section: contrib/python
 Priority: extra
 Maintainer: Holger Krekel <devpi-dev@googlegroups.com>
-Build-Depends: debhelper (>= 9), python, dh-virtualenv (>= 0.8), curl, tar, gzip
+Build-Depends: debhelper (>= 9), python, dh-virtualenv (>= 0.11), curl, tar, gzip
 Standards-Version: 3.9.5
 Homepage: http://doc.devpi.net/latest/
 
 Package: devpi
 Architecture: any
-Pre-Depends: dpkg (>= 1.16.1), python2.7 | python2.6, ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.16.1), python2.7, ${misc:Pre-Depends}
 Depends: ${python:Depends}, ${misc:Depends}
 Recommends: nginx-full | nginx
 Description: GitHub-style PyPI index server and packaging meta tool
diff --git a/debianized-devpi/debian/rules b/debianized-devpi/debian/rules
@@ -12,11 +12,11 @@
 # and a recursive explosion ensues when symlinks are followed.
 
 # Packages to install before the main project
-PREINSTALL=--preinstall pip
-# --preinstall 'requests[security]' # for Python before 2.7.9
+PREINSTALL=--preinstall 'pip<8' --preinstall 'wheel'
+# --preinstall 'requests[security]' # for Python before 2.7.9, e.g. on Ubuntu Trusty
 
 # Version of "devpi" meta package
-DEVPI_SERVER_VERSION=3.1.1
+DEVPI_SERVER_VERSION=4.0.0
 DEVPI_SERVER_PYPI="https://pypi.python.org/simple/devpi-server/"
 DEVPI_URL=$(DEVPI_SERVER_PYPI)$(shell curl -sL $(DEVPI_SERVER_PYPI) \
     | grep devpi-server-$(DEVPI_SERVER_VERSION).tar.gz | cut -f2 -d'"' | cut -f1 -d\#)
@@ -26,7 +26,7 @@ DEVPI_URL=$(DEVPI_SERVER_PYPI)$(shell curl -sL $(DEVPI_SERVER_PYPI) \
 ##DEVPI_URL="https://devpi.net/hpk/dev/+f/852/a16d5a944fd5a/devpi-2.0.2.tar.gz"
 
 # Frozen versions of "devpi" requirements
-DEVPI_FREEZE="devpi-client==2.6.2 devpi-common==2.0.10 devpi-web==3.1.0 requests==2.10.0"
+DEVPI_FREEZE="devpi-client==2.6.3 devpi-common==3.0.0 devpi-web==3.1.0 requests==2.10.0"
 
 # Add plugin packages, as a space- or comma-separated list
 DEVPI_PLUGINS="devpi-findlinks==1.0.1"