[Python-modules-commits] [pyodbc] 03/03: Update to 3.0.10, add py3 support and fix FTBFS

Laurent Bigonville bigon at moszumanska.debian.org
Sun Jul 10 12:12:25 UTC 2016 

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

bigon pushed a commit to branch master
in repository pyodbc.

commit 7ca6af713ac201e1309d90bcf764223c4a7e22e9
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Jul 10 14:02:58 2016 +0200

    Update to 3.0.10, add py3 support and fix FTBFS
    
    * Team upload
    * New upstream release
      - Fix FTBFS with GCC 6 (Closes: #811673)
    * debian/rules: Fix FTBFS with new cdbs version (Closes: #830389)
    * Build python3 module (Closes: #699778)
    * debian/control: Add dh-python to the build-dependencies
    * debian/watch: Update watch file URL
    * debian/control: Bump Standards-Version to 3.9.8 (no further changes)
    * Ship the egg-infos with the packages.
    * Run wrap-and-sort script
---
 debian/changelog              | 17 ++++++++--
 debian/control                | 74 +++++++++++++++++++++++++++++++++++--------
 debian/copyright              | 10 +++---
 debian/docs                   |  1 -
 debian/python-pyodbc.install  |  1 +
 debian/python3-pyodbc.install |  2 ++
 debian/rules                  | 27 +++++++++++++---
 debian/watch                  |  4 +--
 8 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d965a0e..0bc6b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-pyodbc (3.0.6-3) UNRELEASED; urgency=medium
+pyodbc (3.0.10-1) unstable; urgency=medium
 
+  * Team upload
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:52:10 +0200
+  [ Laurent Bigonville ]
+  * New upstream release
+    - Fix FTBFS with GCC 6 (Closes: #811673)
+  * debian/rules: Fix FTBFS with new cdbs version (Closes: #830389)
+  * Build python3 module (Closes: #699778)
+  * debian/control: Add dh-python to the build-dependencies
+  * debian/watch: Update watch file URL
+  * debian/control: Bump Standards-Version to 3.9.8 (no further changes)
+  * Ship the egg-infos with the packages.
+  * Run wrap-and-sort script
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 10 Jul 2016 13:56:06 +0200
 
 pyodbc (3.0.6-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 93a3493..ed9493f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,32 @@ Section: python
 Priority: optional
 Maintainer: Deepak Tripathi <apenguinlinux at gmail.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 9), python-all-dev (>= 2.6.6-3~), unixodbc-dev, python-all-dbg
-Standards-Version: 3.9.4
+Build-Depends: cdbs (>= 0.4.90~),
+               debhelper (>= 9),
+               dh-python,
+               python-all-dbg,
+               python-all-dev (>= 2.6.6-3~),
+               python3-all-dbg,
+               python3-all-dev,
+               unixodbc-dev
+Standards-Version: 3.9.8
 X-Python-Version: >= 2.4
-Homepage: http://code.google.com/p/pyodbc/
+Homepage: http://mkleehammer.github.io/pyodbc/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pyodbc.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyodbc.git
 
 Package: python-pyodbc
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
-Description: Python module for ODBC database access 
- A Python DB API 2 module for ODBC. No 3rd party libraries are required. 
- Only native Python datatypes are used, such as decimal and datetime. 
+Description: Python module for ODBC database access
+ A Python DB API 2 module for ODBC. No 3rd party libraries are required.
+ Only native Python datatypes are used, such as decimal and datetime.
  It implements the Python Database API Specification v2.0.
  For example:
    import pyodbc
- Next, create a connection by passing an ODBC connection string to the 
- connect method. This step causes ODBC to load the database driver (the SQL 
+ Next, create a connection by passing an ODBC connection string to the
+ connect method. This step causes ODBC to load the database driver (the SQL
  Server driver in this example) and connect to the database.
    cnxn = pyodbc.connect('DSN=northwind')
 
@@ -29,15 +36,54 @@ Package: python-pyodbc-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: python-pyodbc (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: python-pyodbc (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Python module for ODBC database access - Debugging symbols
- A Python DB API 2 module for ODBC. No 3rd party libraries are required. 
- Only native Python datatypes are used, such as decimal and datetime. 
+ A Python DB API 2 module for ODBC. No 3rd party libraries are required.
+ Only native Python datatypes are used, such as decimal and datetime.
  It implements the Python Database API Specification v2.0.
  For example:
    import pyodbc
- Next, create a connection by passing an ODBC connection string to the 
- connect method. This step causes ODBC to load the database driver (the SQL 
+ Next, create a connection by passing an ODBC connection string to the
+ connect method. This step causes ODBC to load the database driver (the SQL
+ Server driver in this example) and connect to the database.
+   cnxn = pyodbc.connect('DSN=northwind')
+ .
+ This package contains debugging symbols.
+
+Package: python3-pyodbc
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
+Description: Python3 module for ODBC database access
+ A Python DB API 2 module for ODBC. No 3rd party libraries are required.
+ Only native Python datatypes are used, such as decimal and datetime.
+ It implements the Python Database API Specification v2.0.
+ For example:
+   import pyodbc
+ Next, create a connection by passing an ODBC connection string to the
+ connect method. This step causes ODBC to load the database driver (the SQL
+ Server driver in this example) and connect to the database.
+   cnxn = pyodbc.connect('DSN=northwind')
+
+Package: python3-pyodbc-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: python3-pyodbc (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Description: Python3 module for ODBC database access - Debugging symbols
+ A Python DB API 2 module for ODBC. No 3rd party libraries are required.
+ Only native Python datatypes are used, such as decimal and datetime.
+ It implements the Python Database API Specification v2.0.
+ For example:
+   import pyodbc
+ Next, create a connection by passing an ODBC connection string to the
+ connect method. This step causes ODBC to load the database driver (the SQL
  Server driver in this example) and connect to the database.
    cnxn = pyodbc.connect('DSN=northwind')
  .
diff --git a/debian/copyright b/debian/copyright
index 51b0332..12672d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,13 +2,13 @@ This work was packaged for Debian by:
 
     Deepak Tripathi <apenguinlinux at gmail.com> on Mon, 08 Feb 2010 04:54:56 +0000
 
-It was downloaded from http://code.google.com/p/pyodbc/
+It was downloaded from http://mkleehammer.github.io/pyodbc/
 
 Upstream Author:
 
 	Author: Michael Kleehammer
 	Author-email: michael at kleehammer.com
-	
+
 Copyright:
 
 	Copyright (c) 2004-2008 Michael Kleehammer
@@ -18,12 +18,12 @@ License:
     MIT License:
 
 	Permission is hereby granted, free of charge, to any person obtaining a
-	copy of this software and associated documentation files (the "Software" 
+	copy of this software and associated documentation files (the "Software"
 	to deal in the Software without restriction, including without limitation
 	the rights to use, copy, modify, merge, publish, distribute, sublicense,
 	and/or sell copies of the Software, and to permit persons to whom the
 	Software is furnished to do so.
- 
+
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -36,5 +36,3 @@ The Debian packaging is:
 
     Copyright (C) 2010 Deepak Tripathi <apenguinlinux at gmail.com> and is licensed
 	under the GPL, see `/usr/share/common-licenses/GPL-2'.
-
-
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a1320b1..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.rst
diff --git a/debian/python-pyodbc.install b/debian/python-pyodbc.install
index 9c7cfba..2c4d362 100644
--- a/debian/python-pyodbc.install
+++ b/debian/python-pyodbc.install
@@ -1 +1,2 @@
+debian/tmp/usr/lib/python2.*/*-packages/pyodbc-*.egg-info
 debian/tmp/usr/lib/python2.*/*-packages/pyodbc.so
diff --git a/debian/python3-pyodbc.install b/debian/python3-pyodbc.install
new file mode 100644
index 0000000..cb44629
--- /dev/null
+++ b/debian/python3-pyodbc.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python3*/*-packages/pyodbc*.so
+debian/tmp/usr/lib/python3*/*-packages/pyodbc-*.egg-info
diff --git a/debian/rules b/debian/rules
index 12e354c..7ce0a47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,13 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 build/python-pyodbc-dbg::
 	set -e; \
-	for i in $(cdbs_python_build_versions); do \
-		python$$i-dbg ./setup.py build; \
+	for i in $(cdbs_python_flavors); do \
+		$$i-dbg ./setup.py build; \
 	done
 
 install/python-pyodbc-dbg::
-	for i in $(cdbs_python_build_versions); do \
-      python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-pyodbc-dbg; \
+	for i in $(cdbs_python_flavors); do \
+	$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-pyodbc-dbg; \
 	done
 	find debian/python-pyodbc-dbg \
         ! -type d ! -name '*_d.so' | xargs rm -f
@@ -21,5 +21,24 @@ binary-predeb/python-pyodbc-dbg::
 	rm -rf debian/python-pyodbc-dbg/usr/share/doc/python-pyodbc-dbg
 	ln -s python-pyodbc debian/python-pyodbc-dbg/usr/share/doc/python-pyodbc-dbg
 
+build/python3-pyodbc-dbg::
+	set -e; \
+	for i in $(cdbs_python3_flavors); do \
+		$$i-dbg ./setup.py build; \
+	done
+
+install/python3-pyodbc-dbg::
+	for i in $(cdbs_python3_flavors); do \
+	$$i-dbg ./setup.py install --root $(CURDIR)/debian/python3-pyodbc-dbg; \
+	done
+	find debian/python3-pyodbc-dbg \
+        ! -type d ! -name 'pyodbc.cpython-3*dm*.so' | xargs rm -f
+	find debian/python3-pyodbc-dbg -depth -empty -exec rmdir {} \;
+
+
+binary-predeb/python3-pyodbc-dbg::
+	rm -rf debian/python3-pyodbc-dbg/usr/share/doc/python3-pyodbc-dbg
+	ln -s python3-pyodbc debian/python3-pyodbc-dbg/usr/share/doc/python3-pyodbc-dbg
+
 clean::
 	rm -rf build
diff --git a/debian/watch b/debian/watch
index d06a814..bb30677 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-
-http://code.google.com/p/pyodbc/downloads/list?can=1 .*/pyodbc-(\d[\d.]*)\.zip
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+https://pypi.debian.net/pyodbc/pyodbc-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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

More information about the Python-modules-commits mailing list