[Python-modules-commits] [pysvn] 01/02: Removed python3 package version

Sun Dec 20 23:58:13 UTC 2015

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

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

commit edc97fc6aec0e9fc94fd89ff9e12383acc2e94d8
Author: Josue Ortega <josueortega at debian.org.gt>
Date:   Sun Dec 20 17:10:29 2015 -0600

    Removed python3 package version
---
 debian/changelog            |  8 ++------
 debian/control              | 15 ---------------
 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                | 41 +++++------------------------------------
 8 files changed, 9 insertions(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c0bd01..e96a3d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
 pysvn (1.8.0-1) UNRELEASED; urgency=medium
 
-  * New upstream release:
+  * New upstream release (Closes: #802121):
      - debian/patches/* updated to be compatible with the new upstream release.
   * debian/control:
      - Dependencies version updated.
      - set Standards-Version: 3.9.6 no changes required.
-     - Bumped X-Python3-Version to 3.5.
   * debian/copyright:
      - Updated BSD license tag name to BSD-4-clause.
-     - Paragraphs reordered.
-  * Added Python 3 version of the package.
-  * debian/rules: Removed override_dh_installdocs in order to avoid
-    documentation conflicts between the Python 3 and Python 2 package.
+     - Paragraphs have been reordered.
 
  -- Josue Ortega <josueortega at debian.org.gt>  Sun, 01 Nov 2015 18:52:15 -0600
 
diff --git a/debian/control b/debian/control
index 02940c1..de318f8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,13 +14,8 @@ Build-Depends:
  python-all-dev (>= 2.7.8),
  python-cxx-dev (>= 6.2.5),
  python-setuptools,
- python3-all (>= 3.4.2),
- python3-all-dev (>= 3.4.2),
- python3-setuptools (>= 5.5.1),
- python3-cxx-dev (>= 6.2.5),
  subversion (>= 1.8.10)
 X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.5
 Standards-Version: 3.9.6
 Homepage: http://pysvn.tigris.org/
 Vcs-Git: git://anonscm.debian.org/python-modules/packages/pysvn.git
@@ -36,16 +31,6 @@ Description: A(nother) Python interface to Subversion
  control system.  This API exposes client interfaces for managing a
  working copy, querying a repository, and synchronizing the two.
 
-Package: python3-svn
-Architecture: any
-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.
-
 Package: python-svn-dbg
 Priority: extra
 Section: debug
diff --git a/debian/python-svn.install b/debian/python-svn.install
index 22db4fa..2ded607 100644
--- a/debian/python-svn.install
+++ b/debian/python-svn.install
@@ -1,2 +1,2 @@
-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/
+Source/pysvn/__init__.py	usr/lib/python2.7/dist-packages/pysvn/
+Source/pysvn/_pysvn_2_7.so	usr/lib/python2.7/dist-packages/pysvn/
diff --git a/debian/python3-svn.dirs b/debian/python3-svn.dirs
deleted file mode 100644
index 3378403..0000000
--- a/debian/python3-svn.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3/dist-packages/pysvn
diff --git a/debian/python3-svn.doc-base b/debian/python3-svn.doc-base
deleted file mode 100644
index aa30b14..0000000
--- a/debian/python3-svn.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 111d34c..0000000
--- a/debian/python3-svn.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-Docs/*.html
-Docs/*.js
diff --git a/debian/python3-svn.install b/debian/python3-svn.install
deleted file mode 100644
index acade8e..0000000
--- a/debian/python3-svn.install
+++ /dev/null
@@ -1,2 +0,0 @@
-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 874a882..314248a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
-export PYBUILD_NAME=svn
+export PYBUILD_NAME=pysvn
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 
@@ -9,10 +9,8 @@ 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) \
@@ -22,46 +20,17 @@ 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,python3 --buildsystem=pybuild
+	dh $@ --with=python2 --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
 
-	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_auto_clean:
-	dh_auto_clean
-	rm -rf $(CURDIR)/Source/pysvn/python2
-	rm -rf $(CURDIR)/Source/pysvn/python3
-
 override_dh_strip:
 	dh_strip --dbg-package=python-svn-dbg
+
+override_dh_installdocs:
+	dh_installdocs --link-doc=python-svn

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

