[Python-modules-commits] [pyparsing] 01/01: pybuild and wrap-and-sort
Barry Warsaw
barry at moszumanska.debian.org
Fri May 6 19:12:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pyparsing.
commit 76be886bdc9f2b0b12bd093fe7eb3d26c22827d9
Author: Barry Warsaw <barry at python.org>
Date: Fri May 6 14:12:00 2016 -0500
pybuild and wrap-and-sort
* d/rules:
- Convert to --buildsystem=pybuild
* wrap-and-sort
---
debian/changelog | 3 ++
debian/control | 28 +++++++++++--------
debian/python-pyparsing-doc.docs | 4 +--
debian/rules | 59 +++++++++++++++++++++-------------------
4 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 72267d5..d6ccb1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ pyparsing (2.1.1+dfsg1-1) UNRELEASED; urgency=medium
`Testsuite: autopkgtest-pkg-python` and remove the d/tests directory
as redundant. (Closes: #710660)
- Bump Standards-Version with no other changes necessary.
+ * d/rules:
+ - Convert to --buildsystem=pybuild
+ * wrap-and-sort
-- Barry Warsaw <barry at debian.org> Fri, 06 May 2016 12:16:19 -0500
diff --git a/debian/control b/debian/control
index f289a5d..60babed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,16 @@ Source: pyparsing
Section: python
Priority: optional
Maintainer: Kevin Coyner <kcoyner at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Matthew Grant <matt at mattgrant.net.nz>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Matthew Grant <matt at mattgrant.net.nz>,
Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9),
- python-all (>= 2.6.5~),
+ dh-python,
+ python-all (>= 2.6.6-3~),
python-setuptools,
- python3-all (>= 3.1.3-2~),
- python3-setuptools
-Build-Depends-Indep: tofrodos
+ python3-all,
+ python3-setuptools,
+Build-Depends-Indep: tofrodos,
Homepage: http://pyparsing.wikispaces.com/
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pyparsing.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyparsing.git
@@ -17,9 +19,10 @@ Testsuite: autopkgtest-pkg-python
Package: python-pyparsing
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Suggests: python-pyparsing-doc
+Depends: ${misc:Depends},
+ ${python:Depends},
+Provides: ${python:Provides},
+Suggests: python-pyparsing-doc,
Description: Python parsing module
The parsing module is an alternative approach to creating and
executing simple grammars, vs. the traditional lex/yacc approach, or
@@ -36,9 +39,10 @@ Description: Python parsing module
Package: python3-pyparsing
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
-Provides: ${python3:Provides}
-Suggests: python-pyparsing-doc
+Depends: ${misc:Depends},
+ ${python3:Depends},
+Provides: ${python3:Provides},
+Suggests: python-pyparsing-doc,
Description: Python parsing module, Python3 package
The parsing module is an alternative approach to creating and
executing simple grammars, vs. the traditional lex/yacc approach, or
@@ -58,7 +62,7 @@ Description: Python parsing module, Python3 package
Package: python-pyparsing-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
Description: Python parsing module, documentation package
The parsing module is an alternative approach to creating and
executing simple grammars, vs. the traditional lex/yacc approach, or
diff --git a/debian/python-pyparsing-doc.docs b/debian/python-pyparsing-doc.docs
index 2994700..e2ff72e 100644
--- a/debian/python-pyparsing-doc.docs
+++ b/debian/python-pyparsing-doc.docs
@@ -1,4 +1,4 @@
-README
HowToUsePyparsing.html
-pyparsingClassDiagram.PNG
+README
docs/*
+pyparsingClassDiagram.PNG
diff --git a/debian/rules b/debian/rules
index c7864f2..1a2e636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,44 @@
#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters at debian.org>
-# Copyright © 2012 Jan Dittberner <jandd at debian.org>
-
-override_dh_auto_clean:
- find -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f --
- rm -rf build
-
-override_dh_auto_install:
- find $(CURDIR)/debian/python{,3}-pyparsing \
- \( -name '*.html' -o -name '*.css' -o -name '*.py' \
- -o -name 'README' \) \
- -type f -print0 \
- | xargs -0 --no-run-if-empty fromdos -p --
- set -e ; for i in `pyversions -s` ; do \
- $$i setup.py install --install-layout=deb \
- --root=$(CURDIR)/debian/python-pyparsing ; \
- done
- set -e ; for i in `py3versions -s` ; do \
- $$i setup.py install --install-layout=deb \
- --root=$(CURDIR)/debian/python3-pyparsing ; \
- done
+
+#export DH_VERBOSE = 1
+#export PYBUILD_VERBOSE = 1
+export PYBUILD_NAME = pyparsing
+
+%:
+ dh $@ --with=python2,python3,pypy --buildsystem=pybuild
+
+
+#override_dh_auto_clean:
+# find -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f --
+# rm -rf build
+
+#override_dh_auto_install:
+# find $(CURDIR)/debian/python{,3}-pyparsing \
+# \( -name '*.html' -o -name '*.css' -o -name '*.py' \
+# -o -name 'README' \) \
+# -type f -print0 \
+# | xargs -0 --no-run-if-empty fromdos -p --
+# set -e ; for i in `pyversions -s` ; do \
+# $$i setup.py install --install-layout=deb \
+# --root=$(CURDIR)/debian/python-pyparsing ; \
+# done
+# set -e ; for i in `py3versions -s` ; do \
+# $$i setup.py install --install-layout=deb \
+# --root=$(CURDIR)/debian/python3-pyparsing ; \
+# done
override_dh_installexamples:
dh_installexamples -i -ppython-pyparsing-doc
-override_dh_python2:
- dh_python2 -ppython-pyparsing
+#override_dh_python2:
+# dh_python2 -ppython-pyparsing
-override_dh_python3:
- dh_python3 -ppython3-pyparsing
+#override_dh_python3:
+# dh_python3 -ppython3-pyparsing
override_dh_compress:
dh_compress -i -X.py
-%:
- dh $@ --with=python2,python3 --buildsystem=python_distutils
# the following rule gets the original source and creates a dfsg free
# tarball
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyparsing.git
More information about the Python-modules-commits
mailing list