[Pkg-freeipa-devel] custodia: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Sat Jan 2 11:12:53 UTC 2016
debian/changelog | 16 ++
debian/control | 6 +
debian/copyright | 16 +-
debian/patches/Allow-tox-to-use-locally-installed-packages.patch | 5
debian/patches/dont-install-deps.diff | 57 ++++++++++
debian/patches/fix-tox-env-for-machine-installed-python-version.diff | 23 ++++
debian/patches/series | 2
7 files changed, 112 insertions(+), 13 deletions(-)
New commits:
commit f3d34a3f42bc36f664b9db4e7ee85888dd231265
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Jan 2 13:10:46 2016 +0200
releasing package custodia version 0.1.0-3
diff --git a/debian/changelog b/debian/changelog
index be6718f..fb1c0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-custodia (0.1.0-3) UNRELEASED; urgency=medium
+custodia (0.1.0-3) unstable; urgency=medium
* fix-tox-env-for-machine-installed-python-version.diff: Look harder
for local extensions.
@@ -6,7 +6,7 @@ custodia (0.1.0-3) UNRELEASED; urgency=medium
and disable doc target. (Closes: #808640)
* control: Add python-{flake8,pep8-naming,sphinx} to build-deps.
- -- Timo Aaltonen <tjaalton at debian.org> Sat, 02 Jan 2016 12:39:55 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 02 Jan 2016 13:10:19 +0200
custodia (0.1.0-2) unstable; urgency=medium
commit 5de003d98cbaaac507e794200ba3eadfd58448b3
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Jan 2 13:07:13 2016 +0200
various fixes
diff --git a/debian/changelog b/debian/changelog
index 114ae65..be6718f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+custodia (0.1.0-3) UNRELEASED; urgency=medium
+
+ * fix-tox-env-for-machine-installed-python-version.diff: Look harder
+ for local extensions.
+ * dont-install-deps.diff: Don't try to install deps from the network,
+ and disable doc target. (Closes: #808640)
+ * control: Add python-{flake8,pep8-naming,sphinx} to build-deps.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 02 Jan 2016 12:39:55 +0200
+
custodia (0.1.0-2) unstable; urgency=medium
* Fix copyright, uses GPL-3+ instead of LGPL.
diff --git a/debian/control b/debian/control
index f1eab84..2a14464 100644
--- a/debian/control
+++ b/debian/control
@@ -11,16 +11,22 @@ Build-Depends:
pylint3,
python-all (>= 2.6.6-3),
python-coverage,
+ python-flake8,
python-jwcrypto,
+ python-pep8-naming,
python-pytest,
python-setuptools,
python-six,
+ python-sphinx,
python3-all (>= 2.6.6-3),
python3-coverage,
+ python3-flake8,
python3-jwcrypto,
+ python3-pep8-naming,
python3-pytest,
python3-setuptools,
python3-six,
+ python3-sphinx,
tox,
Standards-Version: 3.9.6
Homepage: https://github.com/simo5/custodia
diff --git a/debian/patches/Allow-tox-to-use-locally-installed-packages.patch b/debian/patches/Allow-tox-to-use-locally-installed-packages.patch
index ca9b598..f0772b9 100644
--- a/debian/patches/Allow-tox-to-use-locally-installed-packages.patch
+++ b/debian/patches/Allow-tox-to-use-locally-installed-packages.patch
@@ -8,8 +8,6 @@ Signed-off-by: Simo Sorce <simo at redhat.com>
tox.ini | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/tox.ini b/tox.ini
-index e737ba262f7fe608256caef781ef44537ee8bd08..3572322077bbe87daa0b9d73e4c27e46d45c9997 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ deps =
@@ -55,6 +53,3 @@ index e737ba262f7fe608256caef781ef44537ee8bd08..3572322077bbe87daa0b9d73e4c27e46
changedir = docs/source
deps =
sphinx < 1.3.0
---
-2.4.2
-
diff --git a/debian/patches/dont-install-deps.diff b/debian/patches/dont-install-deps.diff
new file mode 100644
index 0000000..51b6a92
--- /dev/null
+++ b/debian/patches/dont-install-deps.diff
@@ -0,0 +1,57 @@
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,14 +1,14 @@
+ [tox]
+-envlist = py27,py34,doc,sphinx
++envlist = py27,py34,sphinx
+
+ [testenv]
+ setenv =
+ PYTHONPATH = {envsitepackagesdir}
+ deps =
+- pytest
+- coverage
+- -r{toxinidir}/requirements.txt
+- cryptography
++# pytest
++# coverage
++# -r{toxinidir}/requirements.txt
++# cryptography
+ sitepackages = True
+ commands =
+ python-coverage run -m pytest --capture=no --strict {posargs}
+@@ -17,9 +17,9 @@ commands =
+ [testenv:pep8]
+ basepython = python2.7
+ deps =
+- flake8
+- flake8-import-order
+- pep8-naming
++# flake8
++# flake8-import-order
++# pep8-naming
+ sitepackages = True
+ commands =
+ flake8 {posargs}
+@@ -27,9 +27,9 @@ commands =
+ [testenv:py3pep8]
+ basepython = python3.4
+ deps =
+- flake8
+- flake8-import-order
+- pep8-naming
++# flake8
++# flake8-import-order
++# pep8-naming
+ sitepackages = True
+ commands =
+ flake8 {posargs}
+@@ -52,7 +52,7 @@ basepython = python2.7
+ sitepackages = True
+ changedir = docs/source
+ deps =
+- sphinx < 1.3.0
++# sphinx < 1.3.0
+ commands =
+ sphinx-build -v -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
+
diff --git a/debian/patches/fix-tox-env-for-machine-installed-python-version.diff b/debian/patches/fix-tox-env-for-machine-installed-python-version.diff
new file mode 100644
index 0000000..7a4042a
--- /dev/null
+++ b/debian/patches/fix-tox-env-for-machine-installed-python-version.diff
@@ -0,0 +1,23 @@
+commit 72c9ad1546223ad0aa22bceb8c9b57f885519c9d
+Author: Simo Sorce <simo at redhat.com>
+Date: Mon Sep 28 13:31:37 2015 -0400
+
+ Fix tox env for machine installed python version
+
+ With this env var we force the local /bin/coverage to still source locally
+ unavailable modules from the .tox directory.
+
+ Signed-off-by: Simo Sorce <simo at redhat.com>
+ Reviewed-by: Christian Heimes <cheimes at redhat.com>
+
+--- a/tox.ini
++++ b/tox.ini
+@@ -2,6 +2,8 @@
+ envlist = py27,py34,doc,sphinx
+
+ [testenv]
++setenv =
++ PYTHONPATH = {envsitepackagesdir}
+ deps =
+ pytest
+ coverage
diff --git a/debian/patches/series b/debian/patches/series
index 49b8063..700e7da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
Allow-tox-to-use-locally-installed-packages.patch
call-python-coverage.diff
+fix-tox-env-for-machine-installed-python-version.diff
+dont-install-deps.diff
commit 5425af42737a7fdbe647eca50f1a10c36f790118
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Oct 16 09:58:11 2015 +0300
releasing package custodia version 0.1.0-2
diff --git a/debian/changelog b/debian/changelog
index 6a02c78..114ae65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-custodia (0.1.0-2) UNRELEASED; urgency=medium
+custodia (0.1.0-2) unstable; urgency=medium
* Fix copyright, uses GPL-3+ instead of LGPL.
- -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Oct 2015 09:54:58 +0300
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Oct 2015 09:55:27 +0300
custodia (0.1.0-1) unstable; urgency=low
commit 7440fc4264d602b3920a9c563aa8aefeb6accb1b
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Oct 16 09:55:19 2015 +0300
Fix copyright, uses GPL-3+ instead of LGPL.
diff --git a/debian/changelog b/debian/changelog
index 9507f0c..6a02c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+custodia (0.1.0-2) UNRELEASED; urgency=medium
+
+ * Fix copyright, uses GPL-3+ instead of LGPL.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Oct 2015 09:54:58 +0300
+
custodia (0.1.0-1) unstable; urgency=low
* Initial upload. (Closes: #800735)
diff --git a/debian/copyright b/debian/copyright
index 97dd969..3edb4a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,25 +4,25 @@ Source: https://github.com/simo5/custodia
Files: *
Copyright: 2015 Custodia project Contributors
-License: LGPL-3+
+License: GPL-3+
Files: debian/*
Copyright: 2015 Timo Aaltonen <tjaalton at debian.org>
-License: LGPL-3+
+License: GPL-3+
-License: LGPL-3+
+License: GPL-3+
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
+ it under the terms of the GNU 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 Lesser General Public License for more details.
+ GNU General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public License
+ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
More information about the Pkg-freeipa-devel
mailing list