diff -Nru mysql-utilities-1.3.5/debian/changelog mysql-utilities-1.3.5/debian/changelog --- mysql-utilities-1.3.5/debian/changelog 2013-09-09 01:46:18.000000000 +0000 +++ mysql-utilities-1.3.5/debian/changelog 2014-03-03 05:17:55.000000000 +0000 @@ -1,3 +1,15 @@ +mysql-utilities (1.3.5-2) unstable; urgency=medium + + * Removed "namespace.patch" and added "mysql-utilities.pyremove" + to avoid collision with "python-mysql.connector"; Added versioned + dependency on "python-mysql.connector" due its switch to dh_python2 + (Closes: #739487). + * Removed obsolete override_dh_auto_install. + * "get-orig-source" to use `uscan` to download orig.tar. + * Standards to 3.9.5. + + -- Dmitry Smirnov Mon, 03 Mar 2014 16:14:14 +1100 + mysql-utilities (1.3.5-1) unstable; urgency=low * New upstream release [August 2013] diff -Nru mysql-utilities-1.3.5/debian/control mysql-utilities-1.3.5/debian/control --- mysql-utilities-1.3.5/debian/control 2013-09-09 01:46:03.000000000 +0000 +++ mysql-utilities-1.3.5/debian/control 2014-03-03 04:45:28.000000000 +0000 @@ -6,7 +6,7 @@ # bzr (>= 2.6.0~bzr6520) to satisfy get-orig-source due to #666496 ,bzr (>= 2.6.0~bzr6520) X-Python-Version: >= 2.7 -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: https://launchpad.net/mysql-utilities Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mysql-utilities.git Vcs-Git: git://anonscm.debian.org/collab-maint/mysql-utilities.git @@ -14,7 +14,7 @@ Package: mysql-utilities Architecture: all Enhances: mysql-workbench -Depends: ${misc:Depends}, ${python:Depends}, python-mysql.connector +Depends: ${misc:Depends}, ${python:Depends}, python-mysql.connector (>= 1.1.5) Replaces: libmysql-diff-perl (<< 0.43-2) Breaks: libmysql-diff-perl (<< 0.43-2) Description: collection of scripts for managing MySQL servers diff -Nru mysql-utilities-1.3.5/debian/mysql-utilities.pyremove mysql-utilities-1.3.5/debian/mysql-utilities.pyremove --- mysql-utilities-1.3.5/debian/mysql-utilities.pyremove 1970-01-01 00:00:00.000000000 +0000 +++ mysql-utilities-1.3.5/debian/mysql-utilities.pyremove 2014-03-03 04:17:44.000000000 +0000 @@ -0,0 +1,2 @@ +## Remove files provided by python-mysql.connector to avoid collision: +mysql/__init__.py diff -Nru mysql-utilities-1.3.5/debian/patches/namespace.patch mysql-utilities-1.3.5/debian/patches/namespace.patch --- mysql-utilities-1.3.5/debian/patches/namespace.patch 2012-04-26 21:51:00.000000000 +0000 +++ mysql-utilities-1.3.5/debian/patches/namespace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Last-Update: 2012-03-08 -From: David Paleino -Forwarded: not-needed -Description: workaround for namespace collision with python-mysql.connector - This patch is needed to allow loading of python-mysql.connector - in order to avoid connectivity issues, see sample error below. - ######## - Traceback (most recent call last): - File "/usr/bin/mysqldiskusage", line 106, in - from mysql.utilities.common.server import connect_servers - File "/usr/lib/python2.7/dist-packages/mysql/utilities/common/server.py", - line 27, in import mysql.connector - ImportError: No module named connector - ######## - - ---- /dev/null -+++ b/mysql/__init__.py -@@ -0,0 +1,3 @@ -+from pkgutil import extend_path -+__path__ = extend_path(__path__, __name__) -+ diff -Nru mysql-utilities-1.3.5/debian/patches/series mysql-utilities-1.3.5/debian/patches/series --- mysql-utilities-1.3.5/debian/patches/series 2013-09-09 01:46:03.000000000 +0000 +++ mysql-utilities-1.3.5/debian/patches/series 2014-03-03 04:17:44.000000000 +0000 @@ -1,2 +1 @@ man.patch -namespace.patch diff -Nru mysql-utilities-1.3.5/debian/rules mysql-utilities-1.3.5/debian/rules --- mysql-utilities-1.3.5/debian/rules 2013-09-09 01:48:29.000000000 +0000 +++ mysql-utilities-1.3.5/debian/rules 2014-03-03 04:17:44.000000000 +0000 @@ -11,10 +11,6 @@ $(RM) -r build find scripts -mindepth 1 -regex '[^.]*' -delete -printf 'removing %p\n' -override_dh_auto_install: - dh_auto_install -- --skip-profile - dh_auto_install -- --skip-profile - TESTS=$(wildcard unit_tests/test*.py) override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -43,14 +39,14 @@ PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.+git]+)}') ## get-orig-source -#VER := $(shell dpkg-parsechangelog | perl -ne 'print $$1 if m/Version:\s*([\d\.]+)/') -get-orig-source: $(PKG)-$(VER) - @echo "Cleaning and Packing..." - $(RM) -r $(PKG)-$(VER)/.bzr* - tar -caf "$(PKG)_$(VER).orig.tar.xz" "$(PKG)-$(VER)" \ - && $(RM) -r "$(PKG)-$(VER)" - -$(PKG)-$(VER): - bzr checkout --hardlink --lightweight --revision=tag:release-$(VER) \ - https://code.launchpad.net/~mysql/mysql-utilities/trunk $(PKG)-$(VER) \ - || $(RM) -r $(PKG)-$(VER) +get-orig-source: $(info I: $(PKG)_$(VER)) + $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..)) + @echo "# Downloading..." + uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD) + #bzr checkout --hardlink --lightweight --revision=tag:release-$(VER) \ + # https://code.launchpad.net/~mysql/mysql-utilities/trunk $(PKG)-$(VER) \ + #|| $(RM) -r $(PKG)-$(VER) + #@echo "Cleaning and Packing..." + #$(RM) -r $(PKG)-$(VER)/.bzr* + #tar -caf "$(PKG)_$(VER).orig.tar.xz" "$(PKG)-$(VER)" \ + #&& $(RM) -r "$(PKG)-$(VER)" diff -Nru mysql-utilities-1.3.5/debian/watch mysql-utilities-1.3.5/debian/watch --- mysql-utilities-1.3.5/debian/watch 2013-06-20 16:45:02.000000000 +0000 +++ mysql-utilities-1.3.5/debian/watch 2013-09-09 02:00:33.000000000 +0000 @@ -1,8 +1,5 @@ version=3 -# upstream provide no facility to download source archives. -# please use 'debian/rules get-orig-source' - #https://launchpad.net/~mysql/+download/ \ # (?:.*)?/\+download/mysql-utilities_([\d\.]+)\.orig\.tar\.(?:gz|bz2|xz)