[Python-modules-commits] r30052 - in packages/sqlparse/trunk/debian (12 files)
jollyroger-guest at users.alioth.debian.org
jollyroger-guest at users.alioth.debian.org
Tue Aug 5 23:38:33 UTC 2014
Date: Tuesday, August 5, 2014 @ 23:38:32
Author: jollyroger-guest
Revision: 30052
sqlparse: new upstream release (0.1.11)
Added:
packages/sqlparse/trunk/debian/sqlformat.manpages
Modified:
packages/sqlparse/trunk/debian/changelog
packages/sqlparse/trunk/debian/control
packages/sqlparse/trunk/debian/rules
Deleted:
packages/sqlparse/trunk/debian/pypy-sqlparse.postinst
packages/sqlparse/trunk/debian/pypy-sqlparse.prerm
packages/sqlparse/trunk/debian/python-sqlparse.install
packages/sqlparse/trunk/debian/python-sqlparse.postinst
packages/sqlparse/trunk/debian/python-sqlparse.prerm
packages/sqlparse/trunk/debian/python3-sqlparse.install
packages/sqlparse/trunk/debian/python3-sqlparse.postinst
packages/sqlparse/trunk/debian/python3-sqlparse.prerm
Modified: packages/sqlparse/trunk/debian/changelog
===================================================================
--- packages/sqlparse/trunk/debian/changelog 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/changelog 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,3 +1,13 @@
+sqlparse (0.1.11-1) unstable; urgency=medium
+
+ * New upstream release
+ * Add pypy support by creating pypy-sqlparse binary package
+ * Add separate sqlformat package which depends on python3-sqlparse
+ * Do not use alternatives mechanism any more since sqlformat scripts provide
+ the same functionality.
+
+ -- Andriy Senkovych <jolly_roger at itblog.org.ua> Wed, 06 Aug 2014 02:29:13 +0300
+
sqlparse (0.1.10-1) unstable; urgency=low
* New upstream release(Closes: #722198)
Modified: packages/sqlparse/trunk/debian/control
===================================================================
--- packages/sqlparse/trunk/debian/control 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/control 2014-08-05 23:38:32 UTC (rev 30052)
@@ -7,8 +7,9 @@
python-all (>= 2.6.5-13~), python3-all (>= 3.2),
python-sphinx (>= 1.0.7+dfsg),
python-pytest, python3-pytest,
- python-setuptools, python3-setuptools
-Standards-Version: 3.9.4
+ python-setuptools, python3-setuptools,
+ pypy
+Standards-Version: 3.9.5.0
Homepage: http://code.google.com/p/python-sqlparse/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sqlparse/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/sqlparse/trunk/
@@ -42,18 +43,18 @@
.
This is the Python 3 version of the package.
-#Package: pypy-sqlparse
-#Architecture: all
-#Depends: ${misc:Depends}, ${pypy:Depends}, pypy
-#Suggests: python-sqlparse-doc (>= 0.1.6-1)
-#Description: non-validating SQL parser for PyPy
-# Sqlparse is a library which provides support for parsing, splitting and
-# customizable formatting of SQL statements in Python environment.
-# .
-# This package also provides sqlformat script which can be used as external
-# SQL formatting utility.
-# .
-# This is the PyPy version of the package.
+Package: pypy-sqlparse
+Architecture: all
+Depends: ${misc:Depends}, ${pypy:Depends},
+Suggests: python-sqlparse-doc (>= 0.1.6-1)
+Description: non-validating SQL parser for PyPy
+ Sqlparse is a library which provides support for parsing, splitting and
+ customizable formatting of SQL statements in Python environment.
+ .
+ This package also provides sqlformat script which can be used as external
+ SQL formatting utility.
+ .
+ This is the PyPy version of the package.
Package: python-sqlparse-doc
Architecture: all
@@ -69,3 +70,12 @@
SQL formatting utility.
.
This package contains HTML documentation for provided module.
+
+Package: sqlformat
+Architecture: all
+Section: text
+Depends: ${misc:Depends}, ${python3:Depends}, python3-sqlparse (= ${binary:Version})
+Description: SQL formatting utility
+ The sqlformat command-line tool can be used to reformat SQL file according to
+ specified options or prepare a snippet in some programming language (only
+ Python and PHP currently supported).
Deleted: packages/sqlparse/trunk/debian/pypy-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/pypy-sqlparse.postinst 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/pypy-sqlparse.postinst 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/bin/sqlformat sqlformat \
- /usr/lib/pypy/bin/sqlformat 10 \
- --slave \
- /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
- /usr/share/man/man1/sqlformat-pypy.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
Deleted: packages/sqlparse/trunk/debian/pypy-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/pypy-sqlparse.prerm 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/pypy-sqlparse.prerm 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove sqlformat \
- /usr/lib/pypy/bin/sqlformat
- ;;
-
- upgrade|failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.install
===================================================================
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.postinst 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/python-sqlparse.postinst 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/bin/sqlformat sqlformat \
- /usr/bin/sqlformat-2 10 \
- --slave \
- /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
- /usr/share/man/man1/sqlformat-2.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
Deleted: packages/sqlparse/trunk/debian/python-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.prerm 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/python-sqlparse.prerm 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove sqlformat \
- /usr/bin/sqlformat-2
- ;;
-
- upgrade|failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/sqlparse/trunk/debian/python3-sqlparse.install
===================================================================
Deleted: packages/sqlparse/trunk/debian/python3-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.postinst 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.postinst 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/bin/sqlformat sqlformat \
- /usr/bin/sqlformat-3 10 \
- --slave \
- /usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
- /usr/share/man/man1/sqlformat-3.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/sqlparse/trunk/debian/python3-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.prerm 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.prerm 2014-08-05 23:38:32 UTC (rev 30052)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove sqlformat \
- /usr/bin/sqlformat-3
- ;;
-
- upgrade|failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules 2014-08-05 15:36:11 UTC (rev 30051)
+++ packages/sqlparse/trunk/debian/rules 2014-08-05 23:38:32 UTC (rev 30052)
@@ -7,30 +7,32 @@
export PYBUILD_BEFORE_TEST=cp -R {dir}/tests {build_dir}; [ "{version.major}" = "2" ] || 2to3 -w {build_dir}/tests
export PYBUILD_AFTER_TEST=rm -fR {build_dir}/tests
# Disabling running tests for pypy for now due to missing dependencies
-#export PYBUILD_DISABLE_pypy=test
+export PYBUILD_DISABLE_pypy=test
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem pybuild
+ dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem pybuild
override_dh_auto_clean:
dh_auto_clean
- rm -rf docs/build debian/sqlformat-*.1
+ rm -rf docs/build
-override_dh_installman:
- cp docs/sqlformat.1 debian/sqlformat-2.1
- dh_installman -p python-sqlparse debian/sqlformat-2.1
- cp docs/sqlformat.1 debian/sqlformat-3.1
- dh_installman -p python3-sqlparse debian/sqlformat-3.1
- #cp docs/sqlformat.1 debian/sqlformat-pypy.1
- #dh_installman -p pypy-sqlparse debian/sqlformat-pypy.1
+override_dh_pypy:
+ dh_pypy
+ # No PyPy cli script.
+ rm -rf debian/pypy-sqlparse/usr/bin
+override_dh_python2:
+ dh_python2
+ # No Python 2 cli script.
+ rm -rf debian/python-sqlparse/usr/bin
+
override_dh_auto_install:
dh_auto_install
- #sed -i '1s/python/pypy/' debian/pypy-sqlparse/usr/lib/pypy/bin/sqlformat
- mv debian/python-sqlparse/usr/bin/sqlformat \
- debian/python-sqlparse/usr/bin/sqlformat-2
+ # Use the separate binary package for the cli script.
+ mkdir -p debian/sqlformat/usr/bin
mv debian/python3-sqlparse/usr/bin/sqlformat \
- debian/python3-sqlparse/usr/bin/sqlformat-3
+ debian/sqlformat/usr/bin
+ rm -rf debian/python3-sqlparse/usr/bin
build: build-indep
build-indep: docs/build/html
Added: packages/sqlparse/trunk/debian/sqlformat.manpages
===================================================================
--- packages/sqlparse/trunk/debian/sqlformat.manpages (rev 0)
+++ packages/sqlparse/trunk/debian/sqlformat.manpages 2014-08-05 23:38:32 UTC (rev 30052)
@@ -0,0 +1 @@
+docs/sqlformat.1
More information about the Python-modules-commits
mailing list