[Python-modules-commits] r23697 - in packages/sqlparse/trunk/debian (7 files)
jollyroger-guest at users.alioth.debian.org
jollyroger-guest at users.alioth.debian.org
Mon Mar 11 12:26:30 UTC 2013
Date: Monday, March 11, 2013 @ 12:26:27
Author: jollyroger-guest
Revision: 23697
Fix shebang generation, clean lintian errors.
Modified:
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
packages/sqlparse/trunk/debian/rules
Modified: packages/sqlparse/trunk/debian/python-sqlparse.install
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.install 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python-sqlparse.install 2013-03-11 12:26:27 UTC (rev 23697)
@@ -1,2 +1,2 @@
/usr/lib/python2*
-/usr/share/python-sqlparse/scripts/sqlformat.py2*
+/usr/bin/sqlformat-2*
Modified: packages/sqlparse/trunk/debian/python-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.postinst 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python-sqlparse.postinst 2013-03-11 12:26:27 UTC (rev 23697)
@@ -1,13 +1,15 @@
#!/bin/sh
+set -e
+
case "$1" in
configure)
update-alternatives --install \
/usr/bin/sqlformat sqlformat \
- /usr/share/python-sqlparse/scripts/sqlformat.py2 10 \
+ /usr/share/bin/sqlformat-2 10 \
--slave \
/usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
- /usr/share/man/man1/sqlformat.py2.1.gz
+ /usr/share/man/man1/sqlformat-2.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/sqlparse/trunk/debian/python-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python-sqlparse.prerm 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python-sqlparse.prerm 2013-03-11 12:26:27 UTC (rev 23697)
@@ -5,7 +5,7 @@
case "$1" in
remove|deconfigure)
update-alternatives --remove sqlformat \
- /usr/share/python-sqlparse/scripts/sqlformat.py2
+ /usr/bin/sqlformat-2
;;
upgrade|failed-upgrade)
Modified: packages/sqlparse/trunk/debian/python3-sqlparse.install
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.install 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.install 2013-03-11 12:26:27 UTC (rev 23697)
@@ -1,2 +1,2 @@
/usr/lib/python3*
-/usr/share/python-sqlparse/scripts/sqlformat.py3*
+/usr/bin/sqlformat-3*
Modified: packages/sqlparse/trunk/debian/python3-sqlparse.postinst
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.postinst 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.postinst 2013-03-11 12:26:27 UTC (rev 23697)
@@ -1,13 +1,15 @@
#!/bin/sh
+set -e
+
case "$1" in
configure)
update-alternatives --install \
/usr/bin/sqlformat sqlformat \
- /usr/share/python-sqlparse/scripts/sqlformat.py3 10 \
+ /usr/bin/sqlformat-3 10 \
--slave \
/usr/share/man/man1/sqlformat.1.gz sqlformat.1.gz \
- /usr/share/man/man1/sqlformat.py3.1.gz
+ /usr/share/man/man1/sqlformat-3.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/sqlparse/trunk/debian/python3-sqlparse.prerm
===================================================================
--- packages/sqlparse/trunk/debian/python3-sqlparse.prerm 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/python3-sqlparse.prerm 2013-03-11 12:26:27 UTC (rev 23697)
@@ -5,7 +5,7 @@
case "$1" in
remove|deconfigure)
update-alternatives --remove sqlformat \
- /usr/share/python-sqlparse/scripts/sqlformat.py3
+ /usr/bin/sqlformat-3
;;
upgrade|failed-upgrade)
Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules 2013-03-10 22:54:11 UTC (rev 23696)
+++ packages/sqlparse/trunk/debian/rules 2013-03-11 12:26:27 UTC (rev 23697)
@@ -22,6 +22,9 @@
override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
endif
+build-python3%:
+ python3 setup.py build
+
build-python%:
python$* setup.py build
@@ -30,27 +33,25 @@
install-python3%:
python3$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
- mkdir -p debian/tmp/usr/share/python-sqlparse/scripts
- mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py3
- 2to3 -nw debian/tmp/usr/lib/python3/dist-packages/sqlparse debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py3
+ mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/bin/sqlformat-3
+ 2to3 -nw debian/tmp/usr/bin/sqlformat-3
override_dh_auto_install: $(PYTHON3:%=install-python%)
dh_auto_install
- mkdir -p debian/tmp/usr/share/python-sqlparse/scripts
- mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/share/python-sqlparse/scripts/sqlformat.py2
+ mv debian/tmp/usr/bin/sqlformat debian/tmp/usr/bin/sqlformat-2
override_dh_auto_clean:
dh_auto_clean
rm -rf docs/build build *.egg-info
- rm -f debian/sqlformat.py2.1 debian/sqlformat.py3.1
+ rm -f debian/sqlformat-2.1 debian/sqlformat-3.1
install-manpages3%:
- cp docs/sqlformat.1 debian/sqlformat.py3.1
- dh_installman -p python3-sqlparse debian/sqlformat.py3.1
+ cp docs/sqlformat.1 debian/sqlformat-3.1
+ dh_installman -p python3-sqlparse debian/sqlformat-3.1
override_dh_installman: $(PYTHON3:%=install-manpages%)
- cp docs/sqlformat.1 debian/sqlformat.py2.1
- dh_installman -p python-sqlparse debian/sqlformat.py2.1
+ cp docs/sqlformat.1 debian/sqlformat-2.1
+ dh_installman -p python-sqlparse debian/sqlformat-2.1
build: build-indep
build-indep: docs/build/html
More information about the Python-modules-commits
mailing list