[Python-modules-commits] [pysvn] 01/03: Adds python3 package

Tue Jul 5 14:21:03 UTC 2016

This is an automated email from the git hooks/post-receive script.

noahfx-guest pushed a commit to branch master
in repository pysvn.

commit a04086848f6ceb9a60b7c9a0a0d0906bf8457db8
Author: Josue Ortega <josue at debian.org>
Date:   Tue Jul 5 14:37:58 2016 +0200

    Adds python3 package
---
 debian/changelog            | 12 ++++++++++++
 debian/control              | 31 ++++++++++++++-----------------
 debian/python-svn.install   |  4 ++--
 debian/python3-svn.dirs     |  1 +
 debian/python3-svn.doc-base | 12 ++++++++++++
 debian/python3-svn.docs     |  2 ++
 debian/python3-svn.install  |  2 ++
 debian/rules                | 38 +++++++++++++++++++++++++++++++++-----
 8 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82315a2..21151fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,19 @@
 pysvn (1.8.0-2) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
+  [ Josue Ortega ]
+  * debian/control:
+     - python-svn-db removed, since it was generated with no
+       debug symbols.
+     - Adds Python 3 package.
+     - Updates uploader's mail.
+     - Standards-Version updated to 3.9.8, no changes required.
+     - Changes python-cxx-dev build depend relationshipt to be strictly less
+       than 6.2.7.
+  * debian/rules: Adds Python3 package scripts.
+
  -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:54:09 +0200
 
 pysvn (1.8.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 69f6575..19e5e29 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pysvn
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Josue Ortega <josueortega at debian.org.gt>
+Uploaders: Josue Ortega <josue at debian.org>
 Build-Depends:
  debhelper (>= 9),
  dh-python,
@@ -12,11 +12,16 @@ Build-Depends:
  libsvn-dev (>= 1.8.10),
  python-all-dbg,
  python-all-dev (>= 2.7.8),
- python-cxx-dev (>= 6.2.5),
+ python-cxx-dev (<< 6.2.7),
  python-setuptools,
+ python3-all (>= 3.4.2),
+ python3-all-dev (>= 3.4.2),
+ python3-setuptools (>= 5.5.1),
+ python3-cxx-dev (<< 6.2.7),
  subversion (>= 1.8.10)
 X-Python-Version: >= 2.7
-Standards-Version: 3.9.6
+X-Python3-Version: >= 3.5
+Standards-Version: 3.9.8
 Homepage: http://pysvn.tigris.org/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pysvn.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pysvn.git
@@ -25,25 +30,17 @@ Package: python-svn
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: python-pysvn
-Suggests: python-svn-dbg
 Description: A(nother) Python interface to Subversion
  The pysvn module is a Python interface to the Subversion version
  control system.  This API exposes client interfaces for managing a
  working copy, querying a repository, and synchronizing the two.
 
-Package: python-svn-dbg
-Priority: extra
-Section: debug
+Package: python3-svn
 Architecture: any
-Depends:
- python-dbg,
- python-svn (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Provides: python-pysvn
-Description: A(nother) Python interface to Subversion (debug extension)
- The pysvn module is a Python interface to the Subversion version
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Provides: python3-pysvn
+Suggests: python-svn-dbg
+Description: A(nother) Python 3 interface to Subversion
+ The pysvn module is a Python 3 interface to the Subversion version
  control system.  This API exposes client interfaces for managing a
  working copy, querying a repository, and synchronizing the two.
- .
- This package contains the debugging symbols for python-svn.
diff --git a/debian/python-svn.install b/debian/python-svn.install
index 2ded607..22db4fa 100644
--- a/debian/python-svn.install
+++ b/debian/python-svn.install
@@ -1,2 +1,2 @@
-Source/pysvn/__init__.py	usr/lib/python2.7/dist-packages/pysvn/
-Source/pysvn/_pysvn_2_7.so	usr/lib/python2.7/dist-packages/pysvn/
+Source/pysvn/python2/__init__.py	usr/lib/python2.7/dist-packages/pysvn/
+Source/pysvn/python2/_pysvn_2_7.so	usr/lib/python2.7/dist-packages/pysvn/
diff --git a/debian/python3-svn.dirs b/debian/python3-svn.dirs
new file mode 100644
index 0000000..3378403
--- /dev/null
+++ b/debian/python3-svn.dirs
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/pysvn
diff --git a/debian/python3-svn.doc-base b/debian/python3-svn.doc-base
new file mode 100644
index 0000000..aa30b14
--- /dev/null
+++ b/debian/python3-svn.doc-base
@@ -0,0 +1,12 @@
+Document: pysvn3
+Title: pysvn - Python 3 interface to Subversion
+Author: Barry A. Scott
+Abstract: This document contains the pysvn Programmer's Guide (covering the
+ use of pysvn in a tutorial style with lots of examples) and the pysvn
+ Programmer's Reference (detailed descriptions of all the classes, functions
+ and variables of pysvn).
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python3-svn/pysvn.html
+Files: /usr/share/doc/python3-svn/*.html
diff --git a/debian/python3-svn.docs b/debian/python3-svn.docs
new file mode 100644
index 0000000..111d34c
--- /dev/null
+++ b/debian/python3-svn.docs
@@ -0,0 +1,2 @@
+Docs/*.html
+Docs/*.js
diff --git a/debian/python3-svn.install b/debian/python3-svn.install
new file mode 100644
index 0000000..acade8e
--- /dev/null
+++ b/debian/python3-svn.install
@@ -0,0 +1,2 @@
+Source/pysvn/python3/__init__.py	usr/lib/python3/dist-packages/pysvn/
+Source/pysvn/python3/_pysvn_3*.so	usr/lib/python3/dist-packages/pysvn/
diff --git a/debian/rules b/debian/rules
index 314248a..aa879ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 PYVERS	:= $(shell pyversions -vr debian/control)
+PY3VERS := $(shell py3versions -vr debian/control)
 APR_INC	= $(strip $(shell apr-config --includes | sed 's/-I//'))
 
+
 CONFIG_OPTS = --pycxx-src-dir=/usr/share/python${PYVERS}/CXX \
 	      --pycxx-dir=/usr/share/python${PYVERS}/CXX \
 	      --svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \
@@ -20,17 +22,43 @@ CONFIG_OPTS = --pycxx-src-dir=/usr/share/python${PYVERS}/CXX \
               --norpath \
               --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+CONFIG3_OPTS = --pycxx-src-dir=/usr/share/python${PY3VERS}/CXX \
+	      --pycxx-dir=/usr/share/python${PY3VERS}/CXX \
+	      --svn-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+              --apr-inc-dir=$(APR_INC) \
+              --apu-inc-dir=$(APR_INC) \
+	      --apr-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+              --norpath \
+              --platform=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 %:
-	dh $@ --with=python2 --buildsystem=pybuild
+	dh $@ --with=python2,python3 --buildsystem=pybuild
 
 override_dh_auto_configure:
 	cd $(CURDIR)/Source; python setup.py configure $(CONFIG_OPTS)
+	mv $(CURDIR)/Source/Makefile $(CURDIR)/Source/MakefilePy2
+	cd $(CURDIR)/Source; python3 setup.py configure $(CONFIG3_OPTS)
+	mv $(CURDIR)/Source/Makefile $(CURDIR)/Source/MakefilePy3
+
 
 override_dh_auto_build:
+	mkdir $(CURDIR)/Source/pysvn/python2
+	mv $(CURDIR)/Source/MakefilePy2 $(CURDIR)/Source/Makefile
+	$(MAKE) -C $(CURDIR)/Source
+
+	mv $(CURDIR)/Source/pysvn/__init__.py $(CURDIR)/Source/pysvn/python2/
+	mv $(CURDIR)/Source/pysvn/_pysvn_2_*.so $(CURDIR)/Source/pysvn/python2/
+	$(MAKE) clean -C $(CURDIR)/Source
+
+	mkdir $(CURDIR)/Source/pysvn/python3
+	mv $(CURDIR)/Source/MakefilePy3 $(CURDIR)/Source/Makefile
 	$(MAKE) -C $(CURDIR)/Source
 
-override_dh_strip:
-	dh_strip --dbg-package=python-svn-dbg
+	mv $(CURDIR)/Source/pysvn/__init__.py $(CURDIR)/Source/pysvn/python3/
+	mv $(CURDIR)/Source/pysvn/_pysvn_3_*.so $(CURDIR)/Source/pysvn/python3/
+	$(MAKE) clean -C $(CURDIR)/Source
 
-override_dh_installdocs:
-	dh_installdocs --link-doc=python-svn
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/Source/pysvn/python2
+	rm -rf $(CURDIR)/Source/pysvn/python3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pysvn.git

