[Python-modules-commits] [python-rply] 01/03: Switch from cdbs to dh/pybuild (closes: #837295).
Tristan Seligmann
mithrandi at moszumanska.debian.org
Sun Sep 11 01:35:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository python-rply.
commit e2582aa19abfbc32defcbd09f589666b7bd861a9
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Sun Sep 11 03:27:19 2016 +0200
Switch from cdbs to dh/pybuild (closes: #837295).
---
debian/changelog | 5 +++--
debian/control | 25 +++++++++++------------
debian/control.in | 43 --------------------------------------
debian/copyright | 4 ++--
debian/copyright_hints | 46 -----------------------------------------
debian/gbp.conf | 13 ------------
debian/pypy-rply.install | 1 -
debian/python-rply.install | 1 -
debian/python3-rply.install | 1 -
debian/rules | 50 ++++-----------------------------------------
10 files changed, 21 insertions(+), 168 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e87ef3..f438c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-rply (0.7.4-2) UNRELEASED; urgency=medium
+python-rply (0.7.4-2) unstable; urgency=medium
[ Ondřej Nový ]
* Fixed VCS URL (https)
@@ -6,8 +6,9 @@ python-rply (0.7.4-2) UNRELEASED; urgency=medium
[ Tristan Seligmann ]
* Remove Vasudev Kamath from Uploaders (by request); thank you for your
work on this package in the past!
+ * Switch from cdbs to dh/pybuild (closes: #837295).
- -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 22:22:07 +0200
+ -- Tristan Seligmann <mithrandi at debian.org> Sun, 11 Sep 2016 03:28:59 +0200
python-rply (0.7.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d77def3..8f9148a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,24 @@ Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Tristan Seligmann <mithrandi at debian.org>
-Build-Depends: cdbs (>= 0.4.97~),
- devscripts,
- python,
- python3,
+Build-Depends:
debhelper (>= 9~),
- dh-buildinfo,
- pypy,
+ devscripts,
dh-python,
- python-setuptools,
+ pypy,
+ pypy-appdirs,
+ pypy-setuptools,
+ python,
python-appdirs,
- python3-setuptools,
+ python-setuptools,
+ python3,
python3-appdirs,
- pypy-setuptools,
- pypy-appdirs
+ python3-setuptools,
Standards-Version: 3.9.6
Homepage: https://github.com/alex/rply
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-rply.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-rply.git
-X-Python-Version: >=2.6
+X-Python-Version: >= 2.6
X-Python3-Version: >= 3.1
Package: python-rply
@@ -36,7 +35,7 @@ Description: pure Python based parser that also works with RPython (Python 2)
Package: python3-rply
Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends},
+Depends: ${misc:Depends}, ${python3:Depends}
Description: pure Python based parser that also works with RPython (Python 3)
This package provides a pure Python based parser generator, that also
works with RPython. It is a more-or-less direct port of David
@@ -46,7 +45,7 @@ Description: pure Python based parser that also works with RPython (Python 3)
Package: pypy-rply
Architecture: all
-Depends: ${misc:Depends}, ${pypy:Depends},
+Depends: ${misc:Depends}, ${pypy:Depends}
Description: pure Python based parser that also works with RPython (PyPy)
This package provides a pure Python based parser generator, that also
works with RPython. It is a more-or-less direct port of David
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index cd32e4e..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: python-rply
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Vasudev Kamath <kamathvasudev at gmail.com>,
- Tristan Seligmann <mithrandi at debian.org>
-Build-Depends: @cdbs@
-Standards-Version: 3.9.6
-Homepage: https://github.com/alex/rply
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-rply/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-rply/trunk/
-X-Python-Version: >=2.6
-X-Python3-Version: >= 3.1
-
-Package: python-rply
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Description: pure Python based parser that also works with RPython (Python 2)
- This package provides a pure Python based parser generator, that also
- works with RPython. It is a more-or-less direct port of David
- Bazzley's awesome PLY, with a new public API, and RPython support.
- .
- This package provides Python 2 bindings only.
-
-Package: python3-rply
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends},
-Description: pure Python based parser that also works with RPython (Python 3)
- This package provides a pure Python based parser generator, that also
- works with RPython. It is a more-or-less direct port of David
- Bazzley's awesome PLY, with a new public API, and RPython support.
- .
- This package provides Python 3 bindings only.
-
-Package: pypy-rply
-Architecture: all
-Depends: ${misc:Depends}, ${pypy:Depends},
-Description: pure Python based parser that also works with RPython (PyPy)
- This package provides a pure Python based parser generator, that also
- works with RPython. It is a more-or-less direct port of David
- Bazzley's awesome PLY, with a new public API, and RPython support.
- .
- This package provides PyPy bindings only.
diff --git a/debian/copyright b/debian/copyright
index f397398..9e4ebec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- .
+ .
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above
@@ -25,7 +25,7 @@ License: BSD-3-clause
3. Neither the name of rply nor the names of its contributors may
be used to endorse or promote products derived from this
software without specific prior written permission.
- .
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
diff --git a/debian/copyright_hints b/debian/copyright_hints
deleted file mode 100644
index a62ca7e..0000000
--- a/debian/copyright_hints
+++ /dev/null
@@ -1,46 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: FIXME
-Upstream-Contact: FIXME
-Source: FIXME
-Disclaimer: Autogenerated by CDBS
-
-Files: MANIFEST.in
- PKG-INFO
- README.rst
- debian/compat
- debian/control
- debian/control.in
- debian/docs
- debian/gbp.conf
- debian/patches/README
- debian/pypy-rply.install
- debian/python-rply.install
- debian/python3-rply.install
- debian/rules
- debian/source/format
- debian/upstream/signing-key.asc
- debian/watch
- rply.egg-info/PKG-INFO
- rply.egg-info/SOURCES.txt
- rply.egg-info/dependency_links.txt
- rply.egg-info/top_level.txt
- rply/__init__.py
- rply/errors.py
- rply/grammar.py
- rply/lexer.py
- rply/lexergenerator.py
- rply/parser.py
- rply/parsergenerator.py
- rply/token.py
- rply/utils.py
- setup.cfg
- setup.py
-Copyright: *No copyright*
-License: UNKNOWN
- FIXME
-
-Files: LICENSE
-Copyright: Alex Gaynor and individual contributors
-License: BSD-3-clause
- FIXME
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 09ea3f1..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[DEFAULT]
-cleaner = fakeroot debian/rules clean
-pristine-tar = False
-
-[git-buildpackage]
-export-dir = ../build-area/
-tarball-dir = ../tarballs/
-
-[git-dch]
-id-length = 7
-meta = True
-auto = True
-full = True
diff --git a/debian/pypy-rply.install b/debian/pypy-rply.install
deleted file mode 100644
index 7cee9e5..0000000
--- a/debian/pypy-rply.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pypy
\ No newline at end of file
diff --git a/debian/python-rply.install b/debian/python-rply.install
deleted file mode 100644
index 9e364b5..0000000
--- a/debian/python-rply.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*
\ No newline at end of file
diff --git a/debian/python3-rply.install b/debian/python3-rply.install
deleted file mode 100644
index d44e49e..0000000
--- a/debian/python3-rply.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3*
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 8a8616e..f92c683 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,6 @@
#!/usr/bin/make -f
+export PYTHONDONTWRITEBYTECODE=yes
+export PYBUILD_NAME=rply
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# pypy binary package
-pypy_package = pypy-rply
-
-# Suppress unneeded build-dependencies
-CDBS_BUILD_DEPENDS_class_python-distutils_python =
-
-# Additional build-depends on pypy for building pypy-rply
-# TODO: remove this once dh_pypy is integrated into CDBS
-CDBS_BUILD_DEPENDS += , pypy, dh-python, python-setuptools, python3-setuptools, pypy-setuptools
-
-# generates get-orig-source target
-DEB_UPSTREAM_PACKAGE = rply
-DEB_UPSTREAM_URL = https://pypi.python.org/packages/source/r/rply
-DEB_UPSTREAM_TARBALL_MD5 = 7a67a9ba6aa86eda094cfb2c13eaecea
-
-# hook pypy-rply into existing cdbs build stage
-build/$(pypy_package):: build/%: debian/python-module-stampdir/%
-debian/python-module-stampdir/$(pypy_package):
- cd $(cdbs_python_distutils_srcdir) && \
- pypy $(cdbs_python_setup_cmd) build \
- $(cdbs_python_build_args)
- touch $@
-
-# hook pypy-rply into existing cdbs install stage
-install/$(pypy_package)::
- cd $(cdbs_python_distutils_srcdir) && \
- pypy $(cdbs_python_setup_cmd) install \
- --root="$(cdbs_python_destdir)" \
- --install-purelib=$(call cdbs_expand_python_distutils_installdir,pypy) \
- $(cdbs_python_install_args)
-
-# hook in binary-post-install to invoke dh_pypy to calculate
-# dependencies, add maintainer script and byte compile files.
-binary-post-install/$(pypy_package):: binary-post-install/%: binary-install-python/%
-binary-install-python/$(pypy_package):: binary-install-python/%: binary-install/%
- dh_pypy -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) $(call cdbs_expand_curvar, DEB_PYTHON_PRIVATE_MODULE_DIRS)
-
-python-module-clean/$(pypy_package)::
- -cd $(cdbs_python_distutils_srcdir) && \
- pypy $(cdbs_python_setup_cmd) clean \
- $(cdbs_python_clean_args)
+%:
+ dh $@ --with python2,python3,pypy --buildsystem=pybuild
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-rply.git
More information about the Python-modules-commits
mailing list