[Python-modules-commits] r30661 - in packages/mysql-connector-python/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Wednesday, September 17, 2014 @ 21:16:43
  Author: morph
Revision: 30661

* debian/patches/fix_last_executed_query.patch
  - fix last_executed_query to return unicode. Closes: #761136
* debian/rules
  - re-enable unittests at build-time (failing, so not blocking build if
    failing); Closes: #739189

Modified:
  packages/mysql-connector-python/trunk/debian/changelog
  packages/mysql-connector-python/trunk/debian/rules

Modified: packages/mysql-connector-python/trunk/debian/changelog
===================================================================
--- packages/mysql-connector-python/trunk/debian/changelog	2014-09-17 19:07:19 UTC (rev 30660)
+++ packages/mysql-connector-python/trunk/debian/changelog	2014-09-17 21:16:43 UTC (rev 30661)
@@ -1,9 +1,16 @@
 mysql-connector-python (1.2.3-2) UNRELEASED; urgency=low
 
-  * Fix last_executed_query to return unicode. Closes: #761136.
+  [ Brian May ]
+  * debian/patches/fix_last_executed_query.patch
+    - fix last_executed_query to return unicode. Closes: #761136
 
- -- Brian May <bam at debian.org>  Thu, 11 Sep 2014 09:02:11 +1000
+  [ Sandro Tosi ]
+  * debian/rules
+    - re-enable unittests at build-time (failing, so not blocking build if
+      failing); Closes: #739189
 
+ -- Sandro Tosi <morph at debian.org>  Wed, 17 Sep 2014 22:15:59 +0100
+
 mysql-connector-python (1.2.3-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/mysql-connector-python/trunk/debian/rules
===================================================================
--- packages/mysql-connector-python/trunk/debian/rules	2014-09-17 19:07:19 UTC (rev 30660)
+++ packages/mysql-connector-python/trunk/debian/rules	2014-09-17 21:16:43 UTC (rev 30661)
@@ -25,16 +25,15 @@
 	done
 	dh_install
 
-# Disable test execution, currently broken upstream - see 739189
-#override_dh_installdocs:
-#	dh_installdocs -A docs/README_DOCS.txt
+override_dh_installdocs:
+	dh_installdocs -A docs/README_DOCS.txt
 
-#override_dh_auto_test:
-#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-#	set -e ; \
-#	for python in $(PYTHON2) $(PYTHON3); do \
-#		LIB=$$($$python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print (b.build_purelib)") ;\
-#		PYTHONPATH=$(CURDIR)/$$LIB $$python unittests.py --with-mysql=/usr/ --mysql-topdir=$(CURDIR)/mysql_myconnpy/ --verbosity=2 --bind-address=:: --host=::1 --stats ; \
-#		rm -rf $(CURDIR)/mysql_myconnpy/ ; \
-#	done
-#endif
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	-for python in $(PYTHON2) $(PYTHON3); do \
+		LIB=$$($$python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print (b.build_purelib)") ;\
+		mkdir -p $(CURDIR)/mysql_myconnpy/ ; \
+		PYTHONPATH=$(CURDIR)/$$LIB $$python unittests.py --with-mysql=/usr/ --mysql-topdir=$(CURDIR)/mysql_myconnpy/ --verbosity=2 --bind-address=:: --host=::1 --stats ; \
+		rm -rf $(CURDIR)/mysql_myconnpy/ ; \
+	done
+endif