[med-svn] [python-dendropy] 03/03: Mass commit after having messed up Git repository since I again forgot tp git pull first :-(
Andreas Tille
tille at debian.org
Mon Jan 9 17:29:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository python-dendropy.
commit 0703a46f92ffe8f38a03f3d0390cbb304ea0ab3b
Author: Andreas Tille <tille at debian.org>
Date: Mon Jan 9 18:27:57 2017 +0100
Mass commit after having messed up Git repository since I again forgot tp git pull first :-(
---
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 7 +++----
debian/copyright | 4 ++--
...1-Fix-bug-where-encoding-for-default-locale-is-None.patch | 2 +-
...o-not-run-PAUP-based-tests-unless-path-to-PAUP-is-p.patch | 2 +-
debian/rules | 3 ---
debian/sumtrees.1 | 2 +-
debian/watch | 4 ++--
9 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 19e8d37..f668bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+python-dendropy (4.2.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version
+ * d/watch:
+ - fix pypi URL
+ - xz compression
+ - version=4
+ * cme fix dpkg-control
+ * debhelper 10
+
+ -- Andreas Tille <tille at debian.org> Mon, 09 Jan 2017 17:51:57 +0100
+
python-dendropy (4.1.0+dfsg-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 45d1899..7462549 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: python-dendropy
-Section: python
-Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9),
+Section: python
+Priority: optional
+Build-Depends: debhelper (>= 10),
dh-python,
python-all,
python-setuptools,
@@ -75,4 +75,3 @@ Description: Phylogenetic Tree Summarization and Annotation
and a burn-in option allows for an initial number of trees in each file
to be excluded from the analysis if they are not considered to be drawn
from the true support distribution.
-
diff --git a/debian/copyright b/debian/copyright
index 4716983..5b80988 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: DendroPy
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Jeet Sukumaran <jeetsukumaran at gmail.com>
+Upstream-Name: DendroPy
Source: https://pypi.python.org/pypi/DendroPy
https://github.com/jeetsukumaran/DendroPy
Files-Excluded: doc
diff --git a/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch b/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch
index 3fafa19..dade8d6 100644
--- a/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch
+++ b/debian/patches/0001-Fix-bug-where-encoding-for-default-locale-is-None.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix bug where encoding for default locale is None.
--- a/dendropy/utility/textprocessing.py
+++ b/dendropy/utility/textprocessing.py
-@@ -42,6 +42,9 @@
+@@ -42,6 +42,9 @@ ENCODING = locale.getdefaultlocale()[1]
if ENCODING == None:
ENCODING = 'UTF-8'
diff --git a/debian/patches/0002-Do-not-run-PAUP-based-tests-unless-path-to-PAUP-is-p.patch b/debian/patches/0002-Do-not-run-PAUP-based-tests-unless-path-to-PAUP-is-p.patch
index b4cf80a..be86680 100644
--- a/debian/patches/0002-Do-not-run-PAUP-based-tests-unless-path-to-PAUP-is-p.patch
+++ b/debian/patches/0002-Do-not-run-PAUP-based-tests-unless-path-to-PAUP-is-p.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Do not run PAUP-based tests unless path to PAUP is provided
--- a/README.rst
+++ b/README.rst
-@@ -67,6 +67,21 @@
+@@ -67,6 +67,21 @@ Testing
If this variable is not set or set to "NONE", then any tests that rely on
PAUP* will NOT be run.
diff --git a/debian/rules b/debian/rules
index 8a9d438..ba18591 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,3 @@ override_dh_install:
mv debian/python3-$(PYBUILD_NAME)/usr/bin/sumtrees.py debian/$(SUMTREES)/usr/bin/sumtrees
rm -rf debian/python-$(PYBUILD_NAME)/usr/bin
rm -rf debian/python3-$(PYBUILD_NAME)/usr/bin
-
-get-orig-source:
- uscan --verbose --force-download --repack --compression xz
diff --git a/debian/sumtrees.1 b/debian/sumtrees.1
index 21f07b9..78f1766 100644
--- a/debian/sumtrees.1
+++ b/debian/sumtrees.1
@@ -75,7 +75,7 @@ actual tree analysis. By default this is done by
reading the first tree in the first tree source and
extracting the taxon names. At best, this is,
inefficient, as it involves an extraneous reading of
-the tree. At worst, this can be errorneous, if the
+the tree. At worst, this can be erroneous, if the
first tree does not contain all the taxa. Explicitly
providing the taxon names via this option can avoid
these issues.
diff --git a/debian/watch b/debian/watch
index b02c6ef..d745048 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-version=3
+version=4
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
https://pypi.debian.net/DendroPy/DendroPy-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-dendropy.git
More information about the debian-med-commit
mailing list